fix: filter agency by jurisdiction

Author: emilyjablonski

api/src/services/agency.service.ts

@@ -3,8 +3,10 @@ import {
   Injectable,
   NotFoundException,
 } from '@nestjs/common';
+import { Prisma } from '@prisma/client';
 import { PrismaService } from './prisma.service';
 import { AgencyQueryParams } from '../dtos/agency/agency-query-params.dto';
+import { AgencyFilterKeys } from '../enums/agency/filter-key-enum';
 import AgencyCreate from '../dtos/agency/agency-create.dto';
 import { AgencyUpdate } from '../dtos/agency/agency-update.dto';
 import {
@@ -44,6 +46,7 @@ export class AgencyService {
       include: {
         jurisdictions: true,
       },
+      where: this.buildWhereClause(params),
     });
 
     const agencies = mapTo(Agency, agenciesRaw);
@@ -54,6 +57,28 @@ export class AgencyService {
     };
   }
 
+  buildWhereClause(params: AgencyQueryParams): Prisma.AgencyWhereInput {
+    const filters: Prisma.AgencyWhereInput[] = [];
+
+    const jurisdictionId = params?.filter?.find(
+      (filter) => filter[AgencyFilterKeys.jurisdiction],
+    )?.[AgencyFilterKeys.jurisdiction];
+
+    if (jurisdictionId) {
+      filters.push({
+        jurisdictions: {
+          is: {
+            id: jurisdictionId,
+          },
+        },
+      });
+    }
+
+    return {
+      AND: filters,
+    };
+  }
+
   /**
    * Returns a single agency entry matching the provided ID.
    *

api/test/unit/services/agencies.service.spec.ts

@@ -6,6 +6,7 @@ import { AgencyService } from '../../../src/services/agency.service';
 import { PrismaService } from '../../../src/services/prisma.service';
 import { PermissionService } from '../../../src/services/permission.service';
 import { BadRequestException, NotFoundException } from '@nestjs/common';
+import { Compare } from '../../../src/dtos/shared/base-filter.dto';
 
 describe('Testing agency service', () => {
   let service: AgencyService;
@@ -110,6 +111,9 @@ describe('Testing agency service', () => {
         include: {
           jurisdictions: true,
         },
+        where: {
+          AND: [],
+        },
       });
     });
 
@@ -144,6 +148,9 @@ describe('Testing agency service', () => {
         include: {
           jurisdictions: true,
         },
+        where: {
+          AND: [],
+        },
       });
     });
 
@@ -178,6 +185,9 @@ describe('Testing agency service', () => {
         include: {
           jurisdictions: true,
         },
+        where: {
+          AND: [],
+        },
       });
     });
 
@@ -202,6 +212,82 @@ describe('Testing agency service', () => {
         include: {
           jurisdictions: true,
         },
+        where: {
+          AND: [],
+        },
+      });
+    });
+
+    it('should apply jurisdiction filter when provided', async () => {
+      const date = new Date();
+      const jurisdictionId = randomUUID();
+      const mockedValue = mockAgencySet(2, date, jurisdictionId);
+      prisma.agency.findMany = jest.fn().mockResolvedValue(mockedValue);
+      prisma.agency.count = jest.fn().mockResolvedValue(2);
+
+      const params: AgencyQueryParams = {
+        filter: [
+          {
+            $comparison: Compare['='],
+            jurisdiction: jurisdictionId,
+          },
+        ],
+      };
+
+      await service.list(params);
+
+      expect(prisma.agency.findMany).toHaveBeenCalledWith({
+        skip: 0,
+        take: undefined,
+        include: {
+          jurisdictions: true,
+        },
+        where: {
+          AND: [
+            {
+              jurisdictions: {
+                is: {
+                  id: jurisdictionId,
+                },
+              },
+            },
+          ],
+        },
+      });
+    });
+  });
+
+  describe('buildWhereClause', () => {
+    it('should return empty where when jurisdiction filter is not provided', () => {
+      const where = service.buildWhereClause({});
+
+      expect(where).toEqual({
+        AND: [],
+      });
+    });
+
+    it('should build jurisdiction where clause from filter array', () => {
+      const jurisdictionId = randomUUID();
+
+      const where = service.buildWhereClause({
+        filter: [
+          {
+            $comparison: Compare['='],
+            jurisdiction: jurisdictionId,
+          },
+        ],
+      });
+
+      expect(where).toEqual({
+        AND: [
+          {
+            jurisdictions: {
+              is: {
+                id: jurisdictionId,
+              },
+            },
+          },
+        ],
       });
     });
   });

sites/public/src/lib/hooks.ts

@@ -374,7 +374,7 @@ export async function fetchAgencies(req: any, jurisdictionId: string) {
     } = {
       filter: [
         {
-          $comparison: EnumAgencyFilterParamsComparison["IN"],
+          $comparison: EnumAgencyFilterParamsComparison["="],
           jurisdiction: jurisdictionId && jurisdictionId !== "" ? jurisdictionId : undefined,
         },
       ],