Merge branch 'dev' into double-standards

api/src/models/biohub-create.test.ts

@@ -191,8 +191,7 @@ describe('PostSurveySubmissionToBioHubObject', () => {
     const purpose_and_methodology: GetSurveyPurposeAndMethodologyData = {
       intended_outcome_ids: [],
       additional_details: 'A description of the purpose',
-      revision_count: 0,
-      vantage_code_ids: []
+      revision_count: 0
     };
 
     const survey_geometry: FeatureCollection = {

api/src/models/survey-create.test.ts

@@ -192,18 +192,13 @@ describe('PostSpeciesData', () => {
     it('sets focal_species', () => {
       expect(data.focal_species).to.eql([]);
     });
-
-    it('sets ancillary_species', () => {
-      expect(data.ancillary_species).to.eql([]);
-    });
   });
 
   describe('All values provided', () => {
     let data: PostSpeciesData;
 
     const obj = {
-      focal_species: [1, 2],
-      ancillary_species: [3]
+      focal_species: [1, 2]
     };
 
     before(() => {
@@ -213,10 +208,6 @@ describe('PostSpeciesData', () => {
     it('sets focal_species', () => {
       expect(data.focal_species).to.eql([1, 2]);
     });
-
-    it('sets ancillary_species', () => {
-      expect(data.ancillary_species).to.eql([3]);
-    });
   });
 });
 
@@ -376,19 +367,14 @@ describe('PostPurposeAndMethodologyData', () => {
     it('sets additional_details', () => {
       expect(data.additional_details).to.equal(null);
     });
-
-    it('sets vantage_code_ids', () => {
-      expect(data.vantage_code_ids).to.eql([]);
-    });
   });
 
   describe('All values provided with first nations id', () => {
     let data: PostPurposeAndMethodologyData;
 
     const obj = {
       intended_outcome_ids: [1],
-      additional_details: 'additional_detail',
-      vantage_code_ids: [4, 5]
+      additional_details: 'additional_detail'
     };
 
     before(() => {
@@ -402,10 +388,6 @@ describe('PostPurposeAndMethodologyData', () => {
     it('sets additional_details', () => {
       expect(data.additional_details).to.eql(obj.additional_details);
     });
-
-    it('sets vantage_code_ids', () => {
-      expect(data.vantage_code_ids).to.eql(obj.vantage_code_ids);
-    });
   });
 });
 

api/src/models/survey-create.ts

@@ -90,11 +90,9 @@ export class PostSurveyDetailsData {
 
 export class PostSpeciesData {
   focal_species: ITaxonomy[];
-  ancillary_species: ITaxonomy[];
 
   constructor(obj?: any) {
     this.focal_species = (obj?.focal_species?.length && obj.focal_species) || [];
-    this.ancillary_species = (obj?.ancillary_species?.length && obj.ancillary_species) || [];
   }
 }
 
@@ -126,12 +124,10 @@ export class PostProprietorData {
 export class PostPurposeAndMethodologyData {
   intended_outcome_ids: number[];
   additional_details: string;
-  vantage_code_ids: number[];
 
   constructor(obj?: any) {
     this.intended_outcome_ids = obj?.intended_outcome_ids || [];
     this.additional_details = obj?.additional_details || null;
-    this.vantage_code_ids = obj?.vantage_code_ids || [];
   }
 }
 

api/src/models/survey-update.test.ts

@@ -150,18 +150,13 @@ describe('PutSpeciesData', () => {
     it('sets focal_species', () => {
       expect(data.focal_species).to.eql([]);
     });
-
-    it('sets ancillary_species', () => {
-      expect(data.ancillary_species).to.eql([]);
-    });
   });
 
   describe('All values provided', () => {
     let data: PutSurveySpeciesData;
 
     const obj = {
-      focal_species: [1, 2],
-      ancillary_species: [3]
+      focal_species: [1, 2]
     };
 
     before(() => {
@@ -171,10 +166,6 @@ describe('PutSpeciesData', () => {
     it('sets focal_species', () => {
       expect(data.focal_species).to.eql([1, 2]);
     });
-
-    it('sets ancillary_species', () => {
-      expect(data.ancillary_species).to.eql([3]);
-    });
   });
 });
 
@@ -340,10 +331,6 @@ describe('PutPurposeAndMethodologyData', () => {
       expect(data.additional_details).to.equal(null);
     });
 
-    it('sets vantage_code_ids', () => {
-      expect(data.vantage_code_ids).to.eql([]);
-    });
-
     it('sets revision_count', () => {
       expect(data.revision_count).to.equal(null);
     });
@@ -355,7 +342,6 @@ describe('PutPurposeAndMethodologyData', () => {
     const obj = {
       intended_outcome_ids: [1],
       additional_details: 'additional_detail',
-      vantage_code_ids: [4, 5],
       revision_count: 0
     };
 
@@ -371,10 +357,6 @@ describe('PutPurposeAndMethodologyData', () => {
       expect(data.additional_details).to.equal(obj.additional_details);
     });
 
-    it('sets vantage_code_ids', () => {
-      expect(data.vantage_code_ids).to.eql(obj.vantage_code_ids);
-    });
-
     it('sets revision_count', () => {
       expect(data.revision_count).to.equal(obj.revision_count);
     });

api/src/models/survey-update.ts

@@ -100,11 +100,9 @@ export class PutSurveyDetailsData {
 
 export class PutSurveySpeciesData {
   focal_species: ITaxonomy[];
-  ancillary_species: ITaxonomy[];
 
   constructor(obj?: any) {
     this.focal_species = (obj?.focal_species?.length && obj?.focal_species) || [];
-    this.ancillary_species = (obj?.ancillary_species?.length && obj?.ancillary_species) || [];
   }
 }
 
@@ -136,13 +134,11 @@ export class PutSurveyProprietorData {
 export class PutSurveyPurposeAndMethodologyData {
   intended_outcome_ids: number[];
   additional_details: string;
-  vantage_code_ids: number[];
   revision_count: number;
 
   constructor(obj?: any) {
     this.intended_outcome_ids = (obj?.intended_outcome_ids?.length && obj?.intended_outcome_ids) || [];
     this.additional_details = obj?.additional_details || null;
-    this.vantage_code_ids = (obj?.vantage_code_ids?.length && obj.vantage_code_ids) || [];
     this.revision_count = obj?.revision_count ?? null;
   }
 }

api/src/models/survey-view.test.ts

@@ -2,7 +2,6 @@ import { expect } from 'chai';
 import { describe } from 'mocha';
 import { IPermitModel } from '../repositories/permit-repository';
 import {
-  GetAncillarySpeciesData,
   GetAttachmentsData,
   GetFocalSpeciesData,
   GetPermitData,
@@ -101,40 +100,6 @@ describe('GetFocalSpeciesData', () => {
   });
 });
 
-describe('GetAncillarySpeciesData', () => {
-  describe('No values provided', () => {
-    let data: GetAncillarySpeciesData;
-
-    before(() => {
-      data = new GetAncillarySpeciesData();
-    });
-
-    it('sets ancillary_species', () => {
-      expect(data.ancillary_species).to.eql([]);
-    });
-  });
-
-  describe('All values provided', () => {
-    let data: GetAncillarySpeciesData;
-
-    const obj = [
-      { tsn: 1, commonNames: ['species1'] },
-      { tsn: 2, commonNames: ['species2'] }
-    ];
-
-    before(() => {
-      data = new GetAncillarySpeciesData(obj);
-    });
-
-    it('sets ancillary_species', () => {
-      expect(data.ancillary_species).to.eql([
-        { tsn: 1, commonNames: ['species1'] },
-        { tsn: 2, commonNames: ['species2'] }
-      ]);
-    });
-  });
-});
-
 describe('GetPermitData', () => {
   describe('No values provided', () => {
     let data: GetPermitData;
@@ -325,10 +290,6 @@ describe('GetSurveyPurposeAndMethodologyData', () => {
     it('sets additional_details', () => {
       expect(data.additional_details).to.equal('');
     });
-
-    it('sets vantage_code_ids', () => {
-      expect(data.vantage_code_ids).to.eql([]);
-    });
   });
 
   describe('All values provided with first nations id', () => {
@@ -337,7 +298,6 @@ describe('GetSurveyPurposeAndMethodologyData', () => {
     const obj = {
       intended_outcome_ids: [1],
       additional_details: 'additional_detail',
-      vantage_ids: [4, 5],
       revision_count: 'count'
     };
 
@@ -353,10 +313,6 @@ describe('GetSurveyPurposeAndMethodologyData', () => {
       expect(data.additional_details).to.eql(obj.additional_details);
     });
 
-    it('sets vantage_code_ids', () => {
-      expect(data.vantage_code_ids).to.eql(obj.vantage_ids);
-    });
-
     it('sets revision_count', function () {
       expect(data.revision_count).to.equal('count');
     });

api/src/models/survey-view.ts

@@ -35,7 +35,7 @@ export type FindSurveysResponse = z.infer<typeof FindSurveysResponse>;
 
 export type SurveyObject = {
   survey_details: GetSurveyData;
-  species: GetFocalSpeciesData & GetAncillarySpeciesData;
+  species: GetFocalSpeciesData;
   permit: GetPermitData;
   funding_sources: GetSurveyFundingSourceData[];
   purpose_and_methodology: GetSurveyPurposeAndMethodologyData;
@@ -113,18 +113,6 @@ export class GetFocalSpeciesData {
   }
 }
 
-export class GetAncillarySpeciesData {
-  ancillary_species: ITaxonomy[];
-
-  constructor(obj?: any[]) {
-    this.ancillary_species = [];
-
-    obj?.length &&
-      obj.forEach((item: any) => {
-        this.ancillary_species.push(item);
-      });
-  }
-}
 export class GetPermitData {
   permits: {
     permit_id: IPermitModel['permit_id'];
@@ -146,12 +134,10 @@ export class GetSurveyPurposeAndMethodologyData {
   intended_outcome_ids: number[];
   additional_details: string;
   revision_count: number;
-  vantage_code_ids: number[];
 
   constructor(obj?: any) {
     this.intended_outcome_ids = (obj?.intended_outcome_ids?.length && obj?.intended_outcome_ids) || [];
     this.additional_details = obj?.additional_details || '';
-    this.vantage_code_ids = (obj?.vantage_ids?.length && obj.vantage_ids) || [];
     this.revision_count = obj?.revision_count ?? 0;
   }
 }

api/src/openapi/schemas/survey.ts

@@ -141,50 +141,12 @@ export const focalSpeciesSchema: OpenAPIV3.SchemaObject = {
   }
 };
 
-export const ancillarySpeciesSchema: OpenAPIV3.SchemaObject = {
-  title: 'ancillary species response object',
-  type: 'object',
-  additionalProperties: false,
-  required: ['tsn', 'commonNames', 'scientificName'],
-  properties: {
-    tsn: {
-      description: 'Taxonomy tsn',
-      type: 'number'
-    },
-    commonNames: {
-      description: 'Taxonomy common names',
-      type: 'array',
-      items: {
-        type: 'string'
-      },
-      nullable: true
-    },
-    scientificName: {
-      description: 'Taxonomy scientific name',
-      type: 'string'
-    },
-    rank: {
-      description: 'Taxonomy rank name',
-      type: 'string'
-    },
-    kingdom: {
-      description: 'Taxonomy kingdom name',
-      type: 'string'
-    }
-  }
-};
-
 export const surveySpeciesSchema: OpenAPIV3.SchemaObject = {
   description: 'Survey Species',
   type: 'object',
   additionalProperties: false,
-  required: ['focal_species', 'ancillary_species'],
+  required: ['focal_species'],
   properties: {
-    ancillary_species: {
-      nullable: true,
-      type: 'array',
-      items: ancillarySpeciesSchema
-    },
     focal_species: {
       type: 'array',
       items: focalSpeciesSchema
@@ -282,7 +244,7 @@ export const surveyPurposeAndMethodologySchema: OpenAPIV3.SchemaObject = {
   title: 'survey purpose and methodology response object',
   type: 'object',
   additionalProperties: false,
-  required: ['intended_outcome_ids', 'additional_details', 'vantage_code_ids'],
+  required: ['intended_outcome_ids', 'additional_details'],
   properties: {
     intended_outcome_ids: {
       description: 'Intended outcome ids',
@@ -301,14 +263,6 @@ export const surveyPurposeAndMethodologySchema: OpenAPIV3.SchemaObject = {
       description: 'The integer of times the record has been revised.',
       type: 'integer',
       minimum: 0
-    },
-    vantage_code_ids: {
-      description: 'Vantage code ids',
-      type: 'array',
-      items: {
-        type: 'integer',
-        minimum: 1
-      }
     }
   }
 };