update filtering on property table

bcgov · Sep 6, 2024 · a99ba4c · a99ba4c
1 parent 4d5bbca
commit a99ba4c
Show file tree

Hide file tree

Showing 6 changed files with 250 additions and 274 deletions.
diff --git a/express-api/src/controllers/properties/propertiesSchema.ts b/express-api/src/controllers/properties/propertiesSchema.ts
@@ -48,6 +48,7 @@ export const PropertyUnionFilterSchema = z.object({
   administrativeArea: z.string().optional(),
   landArea: z.string().optional(),
   updatedOn: z.string().optional(),
+  projectStatus: z.string().optional(),
   quickFilter: z.string().optional(),
   sortKey: z.string().optional(),
   sortOrder: z.string().optional(),

diff --git a/express-api/src/services/properties/propertiesServices.ts b/express-api/src/services/properties/propertiesServices.ts
@@ -822,6 +822,8 @@ const collectFindOptions = (filter: PropertyUnionFilter) => {
     );
   if (filter.propertyType)
     options.push(constructFindOptionFromQuerySingleSelect('PropertyType', filter.propertyType));
+  if (filter.projectStatus)
+    options.push(constructFindOptionFromQuerySingleSelect('ProjectStatus', filter.projectStatus));
   return options;
 };
 

diff --git a/express-api/src/typeorm/Entities/views/PropertyUnionView.ts b/express-api/src/typeorm/Entities/views/PropertyUnionView.ts
@@ -77,11 +77,13 @@ SELECT
 	property.*, 
 	agc."name" AS agency_name,
 	aa."name" AS administrative_area_name,
-	pc."name" AS property_classification_name
+	pc."name" AS property_classification_name,
+  ps."name" AS project_status_name
 FROM property 
 	LEFT JOIN agency agc ON property.agency_id = agc.id
 	LEFT JOIN administrative_area aa ON property.administrative_area_id = aa.id
-	LEFT JOIN property_classification pc ON property.classification_id = pc.id;`,
+	LEFT JOIN property_classification pc ON property.classification_id = pc.id
+  LEFT JOIN project_status ps ON property.project_status_id = ps.id;`,
 })
 export class PropertyUnion {
   @ViewColumn({ name: 'id' })
@@ -131,4 +133,7 @@ export class PropertyUnion {
 
   @ViewColumn({ name: 'project_status_id' })
   ProjectStatusId: number;
+
+  @ViewColumn({ name: 'project_status_name' })
+  ProjectStatus: string;
 }
diff --git a/express-api/src/typeorm/Migrations/1725638342590-AddProjectStatusToPropertyViews.ts b/express-api/src/typeorm/Migrations/1725638342590-AddProjectStatusToPropertyViews.ts