fix: geocoding sj

api/prisma/seed-staging.ts

@@ -48,10 +48,10 @@ export const stagingSeed = async (
     data: jurisdictionFactory(jurisdictionName, [UserRoleEnum.admin]),
   });
   // add additional jurisdictions
-  const additionalJurisdiction = await prismaClient.jurisdictions.create({
+  const sanMateoJurisdiction = await prismaClient.jurisdictions.create({
     data: jurisdictionFactory('San Mateo'),
   });
-  await prismaClient.jurisdictions.create({
+  const sanJoseJurisdiction = await prismaClient.jurisdictions.create({
     data: jurisdictionFactory('San Jose'),
   });
   // create admin user
@@ -60,7 +60,11 @@ export const stagingSeed = async (
       roles: { isAdmin: true },
       email: '[email protected]',
       confirmedAt: new Date(),
-      jurisdictionIds: [jurisdiction.id, additionalJurisdiction.id],
+      jurisdictionIds: [
+        jurisdiction.id,
+        sanMateoJurisdiction.id,
+        sanJoseJurisdiction.id,
+      ],
       acceptedTerms: true,
       password: 'abcdef',
     }),
@@ -128,7 +132,7 @@ export const stagingSeed = async (
     data: amiChartFactory(10, jurisdiction.id),
   });
   await prismaClient.amiChart.create({
-    data: amiChartFactory(8, additionalJurisdiction.id),
+    data: amiChartFactory(8, sanJoseJurisdiction.id),
   });
   // Create map layers
   await prismaClient.mapLayers.create({
@@ -1217,7 +1221,7 @@ export const stagingSeed = async (
             },
             email: '[email protected]',
             confirmedAt: new Date(),
-            jurisdictionIds: [jurisdiction.id, additionalJurisdiction.id],
+            jurisdictionIds: [jurisdiction.id, sanMateoJurisdiction.id],
             acceptedTerms: true,
             listings: [savedListing.id],
           }),

api/src/controllers/script-runner.controller.ts

@@ -158,6 +158,7 @@ export class ScirptRunnerController {
       body.description,
     );
   }
+
   @Put('updateCodeExpirationTranslations')
   @ApiOperation({
     summary:
@@ -185,4 +186,16 @@ export class ScirptRunnerController {
       req,
     );
   }
+
+  @Put('insertSanJoseMapLayers')
+  @ApiOperation({
+    summary: 'A script that adds map layers for San Jose',
+    operationId: 'insertSanJoseMapLayers',
+  })
+  @ApiOkResponse({ type: SuccessDTO })
+  async insertSanJoseMapLayers(
+    @Request() req: ExpressRequest,
+  ): Promise<SuccessDTO> {
+    return await this.scriptRunnerService.insertSanJoseMapLayers(req);
+  }
 }

api/src/services/script-runner.service.ts

@@ -19,6 +19,17 @@ import { AmiChartCreate } from '../dtos/ami-charts/ami-chart-create.dto';
 import { AmiChartService } from './ami-chart.service';
 import { AmiChartUpdate } from '../dtos/ami-charts/ami-chart-update.dto';
 import { AmiChartUpdateImportDTO } from '../dtos/script-runner/ami-chart-update-import.dto';
+import sanJoseRedlined from '../data/SanJoseRedlined.json';
+import district1 from '../data/SanJoseDistrict1.json';
+import district2 from '../data/SanJoseDistrict2.json';
+import district3 from '../data/SanJoseDistrict3.json';
+import district4 from '../data/SanJoseDistrict4.json';
+import district5 from '../data/SanJoseDistrict5.json';
+import district6 from '../data/SanJoseDistrict6.json';
+import district7 from '../data/SanJoseDistrict7.json';
+import district8 from '../data/SanJoseDistrict8.json';
+import district9 from '../data/SanJoseDistrict9.json';
+import district10 from '../data/SanJoseDistrict10.json';
 
 /**
   this is the service for running scripts
@@ -630,6 +641,56 @@ export class ScriptRunnerService {
     );
     return { success: true };
   }
+  /**
+   *
+   * @param req incoming request object
+   * @returns successDTO
+   * @description Adds 11 new map layers for San Jose
+   */
+  async insertSanJoseMapLayers(req: ExpressRequest): Promise<SuccessDTO> {
+    const requestingUser = mapTo(User, req['user']);
+    await this.markScriptAsRunStart('san jose map layers', requestingUser);
+
+    const sjId = await this.prisma.jurisdictions.findFirst({
+      select: {
+        id: true,
+      },
+      where: { name: 'San Jose' },
+    });
+
+    await this.prisma.mapLayers.create({
+      data: {
+        name: 'San Jose Redlined',
+        jurisdictionId: sjId.id,
+        featureCollection: sanJoseRedlined,
+      },
+    });
+
+    const councilDistrictMaps = [
+      district1,
+      district2,
+      district3,
+      district4,
+      district5,
+      district6,
+      district7,
+      district8,
+      district9,
+      district10,
+    ];
+    councilDistrictMaps.forEach(async (disctict, index) => {
+      await this.prisma.mapLayers.create({
+        data: {
+          name: `San Jose District ${index + 1}`,
+          jurisdictionId: sjId.id,
+          featureCollection: disctict,
+        },
+      });
+    });
+
+    await this.markScriptAsComplete('san jose map layers', requestingUser);
+    return { success: true };
+  }
 
   /**
     this is simply an example

api/test/unit/services/script-runner.service.spec.ts

@@ -841,4 +841,32 @@ describe('Testing script runner service', () => {
       },
     });
   });
+
+  describe('insertSanJoseMapLayers', () => {
+    it('should insert all san jose maps', async () => {
+      const id = randomUUID();
+      const jurisdictionId = randomUUID();
+      prisma.scriptRuns.findUnique = jest.fn().mockResolvedValue(null);
+      prisma.scriptRuns.create = jest.fn().mockResolvedValue(null);
+      prisma.scriptRuns.update = jest.fn().mockResolvedValue(null);
+      prisma.jurisdictions.findFirst = jest
+        .fn()
+        .mockResolvedValue({ id: jurisdictionId });
+      prisma.mapLayers.create = jest.fn();
+      await service.insertSanJoseMapLayers({
+        user: {
+          id,
+        } as unknown as User,
+      } as unknown as ExpressRequest);
+
+      expect(prisma.mapLayers.create).toHaveBeenCalledTimes(11);
+      expect(prisma.mapLayers.create).toHaveBeenCalledWith({
+        data: {
+          name: 'San Jose Redlined',
+          jurisdictionId: jurisdictionId,
+          featureCollection: expect.anything(),
+        },
+      });
+    });
+  });
 });

api/tsconfig.json

@@ -17,7 +17,8 @@
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
     "noFallthroughCasesInSwitch": false,
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
   },
   "exclude": ["node_modules", "dist"]
 }

shared-helpers/src/types/backend-swagger.ts

@@ -2311,7 +2311,6 @@ export class ScriptRunnerService {
       axios(configs, resolve, reject)
     })
   }
-
   /**
    * A script that updates the preference keys for applications on Spark Homes
    */
@@ -2327,6 +2326,22 @@ export class ScriptRunnerService {
 
       configs.data = data
 
+      axios(configs, resolve, reject)
+    })
+  }
+  /**
+   * A script that adds map layers for San Jose
+   */
+  insertSanJoseMapLayers(options: IRequestOptions = {}): Promise<SuccessDTO> {
+    return new Promise((resolve, reject) => {
+      let url = basePath + "/scriptRunner/insertSanJoseMapLayers"
+
+      const configs: IRequestConfig = getConfigs("put", "application/json", url, options)
+
+      let data = null
+
+      configs.data = data
+
       axios(configs, resolve, reject)
     })
   }
@@ -5939,7 +5954,6 @@ export interface AmiChartImportDTO {
   jurisdictionId: string
 }
 
-
 export interface AmiChartUpdateImportDTO {
   /**  */
   values: string

sites/partners/cypress/e2e/default/09-lottery.spec.ts

@@ -46,7 +46,7 @@ describe("Lottery Tests", () => {
       .should("be.visible")
       .type("[email protected]", { force: true })
     cy.getByID("[email protected]").first().click()
-    cy.getByTestId("listings-all-Alameda").check()
+    cy.getByTestId("listings-all-Alameda").check({ force: true })
     cy.getByID("save-user").click()
 
     // Login as partner and view lottery tab

sites/partners/src/components/settings/PreferenceDrawer.tsx

@@ -731,10 +731,12 @@ const PreferenceDrawer = ({
                             mapLayers
                               ? [
                                   { label: "", value: "" },
-                                  ...mapLayers.map((layer) => ({
-                                    label: layer.name,
-                                    value: layer.id,
-                                  })),
+                                  ...mapLayers
+                                    .sort((a, b) => a.name.localeCompare(b.name))
+                                    .map((layer) => ({
+                                      label: layer.name,
+                                      value: layer.id,
+                                    })),
                                 ]
                               : [{ label: "", value: "" }]
                           }