Removed duplicate CBBRs

Author: dhochbaum-dcp

src/community-board-budget-request/community-board-budget-request.repository.ts

@@ -321,18 +321,17 @@ export class CommunityBoardBudgetRequestRepository {
     buffer: number;
   }): Promise<FindManyRepo> {
     try {
-      return await this.db
-        .select({
-          id: communityBoardBudgetRequest.id,
-          cbbrPolicyAreaId: communityBoardBudgetRequest.policyArea,
-          title: communityBoardBudgetRequest.title,
-          communityBoardId: sql<string>`${borough.abbr} || ${communityBoardBudgetRequest.communityDistrictId}`,
-          isMapped: sql<boolean>`${or(
-            isNotNull(communityBoardBudgetRequest.liFtMPnt),
-            isNotNull(communityBoardBudgetRequest.liFtMPoly),
-          )}`,
-          isContinuedSupport: communityBoardBudgetRequest.isContinuedSupport,
-        })
+      return await this.db[geom === null ? "selectDistinct" : "select"]({
+        id: communityBoardBudgetRequest.id,
+        cbbrPolicyAreaId: communityBoardBudgetRequest.policyArea,
+        title: communityBoardBudgetRequest.title,
+        communityBoardId: sql<string>`${borough.abbr} || ${communityBoardBudgetRequest.communityDistrictId}`,
+        isMapped: sql<boolean>`${or(
+          isNotNull(communityBoardBudgetRequest.liFtMPnt),
+          isNotNull(communityBoardBudgetRequest.liFtMPoly),
+        )}`,
+        isContinuedSupport: communityBoardBudgetRequest.isContinuedSupport,
+      })
         .from(communityBoardBudgetRequest)
         .leftJoin(
           borough,
@@ -419,11 +418,12 @@ export class CommunityBoardBudgetRequestRepository {
         .limit(limit)
         .offset(offset)
         .orderBy(
-          sql`CASE
+          geom !== null
+            ? sql`CASE
                 WHEN ${geom !== null && isNotNull(communityBoardBudgetRequest.liFtMPnt)} THEN ${geom} <-> ${communityBoardBudgetRequest.liFtMPnt}
                 WHEN ${geom !== null && isNotNull(communityBoardBudgetRequest.liFtMPoly)} THEN ${geom} <-> ${communityBoardBudgetRequest.liFtMPoly}
-              END`,
-          communityBoardBudgetRequest.id,
+              END`
+            : communityBoardBudgetRequest.id,
         );
     } catch {
       throw new DataRetrievalException(
@@ -632,30 +632,29 @@ export class CommunityBoardBudgetRequestRepository {
     buffer: number;
   }): Promise<FindCsvRepo> {
     try {
-      return await this.db
-        .select({
-          id: communityBoardBudgetRequest.id,
-          communityBoardId: sql<string>`${borough.abbr} || ${communityBoardBudgetRequest.communityDistrictId}`,
-          address: communityBoardBudgetRequest.address,
-          siteName: communityBoardBudgetRequest.siteName,
-          segmentOnStreet: communityBoardBudgetRequest.segmentOnStreet,
-          segmentCrossStreetOne:
-            communityBoardBudgetRequest.segmentCrossStreetOne,
-          segmentCrossStreetTwo:
-            communityBoardBudgetRequest.segmentCrossStreetTwo,
-          intersectionStreetOne:
-            communityBoardBudgetRequest.intersectionStreetOne,
-          intersectionStreetTwo:
-            communityBoardBudgetRequest.intersectionStreetTwo,
-          requestType: sql<string>`SUBSTRING(${communityBoardBudgetRequest.requestType}, 1, 1)`,
-          isContinuedSupport: communityBoardBudgetRequest.isContinuedSupport,
-          request: cbbrRequest.description,
-          explanation: communityBoardBudgetRequest.explanation,
-          agency: communityBoardBudgetRequest.agency,
-          priority: communityBoardBudgetRequest.priority,
-          agencyCategoryResponse: cbbrAgencyCategoryResponse.description,
-          agencyResponse: communityBoardBudgetRequest.agencyResponse,
-        })
+      return await this.db[geom === null ? "selectDistinct" : "select"]({
+        id: communityBoardBudgetRequest.id,
+        communityBoardId: sql<string>`${borough.abbr} || ${communityBoardBudgetRequest.communityDistrictId}`,
+        address: communityBoardBudgetRequest.address,
+        siteName: communityBoardBudgetRequest.siteName,
+        segmentOnStreet: communityBoardBudgetRequest.segmentOnStreet,
+        segmentCrossStreetOne:
+          communityBoardBudgetRequest.segmentCrossStreetOne,
+        segmentCrossStreetTwo:
+          communityBoardBudgetRequest.segmentCrossStreetTwo,
+        intersectionStreetOne:
+          communityBoardBudgetRequest.intersectionStreetOne,
+        intersectionStreetTwo:
+          communityBoardBudgetRequest.intersectionStreetTwo,
+        requestType: sql<string>`SUBSTRING(${communityBoardBudgetRequest.requestType}, 1, 1)`,
+        isContinuedSupport: communityBoardBudgetRequest.isContinuedSupport,
+        request: cbbrRequest.description,
+        explanation: communityBoardBudgetRequest.explanation,
+        agency: communityBoardBudgetRequest.agency,
+        priority: communityBoardBudgetRequest.priority,
+        agencyCategoryResponse: cbbrAgencyCategoryResponse.description,
+        agencyResponse: communityBoardBudgetRequest.agencyResponse,
+      })
         .from(communityBoardBudgetRequest)
         .leftJoin(
           borough,
@@ -751,11 +750,12 @@ export class CommunityBoardBudgetRequestRepository {
           ),
         )
         .orderBy(
-          sql`CASE
+          geom !== null
+            ? sql`CASE
                 WHEN ${geom !== null && isNotNull(communityBoardBudgetRequest.liFtMPnt)} THEN ${geom} <-> ${communityBoardBudgetRequest.liFtMPnt}
                 WHEN ${geom !== null && isNotNull(communityBoardBudgetRequest.liFtMPoly)} THEN ${geom} <-> ${communityBoardBudgetRequest.liFtMPoly}
-              END`,
-          communityBoardBudgetRequest.id,
+              END`
+            : communityBoardBudgetRequest.id,
         );
     } catch {
       throw new DataRetrievalException(