fix: keep gt0 filter

MTES-MCT · Jan 21, 2025 · 63a5a4a · 63a5a4a
1 parent 21b7235
commit 63a5a4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/server/src/controllers/campaignController.ts b/server/src/controllers/campaignController.ts
@@ -479,6 +479,7 @@ async function resetHousingWithoutCampaigns(establishmentId: string) {
     .find({
       filters: {
         establishmentIds: [establishmentId],
+        campaignsCounts: ['0'],
         statusList: [HousingStatusApi.Waiting]
       },
       pagination: { paginate: false }

diff --git a/server/src/models/HousingFiltersApi.ts b/server/src/models/HousingFiltersApi.ts
@@ -32,6 +32,7 @@ export interface HousingFiltersApi
   housingCounts?: string[];
   // TODO: type there based on housing repository values
   vacancyRates?: string[];
+  campaignsCounts?: string[];
   campaignIds?: Array<string | null>;
   ownerIds?: string[];
   localities?: string[];

diff --git a/server/src/repositories/housingRepository.ts b/server/src/repositories/housingRepository.ts
@@ -445,7 +445,15 @@ function filteredQuery(opts: FilteredQueryOptions) {
         }
       });
     }
-
+    if (filters.campaignsCounts?.length) {
+      queryBuilder.where(function (whereBuilder: any) {
+        if (filters.campaignsCounts?.includes('0')) {
+          whereBuilder.orWhereRaw(
+            `cardinality(${campaignsTable}.campaign_ids) = 0`
+          );
+        }
+      });
+    }
     if (filters.ownerIds?.length) {
       queryBuilder.whereIn(`${ownerTable}.id`, filters.ownerIds);
     }