PIMS-1821: Fixing agency filtering on properties and projects

express-api/src/controllers/properties/propertiesController.ts

@@ -170,7 +170,18 @@ export const getPropertiesForMap = async (req: Request, res: Response) => {
 };
 
 export const getPropertyUnion = async (req: Request, res: Response) => {
+  const kcUser = req.user;
   const filter = PropertyUnionFilterSchema.safeParse(req.query);
+  if (!(isAdmin(kcUser) || isAuditor(kcUser))) {
+    const requestedAgencies = filter.data.agencyId;
+    const userHasAgencies = await checkUserAgencyPermission(kcUser, requestedAgencies);
+    // If not agencies were requested or if the user doesn't have those requested agencies
+    if (!requestedAgencies || !userHasAgencies) {
+      // Then only show that user's agencies instead.
+      const usersAgencies = await userServices.getAgencies(kcUser.preferred_username);
+      filter.data.agencyId = usersAgencies;
+    }
+  }
   if (filter.success == false) {
     return res.status(400).send(filter.error);
   }

express-api/src/controllers/properties/propertiesSchema.ts

@@ -42,6 +42,7 @@ export const PropertyUnionFilterSchema = z.object({
   status: z.string().optional(),
   classification: z.string().optional(),
   agency: z.string().optional(),
+  agencyId: z.array(z.number()).optional(),
   propertyType: z.string().optional(),
   address: z.string().optional(),
   administrativeArea: z.string().optional(),

express-api/src/services/properties/propertiesServices.ts

@@ -104,6 +104,11 @@ const collectFindOptions = (filter: PropertyUnionFilter) => {
     options.push(constructFindOptionFromQuery('AdministrativeArea', filter.administrativeArea));
   if (filter.propertyType)
     options.push(constructFindOptionFromQuery('PropertyType', filter.propertyType));
+  if (filter.agencyId && filter.agencyId.length > 0) {
+    filter.agencyId.forEach((id) => {
+      options.push(constructFindOptionFromQuery('AgencyId', `in,${String(id)}`));
+    });
+  }
   return options;
 };
 

express-api/src/utilities/helperFunctions.ts

@@ -1,4 +1,4 @@
-import { Equal, FindOptionsWhere, IsNull, Not, Raw } from 'typeorm';
+import { Equal, FindOptionsWhere, In, IsNull, Not, Raw } from 'typeorm';
 
 /**
  * Special case for PID/PIN matching, as general text comparison is not sufficient.
@@ -69,6 +69,9 @@ export const constructFindOptionFromQuery = <T>(
     case 'is':
       internalMatcher = (str: string) => TimestampComparisonWrapper(str, '=');
       break;
+    case 'in':
+      // Assuming value is an array of numbers
+      return { [column]: In(value.split(',').map(Number)) } as FindOptionsWhere<T>;
     case 'not':
       internalMatcher = (str: string) => TimestampComparisonWrapper(str, '!=');
       break;