the disappoiting children

NYCPlanning · Jul 29, 2024 · 43ce5de · 43ce5de
1 parent 522d2c0
commit 43ce5de
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 16 deletions.
diff --git a/src/capital-project/capital-project.service.spec.ts b/src/capital-project/capital-project.service.spec.ts
@@ -5,6 +5,7 @@ import { CapitalProjectRepository } from "./capital-project.repository";
 import {
   findCapitalCommitmentsByManagingCodeCapitalProjectIdQueryResponseSchema,
   findCapitalProjectByManagingCodeCapitalProjectIdQueryResponseSchema,
+  findCapitalProjectGeoJsonByManagingCodeCapitalProjectIdQueryResponseSchema,
   findCapitalProjectTilesQueryResponseSchema,
 } from "src/gen";
 import { ResourceNotFoundException } from "src/exception";
@@ -58,6 +59,38 @@ describe("CapitalProjectService", () => {
     });
   });
 
+  describe.only("findGeoJsonByManagingCodeCapitalProjectId", () => {
+    it("should return a capital project geojson with a valid request", async () => {
+      const capitalProjectGeoJsonMock =
+        capitalProjectRepository
+          .findGeoJsonByManagingCodeCapitalProjectIdMock[0];
+      const { managingCode, id: capitalProjectId } = capitalProjectGeoJsonMock;
+      const capitalProjectGeoJson =
+        await capitalProjectService.findGeoJsonByManagingCodeCapitalProjectId({
+          managingCode,
+          capitalProjectId,
+        });
+
+      expect(() =>
+        findCapitalProjectGeoJsonByManagingCodeCapitalProjectIdQueryResponseSchema.parse(
+          capitalProjectGeoJson,
+        ),
+      ).not.toThrow();
+    });
+
+    it("should throw a resource error when requesting a missing project", async () => {
+      const missingManagingCode = "890";
+      const missingCapitalProjectId = "ABCD";
+
+      expect(
+        capitalProjectService.findGeoJsonByManagingCodeCapitalProjectId({
+          managingCode: missingManagingCode,
+          capitalProjectId: missingCapitalProjectId,
+        }),
+      ).rejects.toThrow(ResourceNotFoundException);
+    });
+  });
+
   describe("findTiles", () => {
     it("should return an mvt when requesting coordinates", async () => {
       const mvt = await capitalProjectService.findTiles({

diff --git a/src/capital-project/capital-project.service.ts b/src/capital-project/capital-project.service.ts
@@ -34,13 +34,13 @@ export class CapitalProjectService {
   async findGeoJsonByManagingCodeCapitalProjectId(
     params: FindCapitalProjectGeoJsonByManagingCodeCapitalProjectIdPathParams,
   ) {
-    const capitalProjectCheck =
-      await this.capitalProjectRepository.checkByManagingCodeCapitalProjectId(
-        params.managingCode,
-        params.capitalProjectId,
-      );
-    if (capitalProjectCheck === undefined)
-      throw new ResourceNotFoundException();
+    // const capitalProjectCheck =
+    //   await this.capitalProjectRepository.checkByManagingCodeCapitalProjectId(
+    //     params.managingCode,
+    //     params.capitalProjectId,
+    //   );
+    // if (capitalProjectCheck === undefined)
+    //   throw new ResourceNotFoundException();
 
     const capitalProjects =
       await this.capitalProjectRepository.findGeoJsonByManagingCodeCapitalProjectId(
@@ -50,6 +50,8 @@ export class CapitalProjectService {
     if (capitalProjects.length < 1) throw new ResourceNotFoundException();
 
     const capitalProject = capitalProjects[0];
+    // console.debug(`capitalProject`, capitalProject);
+    console.debug(`capitalProject Geo`, capitalProject.geometry);
     const geometry =
       capitalProject.geometry === null
         ? null
@@ -63,7 +65,7 @@ export class CapitalProjectService {
     ) as CapitalProjectBudgetedEntity;
 
     return {
-      id: `${properties.managingCode}${properties.id}`,
+      id: `${capitalProject.managingCode}${capitalProject.id}`,
       type: "Feature",
       properties,
       geometry,

diff --git a/test/capital-project/capital-project.repository.mock.ts b/test/capital-project/capital-project.repository.mock.ts
@@ -84,6 +84,14 @@ export class CapitalProjectRepositoryMock {
     );
   }
 
+  // findGeoJsonByManagingCodeCapitalProjectIdMock = Array.from(
+  //   Array(1),
+  //   (_, seed) =>
+  //     generateMock(findGeoJsonByManagingCodeCapitalProjectIdRepoSchema, {
+  //       seed: seed + 1,
+  //     }),
+  // );
+
   findGeoJsonByManagingCodeCapitalProjectIdMock = generateMock(
     findGeoJsonByManagingCodeCapitalProjectIdRepoSchema,
     {
@@ -99,20 +107,13 @@ export class CapitalProjectRepositoryMock {
     managingCode,
     capitalProjectId,
   }: FindCapitalProjectGeoJsonByManagingCodeCapitalProjectIdPathParams): Promise<FindGeoJsonByManagingCodeCapitalProjectIdRepo> {
-    // const compositeKey = `${managingCode}${capitalProjectId}`;
-    // const results = this.findGeoJsonByManagingCodeCapitalProjectIdMock.find(
-    //   (capitalProjectsGeoJson) => compositeKey in capitalProjectsGeoJson,
-    // );
-
-    // return results === undefined ? [] : results[compositeKey];
-
     const results = this.findGeoJsonByManagingCodeCapitalProjectIdMock.filter(
       (capitalProjectGeoJson) =>
         capitalProjectGeoJson.id === capitalProjectId &&
         capitalProjectGeoJson.managingCode === managingCode,
     );
 
-    console.debug(`results`, results);
+    // console.debug(`results`, results);
     return results === undefined ? [] : results;
   }