bcgov · curtisupshall · Oct 25, 2023 · Oct 12, 2023 · Oct 12, 2023 · Oct 12, 2023
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/src/models/survey-create.test.ts b/api/src/models/survey-create.test.ts
@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
   PostAgreementsData,
-  PostLocationData,
   PostPartnershipsData,
   PostPermitData,
   PostProprietorData,
@@ -362,54 +361,6 @@ describe('PostProprietorData', () => {
   });
 });
 
-describe('PostLocationData', () => {
-  describe('No values provided', () => {
-    let data: PostLocationData;
-
-    before(() => {
-      data = new PostLocationData(null);
-    });
-
-    it('sets name', () => {
-      expect(data.name).to.equal(null);
-    });
-
-    it('sets description', () => {
-      expect(data.description).to.equal(null);
-    });
-
-    it('sets geojson', () => {
-      expect(data.geojson).to.eql([]);
-    });
-  });
-
-  describe('All values provided with first nations id', () => {
-    let data: PostLocationData;
-
-    const obj = {
-      name: 'area name',
-      description: 'area description',
-      geojson: [{}]
-    };
-
-    before(() => {
-      data = new PostLocationData(obj);
-    });
-
-    it('sets name', () => {
-      expect(data.name).to.equal(obj.name);
-    });
-
-    it('sets description', () => {
-      expect(data.description).to.equal(obj.description);
-    });
-
-    it('sets geojson', () => {
-      expect(data.geojson).to.eql(obj.geojson);
-    });
-  });
-});
-
 describe('PostPurposeAndMethodologyData', () => {
   describe('No values provided', () => {
     let data: PostPurposeAndMethodologyData;

diff --git a/api/src/models/survey-create.ts b/api/src/models/survey-create.ts
@@ -1,6 +1,6 @@
-import { Feature } from 'geojson';
 import { SurveyStratum } from '../repositories/site-selection-strategy-repository';
 import { PostSurveyBlock } from '../repositories/survey-block-repository';
+import { PostSurveyLocationData } from './survey-update';
 
 export class PostSurveyObject {
   survey_details: PostSurveyDetailsData;
@@ -9,7 +9,7 @@ export class PostSurveyObject {
   funding_sources: PostFundingSourceData[];
   proprietor: PostProprietorData;
   purpose_and_methodology: PostPurposeAndMethodologyData;
-  locations: PostLocationData[];
+  locations: PostSurveyLocationData[];
   agreements: PostAgreementsData;
   participants: PostParticipationData[];
   partnerships: PostPartnershipsData;
@@ -29,7 +29,7 @@ export class PostSurveyObject {
     this.participants =
       (obj?.participants?.length && obj.participants.map((p: any) => new PostParticipationData(p))) || [];
     this.partnerships = (obj?.partnerships && new PostPartnershipsData(obj.partnerships)) || null;
-    this.locations = (obj?.locations && obj.locations.map((p: any) => new PostLocationData(p))) || [];
+    this.locations = (obj?.locations && obj.locations.map((p: any) => new PostSurveyLocationData(p))) || [];
     this.site_selection = (obj?.site_selection && new PostSiteSelectionData(obj)) || null;
     this.blocks = (obj?.blocks && obj.blocks.map((p: any) => p as PostSurveyBlock)) || [];
   }
@@ -120,18 +120,6 @@ export class PostProprietorData {
   }
 }
 
-export class PostLocationData {
-  name: string;
-  description: string;
-  geojson: Feature[];
-
-  constructor(obj?: any) {
-    this.name = obj?.name || null;
-    this.description = obj?.description || null;
-    this.geojson = (obj?.geojson?.length && obj.geojson) || [];
-  }
-}
-
 export class PostPurposeAndMethodologyData {
   intended_outcome_id: number;
   additional_details: string;

diff --git a/api/src/models/survey-update.test.ts b/api/src/models/survey-update.test.ts
@@ -1,9 +1,9 @@
 import { expect } from 'chai';
 import { describe } from 'mocha';
 import {
+  PostSurveyLocationData,
   PutPartnershipsData,
   PutSurveyDetailsData,
-  PutSurveyLocationData,
   PutSurveyObject,
   PutSurveyPermitData,
   PutSurveyProprietorData,
@@ -410,18 +410,18 @@ describe('PutPurposeAndMethodologyData', () => {
 
 describe('PutLocationData', () => {
   describe('No values provided', () => {
-    let data: PutSurveyLocationData;
+    let data: PostSurveyLocationData;
 
     before(() => {
-      data = new PutSurveyLocationData(null);
+      data = new PostSurveyLocationData(null);
     });
 
     it('sets name', () => {
       expect(data.name).to.equal(null);
     });
 
     it('sets description', () => {
-      expect(data.description).to.equal(null);
+      expect(data.description).to.equal('');
     });
 
     it('sets geojson', () => {
@@ -434,7 +434,7 @@ describe('PutLocationData', () => {
   });
 
   describe('All values provided with first nations id', () => {
-    let data: PutSurveyLocationData;
+    let data: PostSurveyLocationData;
 
     const obj = {
       name: 'area name',
@@ -444,7 +444,7 @@ describe('PutLocationData', () => {
     };
 
     before(() => {
-      data = new PutSurveyLocationData(obj);
+      data = new PostSurveyLocationData(obj);
     });
 
     it('sets name', () => {

diff --git a/api/src/models/survey-update.ts b/api/src/models/survey-update.ts
@@ -9,7 +9,7 @@ export class PutSurveyObject {
   funding_sources: PutFundingSourceData[];
   proprietor: PutSurveyProprietorData;
   purpose_and_methodology: PutSurveyPurposeAndMethodologyData;
-  locations: PutSurveyLocationData[];
+  locations: PostSurveyLocationData[];
   participants: PutSurveyParticipantsData[];
   partnerships: PutPartnershipsData;
   site_selection: PutSiteSelectionData;
@@ -26,7 +26,7 @@ export class PutSurveyObject {
       (obj?.purpose_and_methodology && new PutSurveyPurposeAndMethodologyData(obj.purpose_and_methodology)) || null;
     this.participants =
       (obj?.participants?.length && obj.participants.map((p: any) => new PutSurveyParticipantsData(p))) || [];
-    this.locations = (obj?.locations && obj.locations.map((p: any) => new PutSurveyLocationData(p))) || [];
+    this.locations = (obj?.locations && obj.locations.map((p: any) => new PostSurveyLocationData(p))) || [];
     this.partnerships = (obj?.partnerships && new PutPartnershipsData(obj.partnerships)) || null;
     this.site_selection = (obj?.site_selection && new PutSiteSelectionData(obj)) || null;
     this.blocks = (obj?.blocks && obj.blocks.map((p: any) => p as PostSurveyBlock)) || [];
@@ -150,17 +150,18 @@ export class PutSurveyPurposeAndMethodologyData {
   }
 }
 
-export class PutSurveyLocationData {
-  survey_location_id: number;
+// This class is used for both insert and updating a survey location
+export class PostSurveyLocationData {
+  survey_location_id: number | undefined;
   name: string;
   description: string;
   geojson: Feature[];
-  revision_count: number;
+  revision_count: number | undefined;
 
   constructor(obj?: any) {
     this.survey_location_id = obj?.survey_location_id || null;
     this.name = obj?.name || null;
-    this.description = obj?.description || null;
+    this.description = obj?.description || '';
     this.geojson = (obj?.geojson?.length && obj.geojson) || [];
     this.revision_count = obj?.revision_count ?? null;
   }

diff --git a/api/src/repositories/administrative-activity-repository.ts b/api/src/repositories/administrative-activity-repository.ts
@@ -5,7 +5,7 @@ import {
   ADMINISTRATIVE_ACTIVITY_TYPE
 } from '../constants/administrative-activity';
 import { ApiExecuteSQLError } from '../errors/api-error';
-import { jsonSchema } from '../zod-schema/json';
+import { shallowJsonSchema } from '../zod-schema/json';
 import { BaseRepository } from './base-repository';
 
 export const IAdministrativeActivityStanding = z.object({
@@ -22,7 +22,7 @@ export const IAdministrativeActivity = z.object({
   status: z.number(),
   status_name: z.string(),
   description: z.string().nullable(),
-  data: jsonSchema,
+  data: shallowJsonSchema,
   notes: z.string().nullable(),
   create_date: z.string()
 });

diff --git a/api/src/repositories/draft-repository.ts b/api/src/repositories/draft-repository.ts
@@ -1,13 +1,13 @@
 import SQL, { SQLStatement } from 'sql-template-strings';
 import { z } from 'zod';
 import { ApiExecuteSQLError } from '../errors/api-error';
-import { jsonSchema } from '../zod-schema/json';
+import { shallowJsonSchema } from '../zod-schema/json';
 import { BaseRepository } from './base-repository';
 
 export const WebformDraft = z.object({
   webform_draft_id: z.number(),
   name: z.string(),
-  data: jsonSchema,
+  data: shallowJsonSchema,
   create_date: z.string(),
   update_date: z.string().nullable()
 });

diff --git a/api/src/repositories/sample-location-repository.test.ts b/api/src/repositories/sample-location-repository.test.ts
@@ -120,7 +120,6 @@ describe('SampleLocationRepository', () => {
       } catch (error) {
         expect(dbConnectionObj.sql).to.have.been.calledOnce;
         expect((error as ApiExecuteSQLError).message).to.be.eql('Failed to insert sample location');
-        expect(dbConnectionObj.sql).to.have.been.calledOnce;
       }
     });
   });
@@ -151,7 +150,6 @@ describe('SampleLocationRepository', () => {
       } catch (error) {
         expect(dbConnectionObj.sql).to.have.been.calledOnce;
         expect((error as ApiExecuteSQLError).message).to.be.eql('Failed to delete survey block record');
-        expect(dbConnectionObj.sql).to.have.been.calledOnce;
       }
     });
   });

diff --git a/api/src/repositories/sample-method-repository.test.ts b/api/src/repositories/sample-method-repository.test.ts
@@ -132,7 +132,6 @@ describe('SampleMethodRepository', () => {
       } catch (error) {
         expect(dbConnectionObj.sql).to.have.been.calledOnce;
         expect((error as ApiExecuteSQLError).message).to.be.eql('Failed to insert sample method');
-        expect(dbConnectionObj.sql).to.have.been.calledOnce;
       }
     });
   });
@@ -163,7 +162,6 @@ describe('SampleMethodRepository', () => {
       } catch (error) {
         expect(dbConnectionObj.sql).to.have.been.calledOnce;
         expect((error as ApiExecuteSQLError).message).to.be.eql('Failed to delete sample method');
-        expect(dbConnectionObj.sql).to.have.been.calledOnce;
       }
     });
   });

diff --git a/api/src/repositories/sample-period-repository.test.ts b/api/src/repositories/sample-period-repository.test.ts
@@ -116,7 +116,6 @@ describe('SamplePeriodRepository', () => {
       } catch (error) {
         expect(dbConnectionObj.sql).to.have.been.calledOnce;
         expect((error as ApiExecuteSQLError).message).to.be.eql('Failed to insert sample period');
-        expect(dbConnectionObj.sql).to.have.been.calledOnce;
       }
     });
   });
@@ -147,7 +146,6 @@ describe('SamplePeriodRepository', () => {
       } catch (error) {
         expect(dbConnectionObj.sql).to.have.been.calledOnce;
         expect((error as ApiExecuteSQLError).message).to.be.eql('Failed to delete sample period');
-        expect(dbConnectionObj.sql).to.have.been.calledOnce;
       }
     });
   });