CE-14-Add Offset to incident datetime (#165)

Co-authored-by: afwilcox <[email protected]>
bcgov · Oct 23, 2023 · dd97f08 · dd97f08
1 parent 5b91cb2
commit dd97f08
Show file tree

Hide file tree

Showing 28 changed files with 15,557 additions and 15,453 deletions.
diff --git a/backend/db/migrations/R__Create-Test-Data.sql b/backend/db/migrations/R__Create-Test-Data.sql
diff --git a/backend/db/migrations/R__WebEOC-July-ERS-complaints.sql b/backend/db/migrations/R__WebEOC-July-ERS-complaints.sql
diff --git a/backend/db/migrations/R__WebEOC-July-HWCR-complaints.sql b/backend/db/migrations/R__WebEOC-July-HWCR-complaints.sql
diff --git a/backend/db/migrations/V0.9.3__CE-14.sql b/backend/db/migrations/V0.9.3__CE-14.sql
@@ -0,0 +1 @@
+alter table public.complaint rename column incident_datetime to incident_utc_datetime;
diff --git a/backend/db/migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql b/backend/db/migrations/V0.9.4__CE-14-DML-NOT-FOR-PROD.sql
diff --git a/backend/src/main.ts b/backend/src/main.ts
@@ -10,6 +10,7 @@ async function bootstrap() {
     type: VersioningType.URI,
   });
   app.enableCors();
+  process.env.TZ='UTC';
   const config = new DocumentBuilder()
     .setTitle("Compliance and Enforcement API")
     .setDescription("The Complicance and Enforcement API")

diff --git a/backend/src/types/complaints/allegation_search_options.ts b/backend/src/types/complaints/allegation_search_options.ts
@@ -0,0 +1,10 @@
+export interface AllegationSearchOptions {
+    community: string;
+    zone: string;
+    region: string;
+    officerAssigned: string;
+    violationCode: string;
+    incidentReportedStart: string;
+    incidentReportedEnd: string;
+    status: string;
+  }
diff --git a/backend/src/types/complaints/hwcr_search_options.ts b/backend/src/types/complaints/hwcr_search_options.ts
@@ -0,0 +1,11 @@
+export interface HWCRSearchOptions {
+    community: string;
+    zone: string;
+    region: string;
+    officerAssigned: string;
+    natureOfComplaint: string;
+    speciesCode: string;
+    incidentReportedStart: Date;
+    incidentReportedEnd: Date;
+    status: string;
+  }
diff --git a/backend/src/v1/allegation_complaint/allegation_complaint.controller.ts b/backend/src/v1/allegation_complaint/allegation_complaint.controller.ts
@@ -16,6 +16,7 @@ import { ApiTags } from "@nestjs/swagger";
 import { Roles } from "../../auth/decorators/roles.decorator";
 import { Role } from "../../enum/role.enum";
 import { UUID } from "crypto";
+import { AllegationSearchOptions } from "../../types/complaints/allegation_search_options";
 
 @UseGuards(JwtRoleGuard)
 @ApiTags("allegation-complaint")
@@ -60,17 +61,22 @@ export class AllegationComplaintController {
     @Query("status") status,
     @Query('page') page: number, 
     @Query('pageSize') pageSize: number) {
+
+    const options: AllegationSearchOptions = {
+      community: community,
+      zone: zone,
+      region: region,
+      officerAssigned: officerAssigned,
+      violationCode: violationCode,
+      incidentReportedStart: incidentReportedStart,
+      incidentReportedEnd: incidentReportedEnd,
+      status: status,
+    };
+
     return this.allegationComplaintService.search(
       sortColumn,
       sortOrder,
-      community,
-      zone,
-      region,
-      officerAssigned,
-      violationCode,
-      incidentReportedStart,
-      incidentReportedEnd,
-      status,
+      options,
       page,
       pageSize,
     );
@@ -90,17 +96,22 @@ export class AllegationComplaintController {
     @Query("incidentReportedEnd") incidentReportedEnd: string,
     @Query("status") status
   ) {
+
+    const options: AllegationSearchOptions = {
+      community: community,
+      zone: zone,
+      region: region,
+      officerAssigned: officerAssigned,
+      violationCode: violationCode,
+      incidentReportedStart: incidentReportedStart,
+      incidentReportedEnd: incidentReportedEnd,
+      status: status,
+    };
+
     return this.allegationComplaintService.searchMap(
       sortColumn,
       sortOrder,
-      community,
-      zone,
-      region,
-      officerAssigned,
-      violationCode,
-      incidentReportedStart,
-      incidentReportedEnd,
-      status,
+      options,
     );
   }