expand public response schema

bcgov · Mar 19, 2024 · 9cd053f · 9cd053f
1 parent 9afc4fe
commit 9cd053f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/express-api/src/controllers/agencies/agenciesController.ts b/express-api/src/controllers/agencies/agenciesController.ts
@@ -1,4 +1,4 @@
-import { Request, Response } from 'express';
+import { NextFunction, Request, Response } from 'express';
 import * as agencyService from '@/services/agencies/agencyServices';
 import { AgencyFilterSchema, AgencyPublicResponseSchema } from '@/services/agencies/agencySchema';
 import { z } from 'zod';
@@ -11,25 +11,29 @@ import { Roles } from '@/constants/roles';
  * @param   {Response}    res Outgoing response
  * @returns {Response}        A 200 status with a list of agencies.
  */
-export const getAgencies = async (req: Request, res: Response) => {
+export const getAgencies = async (req: Request, res: Response, next: NextFunction) => {
   /**
    * #swagger.tags = ['Agencies - Admin']
    * #swagger.description = 'Gets a paged list of agencies.'
    * #swagger.security = [{
             "bearerAuth": []
       }]
    */
-  const kcUser = req.user as KeycloakUser;
-  const filter = AgencyFilterSchema.safeParse(req.query);
-  if (filter.success) {
-    const agencies = await agencyService.getAgencies(filter.data);
-    if (!kcUser.client_roles || !kcUser.client_roles.includes(Roles.ADMIN)) {
-      const trimmed = AgencyPublicResponseSchema.array().parse(agencies);
-      return res.status(200).send(trimmed);
+  try {
+    const kcUser = req.user as KeycloakUser;
+    const filter = AgencyFilterSchema.safeParse(req.query);
+    if (filter.success) {
+      const agencies = await agencyService.getAgencies(filter.data);
+      if (!kcUser.client_roles || !kcUser.client_roles.includes(Roles.ADMIN)) {
+        const trimmed = AgencyPublicResponseSchema.array().parse(agencies);
+        return res.status(200).send(trimmed);
+      }
+      return res.status(200).send(agencies);
+    } else {
+      return res.status(400).send('Could not parse filter.');
     }
-    return res.status(200).send(agencies);
-  } else {
-    return res.status(400).send('Could not parse filter.');
+  } catch (e) {
+    next(e);
   }
 };
 

diff --git a/express-api/src/services/agencies/agencySchema.ts b/express-api/src/services/agencies/agencySchema.ts
@@ -38,6 +38,7 @@ export const AgencyPublicResponseSchema = z.object({
   Code: z.string(),
   Description: z.string().nullable(),
   IsDisabled: z.boolean(),
+  ParentId: z.number().int().nullable(),
 });
 
 export type Agency = z.infer<typeof AgencyCreationSchema>;