fix: Apply partialProjectName search to the /project/map endpoint and…

… refactor other filters
Vizzuality · Dec 10, 2024 · 79e7891 · 79e7891
1 parent a7a428c
commit 79e7891
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/api/src/modules/projects/projects-map.repository.ts b/api/src/modules/projects/projects-map.repository.ts
@@ -80,23 +80,32 @@ export class ProjectsMapRepository extends Repository<Project> {
       projectSizeFilter,
       priceType,
     } = filters;
-    const { costRange, abatementPotentialRange, costRangeSelector } =
-      otherFilters;
+    const {
+      costRange,
+      abatementPotentialRange,
+      costRangeSelector,
+      partialProjectName,
+    } = otherFilters;
+
+    if (partialProjectName) {
+      queryBuilder.andWhere('p.project_name ILIKE :partialProjectName', {
+        partialProjectName: `%${partialProjectName}%`,
+      });
+    }
 
     if (projectSizeFilter) {
-      for (const projectSize of projectSizeFilter) {
-        queryBuilder.andWhere('p.project_size_filter = :projectSizeFilter', {
-          projectSizeFilter: projectSize,
-        });
-      }
+      queryBuilder.andWhere(
+        'p.project_size_filter IN (:...projectSizeFilter)',
+        {
+          projectSizeFilter,
+        },
+      );
     }
 
     if (priceType) {
-      for (const type of priceType) {
-        queryBuilder.andWhere('p.price_type = :priceType', {
-          priceType: type,
-        });
-      }
+      queryBuilder.andWhere('p.price_type IN (:...priceType)', {
+        priceType,
+      });
     }
 
     if (costRangeSelector === 'npv') {

diff --git a/api/src/modules/projects/projects.controller.ts b/api/src/modules/projects/projects.controller.ts
@@ -68,6 +68,7 @@ export class ProjectsController {
         costRange: query.costRange,
         abatementPotentialRange: query.abatementPotentialRange,
         costRangeSelector: query.costRangeSelector,
+        partialProjectName: query.partialProjectName,
       };
       const data = await this.projectMapRepository.getProjectsMap(
         filter as unknown as ProjectFilters,

diff --git a/client/src/containers/overview/map/layers/projects/index.tsx b/client/src/containers/overview/map/layers/projects/index.tsx
@@ -32,6 +32,7 @@ export default function ProjectsLayer() {
         costRange: filters.costRange,
         abatementPotentialRange: filters.abatementPotentialRange,
         costRangeSelector: filters.costRangeSelector,
+        partialProjectName: filters.keyword,
       },
     },
     {

diff --git a/shared/contracts/projects.contract.ts b/shared/contracts/projects.contract.ts
@@ -72,14 +72,12 @@ export const projectsContract = contract.router({
     responses: {
       200: contract.type<ProjectMap>(),
     },
-    // TODO: we need to define filters, they should probably match filters for Projects. Or we might want to pass only project ids, which
-    //       would be already filtered
-    //query: z.object({ countryCodes: z.string().array().optional() }).optional(),
     query: getProjectsQuerySchema.pick({
       filter: true,
       costRange: true,
       abatementPotentialRange: true,
       costRangeSelector: true,
+      partialProjectName: true,
     }),
   },
 });
diff --git a/shared/dtos/projects/projects-map.dto.ts b/shared/dtos/projects/projects-map.dto.ts
@@ -27,4 +27,5 @@ export type OtherProjectFilters = {
   costRange?: number[];
   abatementPotentialRange?: number[];
   costRangeSelector?: "total" | "npv";
+  partialProjectName?: string;
 };