From e7757e337feaa943972786bb6dafcad84eeb44b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:53:08 +0000 Subject: [PATCH 1/4] fix(deps): update maven all non-major dependencies --- backend/pom.xml | 4 ++-- legacy/pom.xml | 2 +- processor/pom.xml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index c0fce02dbf..bfde1ae97a 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -45,7 +45,7 @@ 1.9.1 4.1.113.Final ${project.version} - 9.41 + 9.41.1 @@ -224,7 +224,7 @@ org.springframework spring-web - 6.1.12 + 6.1.13 org.springframework.security diff --git a/legacy/pom.xml b/legacy/pom.xml index e2abba2c7e..5f87e21754 100644 --- a/legacy/pom.xml +++ b/legacy/pom.xml @@ -199,7 +199,7 @@ org.springframework spring-web - 6.1.12 + 6.1.13 io.netty diff --git a/processor/pom.xml b/processor/pom.xml index ac0d21888e..940a7d07bc 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -46,7 +46,7 @@ 3.24.2 4.1.113.Final ${project.version} - 10.17.3 + 10.18.0 @@ -186,7 +186,7 @@ org.springframework spring-web - 6.1.12 + 6.1.13 io.netty From a4d33dc41429a7a3ee0a6a7091b325e0f3104631 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:49:57 -0700 Subject: [PATCH 2/4] fix(deps): update dependency date-fns to v4 (#1173) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- frontend/package-lock.json | 8 ++++---- frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 9ec38a2aa3..98a19a144b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -18,7 +18,7 @@ "@vueuse/core": "^11.1.0", "aws-amplify": "^6.3.5", "axios": "^1.7.2", - "date-fns": "^3.0.0", + "date-fns": "^4.0.0", "dotenv": "^16.0.0", "vue": "^3.5.6", "vue-dompurify-html": "^5.0.1", @@ -9214,9 +9214,9 @@ } }, "node_modules/date-fns": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-3.6.0.tgz", - "integrity": "sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz", + "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==", "license": "MIT", "funding": { "type": "github", diff --git a/frontend/package.json b/frontend/package.json index e2fc886de6..d4c6845afd 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -56,7 +56,7 @@ "@vueuse/core": "^11.1.0", "aws-amplify": "^6.3.5", "axios": "^1.7.2", - "date-fns": "^3.0.0", + "date-fns": "^4.0.0", "dotenv": "^16.0.0", "vue": "^3.5.6", "vue-dompurify-html": "^5.0.1", From d93cd0523ad2ddb21196e43c54f574d598511c7f Mon Sep 17 00:00:00 2001 From: Paulo Gomes da Cruz Junior Date: Tue, 24 Sep 2024 14:26:21 -0700 Subject: [PATCH 3/4] fix(FSADT1-1514): fixed doing business as processing (#1177) - added to external users the DBA field filled - fixed the DBA field on the processor --- .../BusinessInformationWizardStep.vue | 6 ++++ .../ca/bc/gov/app/ApplicationConstant.java | 2 +- .../LegacyAbstractPersistenceService.java | 14 ++++----- .../LegacyRegisteredSPPersistenceService.java | 30 +++++-------------- ...acyRegisteredSPPersistenceServiceTest.java | 6 ++-- 5 files changed, 24 insertions(+), 34 deletions(-) diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue index 149db69e2e..8270ef8f2f 100644 --- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue +++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue @@ -25,6 +25,7 @@ import { getValidations } from "@/helpers/validators/GlobalValidators"; import { submissionValidation } from "@/helpers/validators/SubmissionValidators"; // Importing helper functions import { retrieveClientType, exportAddress } from "@/helpers/DataConversors"; +import { formDataDto } from '../../dto/ApplyClientNumberDto'; import { getEnumKeyByEnumValue, adminEmail, @@ -159,6 +160,7 @@ const autoCompleteResult = ref(); watch([autoCompleteResult], () => { // reset business validation state validation.business = false; + formData.value.businessInformation.doingBusinessAs = null; if (autoCompleteResult.value && autoCompleteResult.value.code) { toggleErrorMessages(false, false, false); @@ -172,6 +174,10 @@ watch([autoCompleteResult], () => { ); showAutoCompleteInfo.value = false; + if (formData.value.businessInformation.clientType === 'RSP') { + formData.value.businessInformation.doingBusinessAs = autoCompleteResult.value.name; + } + emit("update:data", formData.value); //Also, we will load the backend data to fill all the other information as well diff --git a/processor/src/main/java/ca/bc/gov/app/ApplicationConstant.java b/processor/src/main/java/ca/bc/gov/app/ApplicationConstant.java index 588106bb1c..89d85afd0b 100644 --- a/processor/src/main/java/ca/bc/gov/app/ApplicationConstant.java +++ b/processor/src/main/java/ca/bc/gov/app/ApplicationConstant.java @@ -36,7 +36,7 @@ public final class ApplicationConstant { public static final String MATCHING_KIND = "kind"; public static final String MATCHED_USER = "matched-user"; public static final String IS_DOING_BUSINESS_AS = "isDoingBusinessAs"; - public static final String DOING_BUSINESS_AS = "isDoingBusinessAs"; + public static final String DOING_BUSINESS_AS = "doingBusinessAsName"; public static final BcRegistryDocumentRequestBodyDto BUSINESS_SUMMARY_FILING_HISTORY = diff --git a/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyAbstractPersistenceService.java b/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyAbstractPersistenceService.java index c667b69f50..b906b73304 100644 --- a/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyAbstractPersistenceService.java +++ b/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyAbstractPersistenceService.java @@ -18,7 +18,6 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -320,13 +319,12 @@ private Mono createClientDoingBusinessAs(MessagingWrapper BooleanUtils - .toBoolean( - message - .getParameter( - ApplicationConstant.IS_DOING_BUSINESS_AS, - String.class - ) + forestClientNumber -> + Boolean.TRUE.equals(message + .getParameter( + ApplicationConstant.IS_DOING_BUSINESS_AS, + Boolean.class + ) ) ) .doOnNext(forestClientNumber -> diff --git a/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceService.java b/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceService.java index 95d70e0e9c..36007b587b 100644 --- a/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceService.java +++ b/processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceService.java @@ -76,9 +76,12 @@ public Mono> generateForestClient( //if Staff submitted, get the client name from the submission as doing business as .doOnNext(submissionDetail -> { - if (isStaffSubmitted(message)) { - atomicClientName.set(submissionDetail.getDoingBusinessAs()); - } + atomicClientName.set( + Optional + .ofNullable(submissionDetail.getDoingBusinessAs()) + .filter(StringUtils::isNotBlank) + .orElse(submissionDetail.getOrganizationName()) + ); }) .map(submissionDetail -> @@ -139,15 +142,7 @@ public Mono> generateForestClient( message.parameters() ) .withParameter(ApplicationConstant.FOREST_CLIENT_NAME, - BooleanUtils.toString( - isStaffSubmitted(message), - atomicClientName.get(), - Optional - .ofNullable(forestClient.clientComment()) - .filter(StringUtils::isNotBlank) - .map(comment -> comment.split("and company name ")[1]) - .orElse(StringUtils.EMPTY) - ) + atomicClientName.get().toUpperCase() ) .withParameter(ApplicationConstant.REGISTRATION_NUMBER, String.join(StringUtils.EMPTY, @@ -161,16 +156,7 @@ public Mono> generateForestClient( ) .withParameter( ApplicationConstant.DOING_BUSINESS_AS, - BooleanUtils.toString( - isStaffSubmitted(message), - atomicClientName.get().toUpperCase(), - Optional - .ofNullable(forestClient.clientComment()) - .filter(StringUtils::isNotBlank) - .map(comment -> comment.split("and company name ")[1]) - .orElse(StringUtils.EMPTY) - .toUpperCase() - ) + atomicClientName.get().toUpperCase() ) ); diff --git a/processor/src/test/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceServiceTest.java b/processor/src/test/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceServiceTest.java index 02d2f003df..aaeb185b40 100644 --- a/processor/src/test/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceServiceTest.java +++ b/processor/src/test/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceServiceTest.java @@ -428,7 +428,7 @@ private static Stream generateForestClient() { .withParameter(ApplicationConstant.CREATED_BY, "IDIR\\JWICK") .withParameter(ApplicationConstant.UPDATED_BY, "IDIR\\JWICK") .withParameter(ApplicationConstant.FOREST_CLIENT_NAME, - "Baxter Corp") + "BAXTER CORP") .withParameter(ApplicationConstant.REGISTRATION_NUMBER, "FM00184546") .withParameter(ApplicationConstant.IS_DOING_BUSINESS_AS, true) .withParameter(ApplicationConstant.DOING_BUSINESS_AS, "BAXTER CORP"), @@ -497,7 +497,7 @@ private static Stream generateForestClient() { .withParameter(ApplicationConstant.CREATED_BY, "IDIR\\JWICK") .withParameter(ApplicationConstant.UPDATED_BY, "IDIR\\JWICK") .withParameter(ApplicationConstant.FOREST_CLIENT_NAME, - "Baxter Corp") + "BAXTER CORP") .withParameter(ApplicationConstant.REGISTRATION_NUMBER, "FM00184546") .withParameter(ApplicationConstant.IS_DOING_BUSINESS_AS, true) .withParameter(ApplicationConstant.DOING_BUSINESS_AS, "BAXTER CORP"), @@ -638,7 +638,7 @@ private static Stream generateDoingBusinessAs() { .withParameter(ApplicationConstant.CREATED_BY, "IDIR\\JWICK") .withParameter(ApplicationConstant.UPDATED_BY, "IDIR\\JWICK") .withParameter(ApplicationConstant.FOREST_CLIENT_NAME, - "Baxter Corp") + "BAXTER CORP") .withParameter(ApplicationConstant.REGISTRATION_NUMBER, "FM00184546") .withParameter(ApplicationConstant.IS_DOING_BUSINESS_AS, true) .withParameter(ApplicationConstant.DOING_BUSINESS_AS, "BAXTER CORP") From 9f24e0d7633199ec6a3d01f9e55225586b984bcf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:52:08 +0000 Subject: [PATCH 4/4] fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v3.3.4 --- backend/pom.xml | 2 +- legacy/pom.xml | 2 +- processor/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index bfde1ae97a..8d494c2531 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 diff --git a/legacy/pom.xml b/legacy/pom.xml index 5f87e21754..5c0c805f28 100644 --- a/legacy/pom.xml +++ b/legacy/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 diff --git a/processor/pom.xml b/processor/pom.xml index 940a7d07bc..3b17c44020 100644 --- a/processor/pom.xml +++ b/processor/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4