API tests unlocked and permit/create project flow fixes (#259)

bcgov · Apr 28, 2021 · be13535 · be13535
1 parent a495051
commit be13535
Show file tree

Hide file tree

Showing 10 changed files with 362 additions and 34 deletions.
diff --git a/api/package-lock.json b/api/package-lock.json
diff --git a/api/package.json b/api/package.json
@@ -64,6 +64,8 @@
     "@types/mocha": "~8.0.1",
     "@types/multer": "^1.4.5",
     "@types/pg": "~7.14.4",
+    "@types/sinon": "^10.0.0",
+    "@types/sinon-chai": "^3.2.5",
     "@types/uuid": "~8.3.0",
     "@types/yamljs": "~0.2.31",
     "@typescript-eslint/eslint-plugin": "~3.7.1",
@@ -81,6 +83,8 @@
     "npm-run-all": "~4.1.5",
     "nyc": "~15.1.0",
     "prettier": "~2.2.1",
+    "sinon": "^10.0.0",
+    "sinon-chai": "^3.6.0",
     "supertest": "~6.0.1",
     "ts-mocha": "~8.0.0",
     "ts-node": "~9.1.1"

diff --git a/api/src/models/permit-no-sampling.test.ts b/api/src/models/permit-no-sampling.test.ts
@@ -33,10 +33,12 @@ describe('postPermitNoSamplingObject', () => {
       permit: {
         permits: [
           {
-            permit_number: '123'
+            permit_number: '123',
+            permit_type: 'type 1'
           },
           {
-            permit_number: '456'
+            permit_number: '456',
+            permit_type: 'type 2'
           }
         ]
       }
@@ -60,10 +62,12 @@ describe('postPermitNoSamplingObject', () => {
       expect(postPermitNoSamplingObject.permit).to.deep.equal({
         permits: [
           {
-            permit_number: '123'
+            permit_number: '123',
+            permit_type: 'type 1'
           },
           {
-            permit_number: '456'
+            permit_number: '456',
+            permit_type: 'type 2'
           }
         ]
       });
@@ -115,7 +119,7 @@ describe('PostPermitNoSamplingData', () => {
   describe('All values provided where permits is a valid array', () => {
     let postPermitNoSamplingData: PostPermitNoSamplingData;
 
-    const obj = { permits: [{ permit_number: 1 }] };
+    const obj = { permits: [{ permit_number: 1, permit_type: 'type' }] };
 
     before(() => {
       postPermitNoSamplingData = new PostPermitNoSamplingData(obj);
@@ -124,7 +128,8 @@ describe('PostPermitNoSamplingData', () => {
     it('sets permits', function () {
       expect(postPermitNoSamplingData.permits).to.eql([
         {
-          permit_number: 1
+          permit_number: 1,
+          permit_type: 'type'
         }
       ]);
     });

diff --git a/api/src/models/permit-no-sampling.ts b/api/src/models/permit-no-sampling.ts
@@ -23,6 +23,7 @@ export class PostPermitNoSamplingObject {
 
 export interface IPostPermitNoSampling {
   permit_number: string;
+  permit_type: string;
 }
 
 /**
@@ -41,7 +42,8 @@ export class PostPermitNoSamplingData {
       (obj?.permits?.length &&
         obj.permits.map((item: any) => {
           return {
-            permit_number: item.permit_number
+            permit_number: item.permit_number,
+            permit_type: item.permit_type
           };
         })) ||
       [];

diff --git a/api/src/paths/permit-no-sampling.ts b/api/src/paths/permit-no-sampling.ts
@@ -76,7 +76,7 @@ function createNoSamplePermits(): RequestHandler {
 
       const result = await Promise.all(
         sanitizedNoSamplePermitPostData.permit.permits.map((permit: IPostPermitNoSampling) =>
-          insertNoSamplePermitNumber(permit, sanitizedNoSamplePermitPostData.coordinator, connection)
+          insertNoSamplePermit(permit, sanitizedNoSamplePermitPostData.coordinator, connection)
         )
       );
 
@@ -93,7 +93,7 @@ function createNoSamplePermits(): RequestHandler {
   };
 }
 
-export const insertNoSamplePermitNumber = async (
+export const insertNoSamplePermit = async (
   permit: IPostPermitNoSampling,
   coordinator: PostCoordinatorData,
   connection: IDBConnection

diff --git a/api/src/queries/permit-no-sampling/permit-no-sampling-queries.test.ts b/api/src/queries/permit-no-sampling/permit-no-sampling-queries.test.ts
@@ -15,6 +15,7 @@ describe('postPermitNoSamplingSQL', () => {
     it('returns a SQLStatement when all fields are passed in as expected', () => {
       const response = postPermitNoSamplingSQL({
         permit_number: '123',
+        permit_type: 'permit type',
         first_name: 'first',
         last_name: 'last',
         email_address: 'email',
@@ -24,7 +25,7 @@ describe('postPermitNoSamplingSQL', () => {
 
       expect(response).to.not.be.null;
 
-      expect(response?.values.length).to.equal(5);
+      expect(response?.values.length).to.equal(6);
 
       expect(response?.values).to.deep.include('123');
       expect(response?.values).to.deep.include('first');

diff --git a/api/src/queries/permit-no-sampling/permit-no-sampling-queries.ts b/api/src/queries/permit-no-sampling/permit-no-sampling-queries.ts
@@ -27,12 +27,14 @@ export const postPermitNoSamplingSQL = (
   const sqlStatement: SQLStatement = SQL`
       INSERT INTO no_sample_permit (
         number,
+        type,
         coordinator_first_name,
         coordinator_last_name,
         coordinator_email_address,
         coordinator_agency_name
       ) VALUES (
         ${noSamplePermit.permit_number},
+        ${noSamplePermit.permit_type},
         ${noSamplePermit.first_name},
         ${noSamplePermit.last_name},
         ${noSamplePermit.email_address},