NRPT-653 Add ENV-COS role and fix flavourId bug

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

@@ -27,6 +27,7 @@ const DEFAULT_CSV_TYPES = {
 
 const ROLE_DATA_SOURCES = {
   [Constants.ApplicationRoles.ADMIN_FLNRO]: ['coors-csv'],
+  [Constants.ApplicationRoles.ADMIN_ENV_COS]: ['coors-csv'],
   [Constants.ApplicationRoles.ADMIN_FLNR_NRO]: ['era-csv', 'nris-flnr-csv'],
   [Constants.ApplicationRoles.ADMIN_AGRI]: ['agri-cmdb-csv', 'agri-mis-csv'],
   [Constants.ApplicationRoles.ADMIN_ALC]: ['alc-csv']

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

@@ -105,7 +105,8 @@ export class ImportComponent implements OnInit, OnDestroy {
       this.factoryService.userOnlyInLimitedRole(Constants.ApplicationRoles.ADMIN_FLNRO) ||
       this.factoryService.userOnlyInLimitedRole(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
       this.factoryService.userOnlyInLimitedRole(Constants.ApplicationRoles.ADMIN_AGRI) ||
-      this.factoryService.userOnlyInLimitedRole(Constants.ApplicationRoles.ADMIN_ALC)
+      this.factoryService.userOnlyInLimitedRole(Constants.ApplicationRoles.ADMIN_ALC) ||
+      this.factoryService.userOnlyInLimitedRole(Constants.ApplicationRoles.ADMIN_ENV_COS)
     ) {
       this.showSourceSystem = false;
     }

angular/projects/admin-nrpti/src/app/services/keycloak.service.ts

@@ -150,6 +150,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_BCMI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNRO) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
@@ -179,6 +180,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_WF) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
     this.menus[recordTypes.ADMINISTRATIVE_SANCTION] =
@@ -187,6 +189,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
     this.menus[recordTypes.AGREEMENT] = inBaseAdminRole(roles);
@@ -205,6 +208,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
     this.menus[recordTypes.CORRESPONDENCE] = inBaseAdminRole(roles);
@@ -217,6 +221,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
     this.menus[recordTypes.MANAGEMENT_PLAN] = inBaseAdminRole(roles);
@@ -228,6 +233,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_WF) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
     this.menus[recordTypes.PERMIT] = inBaseAdminRole(roles) || roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD);
@@ -238,6 +244,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
     this.menus[recordTypes.REPORT] = inBaseAdminRole(roles);
@@ -250,6 +257,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
 
     this.menus[recordTypes.WARNING] =
@@ -258,6 +266,7 @@ export class KeycloakService {
       roles.includes(Constants.ApplicationRoles.ADMIN_FLNR_NRO) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_AGRI) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ENV_EPD) ||
+      roles.includes(Constants.ApplicationRoles.ADMIN_ENV_COS) ||
       roles.includes(Constants.ApplicationRoles.ADMIN_ALC);
   }
 

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

@@ -11,6 +11,7 @@ export class Constants {
     ADMIN_FLNR_NRO: 'admin:flnr-nro',
     ADMIN_AGRI: 'admin:agri',
     ADMIN_ENV_EPD: 'admin:env-epd',
+    ADMIN_ENV_COS: 'admin:env-cos',
     ADMIN_ALC: 'admin:alc'
   };
 
@@ -20,6 +21,7 @@ export class Constants {
     Constants.ApplicationRoles.ADMIN_FLNR_NRO,
     Constants.ApplicationRoles.ADMIN_AGRI,
     Constants.ApplicationRoles.ADMIN_ENV_EPD,
+    Constants.ApplicationRoles.ADMIN_ENV_COS,
     Constants.ApplicationRoles.ADMIN_ALC
   ];
 
@@ -68,6 +70,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -77,6 +80,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     },
@@ -87,6 +91,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -95,6 +100,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     },
@@ -125,6 +131,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -133,6 +140,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     },
@@ -151,6 +159,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -159,6 +168,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     },
@@ -174,6 +184,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -183,6 +194,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     },
@@ -197,6 +209,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -205,6 +218,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     },
@@ -223,6 +237,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -231,6 +246,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     },
@@ -241,6 +257,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ],
       LNG: [
@@ -249,6 +266,7 @@ export class Constants {
         Constants.ApplicationRoles.ADMIN_FLNR_NRO,
         Constants.ApplicationRoles.ADMIN_AGRI,
         Constants.ApplicationRoles.ADMIN_ENV_EPD,
+        Constants.ApplicationRoles.ADMIN_ENV_COS,
         Constants.ApplicationRoles.ADMIN_ALC
       ]
     }
@@ -262,9 +280,8 @@ export class Constants {
     [Constants.ApplicationRoles.ADMIN_FLNR_NRO]: ['Natural Resource Officers'],
     [Constants.ApplicationRoles.ADMIN_AGRI]: ['Ministry of Agriculture'],
     [Constants.ApplicationRoles.ADMIN_ENV_EPD]: ['Environmental Protection Division'],
-    [Constants.ApplicationRoles.ADMIN_ALC]: [
-      'Agriculture Land Commission'
-    ]
+    [Constants.ApplicationRoles.ADMIN_ENV_COS]: ['Conservation Officer Service (COS)'],
+    [Constants.ApplicationRoles.ADMIN_ALC]: ['Agriculture Land Commission']
   };
 
   public static readonly LngSectionPickList: string[] = [

api/migrations/20210311223603-renameConservationOfficerService.js

@@ -0,0 +1,42 @@
+'use strict';
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function(options, seedLink) {};
+
+exports.up = async function(db) {
+  console.log('**** Renaming Conservation Officer Service issuing agency ****');
+
+  const mClient = await db.connection.connect(db.connectionString, {
+    native_parser: true
+  });
+
+  try {
+    const nrpti = await mClient.collection('nrpti');
+
+    await nrpti.updateMany(
+      {
+        issuingAgency: 'Conservation Officer Service'
+      },
+      { $set: { issuingAgency: 'Conservation Officer Service (COS)' } }
+    );
+
+    console.log(`Finished renaming Conservation Officer Service issuing agency`);
+  } catch (err) {
+    console.log(`Error renaming Conservation Officer Service issuing agency: ${err}`);
+  } finally {
+    mClient.close();
+  }
+
+  return null;
+};
+
+exports.down = function(db) {
+  return null;
+};
+
+exports._meta = {
+  version: 1
+};

api/migrations/20210311230347-addEnvCosRoleToCoorsCsv.js

@@ -0,0 +1,57 @@
+'use strict';
+
+const { ApplicationRoles } = require('./../src/utils/constants/misc');
+
+const CSV_SOURCE_DEFAULT_ROLES = [
+  { source: 'coors-csv', role: ApplicationRoles.ADMIN_ENV_COS }
+];
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function(options, seedLink) {};
+
+exports.up = async function(db) {
+  console.log('**** Updating CSV Import records permissions ****');
+
+  const mClient = await db.connection.connect(db.connectionString, {
+    native_parser: true
+  });
+
+  try {
+    const nrpti = await mClient.collection('nrpti');
+
+    for (const csvRole of CSV_SOURCE_DEFAULT_ROLES) {
+      await nrpti.updateMany(
+        {
+          sourceSystemRef: csvRole.source
+        },
+        {
+          $addToSet: {
+            read: csvRole.role,
+            write: csvRole.role,
+            ['issuedTo.read']: csvRole.role,
+            ['issuedTo.write']: csvRole.role
+          }
+        }
+      );
+    }
+
+    console.log(`Finished updating CSV Import records permissions`);
+  } catch (err) {
+    console.log(`Error updating CSV Import records permissions: ${err}`);
+  } finally {
+    mClient.close();
+  }
+
+  return null;
+};
+
+exports.down = function(db) {
+  return null;
+};
+
+exports._meta = {
+  version: 1
+};

api/src/controllers/post/administrative-penalty.js

@@ -12,6 +12,7 @@ const ADDITIONAL_ROLES = [
   utils.ApplicationRoles.ADMIN_FLNR_NRO,
   utils.ApplicationRoles.ADMIN_AGRI,
   utils.ApplicationRoles.ADMIN_ENV_EPD,
+  utils.ApplicationRoles.ADMIN_ENV_COS,
   utils.ApplicationRoles.ADMIN_ALC
 ];
 exports.ADDITIONAL_ROLES = ADDITIONAL_ROLES;

api/src/controllers/post/administrative-sanction.js

@@ -11,6 +11,7 @@ const ADDITIONAL_ROLES = [
   utils.ApplicationRoles.ADMIN_FLNR_NRO,
   utils.ApplicationRoles.ADMIN_AGRI,
   utils.ApplicationRoles.ADMIN_ENV_EPD,
+  utils.ApplicationRoles.ADMIN_ENV_COS,
   utils.ApplicationRoles.ADMIN_ALC
 ];
 exports.ADDITIONAL_ROLES = ADDITIONAL_ROLES;

api/src/controllers/post/court-conviction.js

@@ -11,6 +11,7 @@ const ADDITIONAL_ROLES = [
   utils.ApplicationRoles.ADMIN_FLNR_NRO,
   utils.ApplicationRoles.ADMIN_AGRI,
   utils.ApplicationRoles.ADMIN_ENV_EPD,
+  utils.ApplicationRoles.ADMIN_ENV_COS,
   utils.ApplicationRoles.ADMIN_ALC
 ];
 exports.ADDITIONAL_ROLES = ADDITIONAL_ROLES;

api/src/controllers/post/inspection.js

@@ -11,6 +11,7 @@ const ADDITIONAL_ROLES = [
   utils.ApplicationRoles.ADMIN_FLNR_NRO,
   utils.ApplicationRoles.ADMIN_AGRI,
   utils.ApplicationRoles.ADMIN_ENV_EPD,
+  utils.ApplicationRoles.ADMIN_ENV_COS,
   utils.ApplicationRoles.ADMIN_ALC
 ];
 exports.ADDITIONAL_ROLES = ADDITIONAL_ROLES;

api/src/controllers/post/order.js

@@ -12,6 +12,7 @@ const ADDITIONAL_ROLES = [
   utils.ApplicationRoles.ADMIN_FLNR_NRO,
   utils.ApplicationRoles.ADMIN_AGRI,
   utils.ApplicationRoles.ADMIN_ENV_EPD,
+  utils.ApplicationRoles.ADMIN_ENV_COS,
   utils.ApplicationRoles.ADMIN_ALC
 ];
 exports.ADDITIONAL_ROLES = ADDITIONAL_ROLES;

api/src/controllers/post/restorative-justice.js

@@ -11,6 +11,7 @@ const ADDITIONAL_ROLES = [
   utils.ApplicationRoles.ADMIN_FLNR_NRO,
   utils.ApplicationRoles.ADMIN_AGRI,
   utils.ApplicationRoles.ADMIN_ENV_EPD,
+  utils.ApplicationRoles.ADMIN_ENV_COS,
   utils.ApplicationRoles.ADMIN_ALC
 ];
 exports.ADDITIONAL_ROLES = ADDITIONAL_ROLES;