fix: add sub jurisdictions to allow multiple jurisdictions in search (#6323)

* fix: add sub jurisdictions to allow multiple jurisdictions in search

* fix: add the change to non-map view

* fix: update tests and calls on the partner site

* fix: more test fixes

* fix: review comments

* fix: switch to relationship

* fix: typo

Author: ludtkemorgan

api/prisma/migrations/60_sub_jurisdictions/migration.sql

@@ -0,0 +1,20 @@
+-- CreateTable
+CREATE TABLE "_SubJurisdictions" ("A" UUID NOT NULL, "B" UUID NOT NULL);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_SubJurisdictions_AB_unique" ON "_SubJurisdictions"("A", "B");
+
+-- CreateIndex
+CREATE INDEX "_SubJurisdictions_B_index" ON "_SubJurisdictions"("B");
+
+-- AddForeignKey
+ALTER TABLE
+    "_SubJurisdictions"
+ADD
+    CONSTRAINT "_SubJurisdictions_A_fkey" FOREIGN KEY ("A") REFERENCES "jurisdictions"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE
+    "_SubJurisdictions"
+ADD
+    CONSTRAINT "_SubJurisdictions_B_fkey" FOREIGN KEY ("B") REFERENCES "jurisdictions"("id") ON DELETE CASCADE ON UPDATE CASCADE;

api/prisma/schema.prisma

@@ -804,6 +804,8 @@ model Jurisdictions {
   referralSummaryDefault              String?                             @map("referral_summary_default")
   rentalAssistanceDefault             String                              @map("rental_assistance_default")
   requiredListingFields               String[]                            @default([]) @map("required_listing_fields")
+  subJurisdictions                    Jurisdictions[]                     @relation("SubJurisdictions")
+  parentJurisdictions                 Jurisdictions[]                     @relation("SubJurisdictions")
   visibleAccessibilityPriorityTypes   UnitAccessibilityPriorityTypeEnum[] @default([mobility, hearing, vision, hearingAndVision, mobilityAndHearing, mobilityAndVision, mobilityHearingAndVision]) @map("visible_accessibility_priority_types")
   visibleNeighborhoodAmenities        NeighborhoodAmenitiesEnum[]         @default([groceryStores, publicTransportation, schools, parksAndCommunityCenters, pharmacies, healthCareResources]) @map("visible_neighborhood_amenities")
   visibleSpokenLanguages              SpokenLanguageEnum[]                @default([chineseCantonese, chineseMandarin, english, filipino, korean, russian, spanish, vietnamese, farsi, afghani, notListed]) @map("visible_spoken_languages")

api/prisma/seed-helpers/jurisdiction-factory.ts

@@ -32,6 +32,7 @@ export const jurisdictionFactory = (
     visibleSpokenLanguages?: SpokenLanguageEnum[];
     visibleApplicationAccessibilityFeatures?: ApplicationAccessibilityFeatureEnum[];
     visibleHouseholdMemberRelationships?: HouseholdMemberRelationship[];
+    subJurisdictions?: string[];
   },
 ): Prisma.JurisdictionsCreateInput => ({
   name: jurisdictionName,
@@ -109,4 +110,9 @@ export const jurisdictionFactory = (
       HouseholdMemberRelationship.other,
       HouseholdMemberRelationship.aideOrAttendant,
     ],
+  subJurisdictions: optionalFields?.subJurisdictions
+    ? {
+        connect: optionalFields?.subJurisdictions?.map((id) => ({ id })),
+      }
+    : undefined,
 });

api/prisma/seed-staging/seed-bridge-bay.ts

@@ -2685,5 +2685,16 @@ export const createBridgeBayJurisdictions = async (
   );
   await seedListings(prismaClient, bridgeBayJurisdiction.id, listings);
 
+  await prismaClient.jurisdictions.update({
+    where: { id: bridgeBayJurisdiction.id },
+    data: {
+      subJurisdictions: {
+        connect: otherJurisdictions.map((jurisdiction) => ({
+          id: jurisdiction.id,
+        })),
+      },
+    },
+  });
+
   return [bridgeBayJurisdiction, ...otherJurisdictions];
 };

api/prisma/seed-staging/seed-staging-helpers.ts

@@ -38,22 +38,27 @@ export const seedListings = async (
         .toLowerCase()
         .replaceAll(' ', '-')}${randomInt(10)}@example.com`;
     }
-    await prismaClient.userAccounts.create({
-      data: await userFactory({
-        roles: {
-          isAdmin: false,
-          isPartner: true,
-          isJurisdictionalAdmin: false,
-        },
-        email: email,
-        confirmedAt: new Date(),
-        jurisdictionIds: [savedListing.jurisdictionId],
-        acceptedTerms: true,
-        listings: [savedListing.id],
-      }),
-    });
-
     console.log(`Added listing - ${savedListing.name}`);
+    try {
+      await prismaClient.userAccounts.create({
+        data: await userFactory({
+          roles: {
+            isAdmin: false,
+            isPartner: true,
+            isJurisdictionalAdmin: false,
+          },
+          email: email,
+          confirmedAt: new Date(),
+          jurisdictionIds: [savedListing.jurisdictionId],
+          acceptedTerms: true,
+          listings: [savedListing.id],
+        }),
+      });
+    } catch (error) {
+      console.error(
+        `Error creating user account for listing ${savedListing.name}: ${error}`,
+      );
+    }
   }
 };
 

api/src/dtos/jurisdictions/jurisdiction-update.dto.ts

@@ -6,4 +6,5 @@ export class JurisdictionUpdate extends OmitType(Jurisdiction, [
   'updatedAt',
   'featureFlags',
   'multiselectQuestions',
+  'subJurisdictions',
 ]) {}

api/src/dtos/jurisdictions/jurisdiction.dto.ts

@@ -9,6 +9,7 @@ import {
   ValidateNested,
   IsBoolean,
   IsNumber,
+  IsUUID,
 } from 'class-validator';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import {
@@ -269,4 +270,9 @@ export class Jurisdiction extends AbstractDTO {
   @Type(() => RaceEthnicityConfiguration)
   @ApiPropertyOptional({ type: RaceEthnicityConfiguration })
   raceEthnicityConfiguration?: RaceEthnicityConfiguration;
+
+  @Expose()
+  @Type(() => IdDTO)
+  @ApiPropertyOptional({ isArray: true, type: IdDTO })
+  subJurisdictions?: IdDTO[];
 }

api/src/dtos/listings/listings-filter-params.dto.ts

@@ -130,6 +130,14 @@ export class ListingFilterParams extends BaseFilter {
   @IsString({ groups: [ValidationsGroupsEnum.default] })
   [ListingFilterKeys.jurisdiction]?: string;
 
+  @Expose()
+  @ApiPropertyOptional({
+    type: Array,
+    example: ['jurisdiction1', 'jurisdiction2'],
+  })
+  @IsArray({ groups: [ValidationsGroupsEnum.default] })
+  [ListingFilterKeys.jurisdictions]?: string[];
+
   @Expose()
   @ApiPropertyOptional({
     example: 'FAB1A3C6-965E-4054-9A48-A282E92E9426',

api/src/enums/jurisdictions/view-enum.ts

@@ -0,0 +1,4 @@
+export enum JurisdictionViews {
+  public = 'public',
+  full = 'full',
+}

api/src/enums/listings/filter-key-enum.ts

@@ -12,6 +12,7 @@ export enum ListingFilterKeys {
   ids = 'ids',
   isVerified = 'isVerified',
   jurisdiction = 'jurisdiction',
+  jurisdictions = 'jurisdictions',
   leasingAgent = 'leasingAgent',
   listingFeatures = 'listingFeatures',
   listingType = 'listingType',