Skip to content

fix(api): avoid Unicode tag extraction in compound search #1541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NishaSharma14 wants to merge 2 commits into
base: development
Choose a base branch
from
+21 −6
Open

fix(api): avoid Unicode tag extraction in compound search #1541

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d86e8
fix(api): avoid Unicode tag extraction in compound search
NishaSharma14 Sep 2, 2026
70f5430
Merge branch 'development' into issue-#1538
NishaSharma14 Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions app/Http/Controllers/API/SearchController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Illuminate\Validation\Rule;

class SearchController extends Controller
Expand Down Expand Up @@ -1010,19 +1012,21 @@ private function formatTaggedMoleculeResults(array $results, string $query, ?str

private function buildTaggedMoleculeQuery(string $query, ?string $tagType = null): Builder
{
$tagSlug = Str::slug($query);

return PublicMoleculeAggregates::scopePublicCatalog(
Molecule::query()->whereHas('samples.study', function (Builder $studyQuery) use ($query, $tagType): void {
Molecule::query()->whereHas('samples.study', function (Builder $studyQuery) use ($tagSlug, $tagType): void {
$studyQuery->where('is_public', true)
->where('is_archived', false)
->where(function (Builder $scopeQuery) use ($query, $tagType): void {
$scopeQuery->whereHas('tags', function (Builder $tagQuery) use ($query, $tagType): void {
$tagQuery->where('name->en', $query);
->where(function (Builder $scopeQuery) use ($tagSlug, $tagType): void {
$scopeQuery->whereHas('tags', function (Builder $tagQuery) use ($tagSlug, $tagType): void {
$this->whereTagSlugMatches($tagQuery, $tagSlug);

if (filled($tagType)) {
$tagQuery->where('type', $tagType);
}
})->orWhereHas('project.tags', function (Builder $tagQuery) use ($query, $tagType): void {
$tagQuery->where('name->en', $query);
})->orWhereHas('project.tags', function (Builder $tagQuery) use ($tagSlug, $tagType): void {
$this->whereTagSlugMatches($tagQuery, $tagSlug);

if (filled($tagType)) {
$tagQuery->where('type', $tagType);
Expand All @@ -1033,6 +1037,17 @@ private function buildTaggedMoleculeQuery(string $query, ?string $tagType = null
);
}

private function whereTagSlugMatches(Builder $tagQuery, string $tagSlug): void
{
if (DB::connection()->getDriverName() === 'pgsql') {
$tagQuery->whereRaw('slug::jsonb @> ?::jsonb', [json_encode(['en' => $tagSlug])]);

return;
}

$tagQuery->where('slug->en', $tagSlug);
}

/**
* Build secure filter query with parameter binding
*
Expand Down
Loading