Bhbc 841

api/package.json

@@ -73,7 +73,7 @@
     "@typescript-eslint/parser": "~3.7.1",
     "chai": "~4.2.0",
     "del": "~6.0.0",
-    "eslint": "~7.5.0",
+    "eslint": "^7.5.0",
     "eslint-config-prettier": "~6.11.0",
     "eslint-plugin-prettier": "~3.1.4",
     "gulp": "~4.0.2",

api/src/models/project.test.ts

@@ -14,10 +14,6 @@ describe('PostProjectData', () => {
       expect(projectPostData.name).to.equal(null);
     });
 
-    it('sets scientific_collection_permit_number', function () {
-      expect(projectPostData.scientific_collection_permit_number).to.equal(null);
-    });
-
     it('sets management_recovery_action', function () {
       expect(projectPostData.management_recovery_action).to.equal(null);
     });
@@ -40,7 +36,6 @@ describe('PostProjectData', () => {
 
     const obj = {
       project_name: 'name_test_data',
-      scientific_collection_permit_number: 'scientific_collection_permit_number_test_data',
       management_recovery_action: 'management_recovery_action_test_data',
       start_date: 'start_date_test_data',
       end_date: 'end_date_test_data',
@@ -55,12 +50,6 @@ describe('PostProjectData', () => {
       expect(projectPostData.name).to.equal('name_test_data');
     });
 
-    it('sets scientific_collection_permit_number', function () {
-      expect(projectPostData.scientific_collection_permit_number).to.equal(
-        'scientific_collection_permit_number_test_data'
-      );
-    });
-
     it('sets management_recovery_action', function () {
       expect(projectPostData.management_recovery_action).to.equal('management_recovery_action_test_data');
     });

api/src/models/project.ts

@@ -11,9 +11,9 @@ const defaultLog = getLogger('models/project');
  */
 export interface IProject {
   id: number;
+  pt_id: number;
   name: string;
   objectives: string;
-  scientific_collection_permit_number: string;
   management_recovery_action: string;
   location_description: string;
   start_date: string;
@@ -52,7 +52,7 @@ export interface IProjectFundingAgency {
 }
 
 /**
- * An interface representing the funding angency table.
+ * An interface representing the funding agency table.
  *
  * @export
  * @interface IFundingAgency
@@ -171,7 +171,7 @@ export class PostCoordinatorData {
 }
 
 export interface IPostPermit {
-  permit_number: number;
+  permit_number: string;
   sampling_conducted: boolean;
 }
 
@@ -207,8 +207,7 @@ export class PostPermitData {
  */
 export class PostProjectData {
   name: string;
-  type: string;
-  scientific_collection_permit_number: string;
+  type: number;
   management_recovery_action: string;
   start_date: string;
   end_date: string;
@@ -218,8 +217,7 @@ export class PostProjectData {
     defaultLog.debug({ label: 'PostProjectData', message: 'params', obj });
 
     this.name = obj?.project_name || null;
-    this.type = obj?.type || null;
-    this.scientific_collection_permit_number = obj?.scientific_collection_permit_number || null;
+    this.type = obj?.project_type;
     this.management_recovery_action = obj?.management_recovery_action || null;
     this.start_date = obj?.start_date || null;
     this.end_date = obj?.end_date || null;

api/src/openapi/schemas/project.ts

@@ -40,7 +40,7 @@ export const projectPostBody = {
             type: 'object',
             properties: {
               permit_number: {
-                type: 'number'
+                type: 'string'
               },
               sampling_conducted: {
                 type: 'string'
@@ -60,9 +60,6 @@ export const projectPostBody = {
         objectives: {
           type: 'string'
         },
-        scientific_collection_permit_number: {
-          type: 'string'
-        },
         management_recovery_action: {
           type: 'string'
         },

api/src/paths/project.ts

@@ -2,7 +2,7 @@ import { RequestHandler } from 'express';
 import { Operation } from 'express-openapi';
 import { WRITE_ROLES } from '../constants/roles';
 import { getDBConnection, IDBConnection } from '../database/db';
-import { PostFundingSource, PostProjectObject } from '../models/project';
+import { PostFundingSource, PostProjectObject, IPostPermit } from '../models/project';
 import { projectPostBody, projectResponseBody } from '../openapi/schemas/project';
 import {
   postAncillarySpeciesSQL,
@@ -11,7 +11,8 @@ import {
   postProjectIndigenousNationSQL,
   postProjectRegionSQL,
   postProjectSQL,
-  postProjectStakeholderPartnershipSQL
+  postProjectStakeholderPartnershipSQL,
+  postProjectPermitSQL
 } from '../queries/project-queries';
 import { getLogger } from '../utils/logger';
 import { logRequest } from '../utils/path-utils';
@@ -84,6 +85,7 @@ function createProject(): RequestHandler {
     try {
       const postProjectSQLStatement = postProjectSQL({
         ...sanitizedProjectPostData.project,
+        ...sanitizedProjectPostData.permit,
         ...sanitizedProjectPostData.location,
         ...sanitizedProjectPostData.objectives,
         ...sanitizedProjectPostData.coordinator
@@ -159,6 +161,13 @@ function createProject(): RequestHandler {
           )
         );
 
+        // Handle project permits
+        await Promise.all(
+          sanitizedProjectPostData.permit.permits.map((permit: IPostPermit) =>
+            insertPermitNumber(permit.permit_number, projectId, permit.sampling_conducted, connection)
+          )
+        );
+
         await connection.commit();
       } catch (error) {
         await connection.rollback();
@@ -338,3 +347,32 @@ export const insertStakeholderPartnership = async (
 
   return result.id;
 };
+
+export const insertPermitNumber = async (
+  permit_number: string,
+  project_id: number,
+  sampling_conducted: boolean,
+  connection: IDBConnection
+): Promise<number> => {
+  const sqlStatement = postProjectPermitSQL(permit_number, project_id, sampling_conducted);
+
+  if (!sqlStatement) {
+    throw {
+      status: 400,
+      message: 'Failed to build SQL statement'
+    };
+  }
+
+  const response = await connection.query(sqlStatement.text, sqlStatement.values);
+
+  const result = (response && response.rows && response.rows[0]) || null;
+
+  if (!result || !result.id) {
+    throw {
+      status: 400,
+      message: 'Failed to insert into project_permit table'
+    };
+  }
+
+  return result.id;
+};

api/src/queries/project-queries.test.ts

@@ -1,14 +1,30 @@
 import { expect } from 'chai';
 import { describe } from 'mocha';
-import { PostProjectData, PostLocationData, PostCoordinatorData, PostObjectivesData } from '../models/project';
-import { getProjectSQL, getProjectsSQL, postProjectSQL, postProjectRegionSQL } from './project-queries';
+import {
+  PostProjectData,
+  PostLocationData,
+  PostCoordinatorData,
+  PostObjectivesData,
+  PostPermitData
+} from '../models/project';
+import {
+  getProjectSQL,
+  getProjectsSQL,
+  postProjectSQL,
+  postProjectRegionSQL,
+  postProjectPermitSQL
+} from './project-queries';
 
 describe('postProjectSQL', () => {
   describe('Null project param provided', () => {
     it('returns null', () => {
       // force the function to accept a null value
       const response = postProjectSQL(
-        (null as unknown) as PostProjectData & PostLocationData & PostCoordinatorData & PostObjectivesData
+        (null as unknown) as PostProjectData &
+          PostLocationData &
+          PostCoordinatorData &
+          PostObjectivesData &
+          PostPermitData
       );
 
       expect(response).to.be.null;
@@ -19,7 +35,6 @@ describe('postProjectSQL', () => {
     const projectData = {
       name: 'name_test_data',
       objectives: 'objectives_test_data',
-      scientific_collection_permit_number: 'scientific_collection_permit_number_test_data',
       management_recovery_action: 'management_recovery_action_test_data',
       start_date: 'start_date_test_data',
       end_date: 'end_date_test_data',
@@ -45,17 +60,24 @@ describe('postProjectSQL', () => {
       caveats: 'a caveat maybe'
     };
 
+    const permitData = {
+      permit_number: '123',
+      sampling_conducted: true
+    };
+
     const postProjectData = new PostProjectData(projectData);
     const postCoordinatorData = new PostCoordinatorData(coordinatorData);
     const postObjectivesData = new PostObjectivesData(objectivesData);
+    const postPermitData = new PostPermitData(permitData);
 
     it('returns a SQLStatement', () => {
       const postLocationData = new PostLocationData(locationData);
       const response = postProjectSQL({
         ...postProjectData,
         ...postCoordinatorData,
         ...postLocationData,
-        ...postObjectivesData
+        ...postObjectivesData,
+        ...postPermitData
       });
 
       expect(response).to.not.be.null;
@@ -92,7 +114,8 @@ describe('postProjectSQL', () => {
         ...postProjectData,
         ...postCoordinatorData,
         ...postLocationData,
-        ...postObjectivesData
+        ...postObjectivesData,
+        ...postPermitData
       });
 
       expect(response).to.not.be.null;
@@ -143,7 +166,8 @@ describe('postProjectSQL', () => {
         ...postProjectData,
         ...postCoordinatorData,
         ...postLocationData,
-        ...postObjectivesData
+        ...postObjectivesData,
+        ...postPermitData
       });
 
       expect(response).to.not.be.null;
@@ -182,8 +206,31 @@ describe('getProjectsSQL', () => {
   });
 });
 
+describe('postProjectPermitSQL', () => {
+  describe('with invalid parameters', () => {
+    it('returns null when no permit number', () => {
+      const response = postProjectPermitSQL((null as unknown) as string, 1, true);
+
+      expect(response).to.be.null;
+    });
+
+    it('returns null when no project id', () => {
+      const response = postProjectPermitSQL('123', (null as unknown) as number, true);
+
+      expect(response).to.be.null;
+    });
+
+    it('returns a SQLStatement when all fields are passed in as expected', () => {
+      const response = postProjectPermitSQL('123', 123, true);
+
+      expect(response).to.not.be.null;
+      expect(response?.values).to.deep.include('123');
+    });
+  });
+});
+
 describe('postProjectRegionSQL', () => {
-  describe('invalid parameters', () => {
+  describe('with invalid parameters', () => {
     it('Null region provided', () => {
       // force the function to accept a null project region object
       const projectId = 1;