NRPT-188-2: QA updates. (#478)

* NRPT-188-2: QA updates.

* NRPT-188-2: update api unit tests

* NRPT-188-2: update angular unit tests

Author: NickPhura

angular/projects/admin-nrpti/src/app/import/import-csv/import-csv.component.spec.ts

@@ -475,17 +475,19 @@ describe('ImportCSVComponent', () => {
       const { component } = testBedHelper.createComponent();
 
       const transformedRow: string[] = component.transformDateFields(
-        ['2019/12/30', '12/30/2019'],
+        ['2019/12/30', '12/30/2019', '30-Dec-2019'],
         [
           { field: 'headerA', format: 'YYYY/MM/DD' },
-          { field: 'headerB', format: 'MM/DD/YYYY' }
+          { field: 'headerB', format: 'MM/DD/YYYY' },
+          { field: 'headerC', format: 'DD-MMM-YYYY' }
         ],
-        ['headerA', 'headerB']
+        ['headerA', 'headerB', 'headerC']
       );
 
-      expect(transformedRow.length).toEqual(2);
+      expect(transformedRow.length).toEqual(3);
       expect(transformedRow[0]).toEqual(moment('2019/12/30', 'YYYY/MM/DD').toISOString());
       expect(transformedRow[1]).toEqual(moment('12/30/2019', 'MM/DD/YYYY').toISOString());
+      expect(transformedRow[2]).toEqual(moment('30-Dec-2019', 'DD-MMM-YYYY').toISOString());
     }));
   });
 

angular/projects/admin-nrpti/src/app/utils/constants/csv-constants.ts

@@ -130,7 +130,7 @@ export class CsvConstants {
    * @memberof CsvConstants
    */
   public static readonly ogcInspectionCsvRequiredFormats: IRequiredFormat[] = [
-    { field: 'Inspection Date', type: 'date', format: 'DD-MMM-YY' }
+    { field: 'Inspection Date', type: 'date', format: 'DD-MMM-YYYY' }
   ];
 
   /**
@@ -141,7 +141,7 @@ export class CsvConstants {
    * @memberof CsvConstants
    */
   public static readonly ogcInspectionCsvDateFields: IDateField[] = [
-    { field: 'Inspection Date', format: 'DD-MMM-YY' }
+    { field: 'Inspection Date', format: 'DD-MMM-YYYY' }
   ];
 
   /**

api/src/importers/bcogc/inspections-utils.js

@@ -43,15 +43,14 @@ class Inspections extends BaseRecordUtils {
     inspection['recordType'] = 'Inspection';
     inspection['dateIssued'] = csvRow['inspection date'] || null;
     inspection['issuingAgency'] = 'BC Oil and Gas Commission';
-    inspection['author'] = 'BC Government';
+    inspection['author'] = 'BC Oil and Gas Commission';
 
     inspection['recordName'] = `Inspection Number ${csvRow['inspection number'] || '-'}`;
 
     inspection['legislation'] = {
       act: 'Oil and Gas Activities Act',
       section: '57',
-      subSection: '4',
-      regulation: CsvUtils.getRegulation(csvRow) || ''
+      subSection: '4'
     };
 
     inspection['issuedTo'] = {

api/src/importers/bcogc/inspections-utils.test.js

@@ -21,9 +21,9 @@ describe('transformRecord', () => {
       dateIssued: null,
       issuedTo: { companyName: '', type: 'Company' },
       issuingAgency: 'BC Oil and Gas Commission',
-      author: 'BC Government',
+      author: 'BC Oil and Gas Commission',
       recordName: 'Inspection Number -',
-      legislation: { act: 'Oil and Gas Activities Act', regulation: '', section: '57', subSection: '4' },
+      legislation: { act: 'Oil and Gas Activities Act', section: '57', subSection: '4' },
       location: 'British Columbia',
       legislationDescription: 'Inspection to verify compliance with regulatory requirement',
       description:
@@ -57,11 +57,10 @@ describe('transformRecord', () => {
       dateIssued: expect.any(String),
       issuedTo: { companyName: 'Coastal GasLink Pipeline Ltd.', type: 'Company' },
       issuingAgency: 'BC Oil and Gas Commission',
-      author: 'BC Government',
+      author: 'BC Oil and Gas Commission',
       recordName: 'Inspection Number 123456',
       legislation: {
         act: 'Oil and Gas Activities Act',
-        regulation: 'Oil and Gas activities Act',
         section: '57',
         subSection: '4'
       },