Merge pull request #6037 from bcgov/feat/6005

feat(6005): migrate HMA ministry records

Author: junminahn

app/constants/common.ts

@@ -79,10 +79,6 @@ export const ministryOptions = [
     value: 'LDB',
     label: 'Liquor Distribution Branch',
   },
-  {
-    value: 'MAH',
-    label: 'Municipal Affairs and Housing',
-  },
   {
     value: 'MCF',
     label: 'Children and Family Development',
@@ -112,16 +108,16 @@ export const ministryOptions = [
     label: 'Transportation and Infrastructure',
   },
   {
-    value: 'HOUS',
-    label: 'Ministry of Housing',
+    value: 'HMA',
+    label: 'Housing and Municipal Affairs',
   },
   {
     value: 'WLRS',
     label: 'Water, Land and Resource Stewardship',
   },
 ];
 
-export const AGMinistries = ['AG', 'PSSG', 'EMCR', 'HOUS'];
+export const AGMinistries = ['AG', 'PSSG', 'EMCR', 'HMA'];
 
 export const TEAM_SA_PREFIX = 'z_pltsvc-tsa-';
 

app/prisma/schema.prisma

@@ -601,12 +601,11 @@ enum Ministry {
   FIN
   FLNR
   HLTH
-  HOUS
   IRR
   JEDC
   LBR
   LDB
-  MAH
+  HMA
   MCF
   MMHA
   PSA

app/services/nats/private-cloud/index.ts

@@ -34,8 +34,7 @@ export default async function createPrivateCloudNatsMessage(
   switch (ministry) {
     case Ministry.AG:
     case Ministry.EMCR:
-    case Ministry.HOUS:
-    case Ministry.MAH:
+    case Ministry.HMA:
     case Ministry.PSSG:
       allianceLabel = 'JAG';
       break;

data-migrations/migrations/20250710225356-migreate_HMA_ministry.js

@@ -0,0 +1,21 @@
+export const up = async (db, client) => {
+  const session = client.startSession();
+
+  await session.withTransaction(async () => {
+    const result = await Promise.all(
+      ['PrivateCloudProduct', 'PrivateCloudRequestData', 'PublicCloudProduct', 'PublicCloudRequestData'].map(
+        (schemaName) => {
+          return db
+            .collection(schemaName)
+            .updateMany({ ministry: { $in: ['MAH', 'HOUS'] } }, [{ $set: { ministry: 'HMA' } }], { session });
+        },
+      ),
+    );
+
+    console.log('migreate_HMA_ministry:', result);
+  });
+
+  session.endSession();
+};
+
+export const down = async (db, client) => {};

sandbox/keycloak-provision/main.ts

@@ -113,15 +113,14 @@ async function main() {
     'jedc',
     'lbr',
     'ldb',
-    'mah',
     'mcf',
     'mmha',
     'psa',
     'pssg',
     'sdpr',
     'tca',
     'tran',
-    'hous',
+    'hma',
     'wlrs',
   ].forEach(async (ministry) => {
     await kc.createClientRole(AUTH_REALM_NAME, authClient?.id as string, `ministry-${ministry}-reader`);

terraform/keycloak/dev/ministry-roles.tf

@@ -1,5 +1,5 @@
 locals {
-  ministry_codes = ["aest", "ag", "agri", "alc", "bcpc", "citz", "dbc", "eao", "educ", "emcr", "empr", "env", "fin", "flnr", "hlth", "irr", "jedc", "lbr", "ldb", "mah", "mcf", "mmha", "psa", "pssg", "sdpr", "tca", "tran", "hous", "wlrs"]
+  ministry_codes = ["aest", "ag", "agri", "alc", "bcpc", "citz", "dbc", "eao", "educ", "emcr", "empr", "env", "fin", "flnr", "hlth", "irr", "jedc", "lbr", "ldb", "mah", "mcf", "mmha", "psa", "pssg", "sdpr", "tca", "tran", "hous", "hma","wlrs"]
 }
 
 resource "keycloak_role" "pltsvc_ministry_editor" {

terraform/keycloak/prod/ministry-roles.tf

@@ -1,5 +1,5 @@
 locals {
-  ministry_codes = ["aest", "ag", "agri", "alc", "bcpc", "citz", "dbc", "eao", "educ", "emcr", "empr", "env", "fin", "flnr", "hlth", "irr", "jedc", "lbr", "ldb", "mah", "mcf", "mmha", "psa", "pssg", "sdpr", "tca", "tran", "hous", "wlrs"]
+  ministry_codes = ["aest", "ag", "agri", "alc", "bcpc", "citz", "dbc", "eao", "educ", "emcr", "empr", "env", "fin", "flnr", "hlth", "irr", "jedc", "lbr", "ldb", "mah", "mcf", "mmha", "psa", "pssg", "sdpr", "tca", "tran", "hous", "hma","wlrs"]
 }
 
 resource "keycloak_role" "pltsvc_ministry_editor" {

terraform/keycloak/test/ministry-roles.tf

@@ -1,5 +1,5 @@
 locals {
-    ministry_codes = ["aest", "ag", "agri", "alc", "bcpc", "citz", "dbc", "eao", "educ", "emcr", "empr", "env", "fin", "flnr", "hlth", "irr", "jedc", "lbr", "ldb", "mah", "mcf", "mmha", "psa", "pssg", "sdpr", "tca", "tran", "hous", "wlrs"]
+    ministry_codes = ["aest", "ag", "agri", "alc", "bcpc", "citz", "dbc", "eao", "educ", "emcr", "empr", "env", "fin", "flnr", "hlth", "irr", "jedc", "lbr", "ldb", "mah", "mcf", "mmha", "psa", "pssg", "sdpr", "tca", "tran", "hous", "hma","wlrs"]
 }
 
 resource "keycloak_role" "pltsvc_ministry_editor" {

testing/testing-checklist.md

@@ -13,7 +13,7 @@
 2. For the User in Private Cloud Clusters dropdown is showing SILVER, GOLD, EMERALD
 3. For the User in Private Cloud Clusters dropdown is showing SILVER, GOLD, EMERALD, CLAB, KLAB, KLAB2
 4. Ministries dropdown is showing 28 ministries with no duplicates.
-5. If one of AG, EMCR, HOUS or PSSG ministries is chosen, the disclaimer with checkbox is shown.
+5. If one of AG, EMCR, HMA or PSSG ministries is chosen, the disclaimer with checkbox is shown.
 6. For Public Cloud the Providers dropdown has Amazon Web Services option only.
 7. Typing letters in the Email field of the Contacts section shows live search results for every of PO and TLs.
 8. Clicking one of the contact search results populates all of the fields for every of PO and TLs with corresponding data from IDIR.