18952 - Change amalgamation to amalgamationApplication (#2664)

* replace amalagation to amalgamationApplication * update shared-components-enums version, app version
bcgov · Dec 15, 2023 · eab038a · eab038a
1 parent f1f27d7
commit eab038a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
diff --git a/auth-web/package.json b/auth-web/package.json
@@ -18,7 +18,7 @@
     "@bcrs-shared-components/base-address": "2.0.3",
     "@bcrs-shared-components/bread-crumb": "1.0.8",
     "@bcrs-shared-components/corp-type-module": "1.0.13",
-    "@bcrs-shared-components/enums": "1.1.2",
+    "@bcrs-shared-components/enums": "1.1.4",
     "@bcrs-shared-components/interfaces": "1.0.71",
     "@mdi/font": "^4.5.95",
     "@sentry/vue": "^7.49.0",

diff --git a/auth-web/src/components/auth/manage-business/AffiliationAction.vue b/auth-web/src/components/auth/manage-business/AffiliationAction.vue
@@ -151,7 +151,7 @@ export default defineComponent({
         }
       } else if (business.nameRequest?.requestActionCd === NrRequestActionCodes.AMALGAMATE) { // If Amalgmation
         if (amalgamationTypes.includes(business.nameRequest?.legalType)) {
-          payload = { filingType: FilingTypes.AMALGAMATION, business }
+          payload = { filingType: FilingTypes.AMALGAMATION_APPLICATION, business }
         }
       }
 

diff --git a/auth-web/src/composables/affiliations-factory.ts b/auth-web/src/composables/affiliations-factory.ts
@@ -37,7 +37,7 @@ export const useAffiliations = () => {
   /** Returns true if the affiliation is a temporary business. */
   const isTemporaryBusiness = (business: Business): boolean => {
     return (
-      (business.corpType?.code || business.corpType) === CorpTypes.AMALGAMATION ||
+      (business.corpType?.code || business.corpType) === CorpTypes.AMALGAMATION_APPLICATION ||
       (business.corpType?.code || business.corpType) === CorpTypes.INCORPORATION_APPLICATION ||
       (business.corpType?.code || business.corpType) === CorpTypes.REGISTRATION
     )
@@ -53,8 +53,8 @@ export const useAffiliations = () => {
   /** Returns the temp business description. */
   const tempDescription = (business: Business): string => {
     switch ((business.corpType?.code || business.corpType) as CorpTypes) {
-      case CorpTypes.AMALGAMATION:
-        return AffiliationTypes.AMALGAMATION
+      case CorpTypes.AMALGAMATION_APPLICATION:
+        return AffiliationTypes.AMALGAMATION_APPLICATION
       case CorpTypes.INCORPORATION_APPLICATION:
         return AffiliationTypes.INCORPORATION_APPLICATION
       case CorpTypes.REGISTRATION:

diff --git a/auth-web/src/models/business.ts b/auth-web/src/models/business.ts
@@ -121,7 +121,7 @@ export interface BusinessRequest {
         business?: {
             legalType: CorpTypes
         },
-        amalgamation?: {
+        amalgamationApplication?: {
           type: AmalgamationTypes,
           nameRequest: NameRequest
         },

diff --git a/auth-web/src/stores/business.ts b/auth-web/src/stores/business.ts
@@ -271,7 +271,7 @@ export const useBusinessStore = defineStore('business', () => {
     }
 
     switch (filingType) {
-      case FilingTypes.AMALGAMATION: {
+      case FilingTypes.AMALGAMATION_APPLICATION: {
         filingBody = {
           filing: {
             business: {
@@ -281,7 +281,7 @@ export const useBusinessStore = defineStore('business', () => {
               accountId: currentOrganization.value.id,
               name: filingType
             },
-            amalgamation: {
+            amalgamationApplication: {
               type: AmalgamationTypes.REGULAR,
               nameRequest: {
                 legalType: business.nameRequest.legalType,

diff --git a/auth-web/src/util/constants.ts b/auth-web/src/util/constants.ts
@@ -147,7 +147,7 @@ export enum InvoiceStatus {
 
 export enum AffiliationTypes {
     NAME_REQUEST = 'Name Request',
-    AMALGAMATION = 'Amalgamation Application',
+    AMALGAMATION_APPLICATION = 'Amalgamation Application',
     INCORPORATION_APPLICATION = 'Incorporation Application',
     CORPORATION = 'Corporation',
     REGISTRATION = 'Registration'
@@ -196,7 +196,7 @@ export enum CorpTypes {
     XPRO_SOCIETY = 'XS',
 
     // overloaded values
-    AMALGAMATION = 'ATMP',
+    AMALGAMATION_APPLICATION = 'ATMP',
     INCORPORATION_APPLICATION = 'TMP',
     NAME_REQUEST = 'NR',
     REGISTRATION = 'RTMP'

diff --git a/auth-web/tests/unit/test-utils/test-data/affiliations.ts b/auth-web/tests/unit/test-utils/test-data/affiliations.ts
@@ -126,7 +126,7 @@ export const businesses: Business[] = [
   {
     businessIdentifier: 'TC6weERhbH',
     corpType: {
-      code: CorpTypes.AMALGAMATION
+      code: CorpTypes.AMALGAMATION_APPLICATION
     },
     corpSubType: {
       code: CorpTypes.BENEFIT_COMPANY