Merge pull request #29 from AplinkosMinisterija/fish-stockings_filter…

…_fix fix fishStocking fish filter
AplinkosMinisterija · Oct 6, 2023 · d584816 · d584816
2 parents e48854f + 7678444
commit d584816
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 29 deletions.
diff --git a/services/fishStockings.service.ts b/services/fishStockings.service.ts
@@ -950,7 +950,7 @@ export default class FishStockingsService extends moleculer.Service {
       if (filters.fishTypes) {
         const filter = filters.fishTypes;
         query.$raw = {
-          condition: `EXISTS (SELECT 1 FROM jsonb_each("fish_types") AS ft WHERE ft.value::int IN (${filter}))`,
+          condition: (query?.$raw ? query.$raw.condition + ' AND ' : '' ) + `EXISTS (SELECT 1 FROM jsonb_each("fish_types") AS ft WHERE ft.value::int IN (${filter}))`,
         };
       }
 

diff --git a/services/uml.service.ts b/services/uml.service.ts