Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(FSADT1-1514): fixed doing business as processing #1177

Merged
merged 2 commits into from
Sep 24, 2024
Merged

fix(FSADT1-1514): fixed doing business as processing #1177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dded9d3
fix(FSADT1-1514): fixed doing business as processing
paulushcgcj Sep 24, 2024
f0448e1
Update BusinessInformationWizardStep.vue
mamartinezmejia Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -159,6 +160,7 @@ const autoCompleteResult = ref<BusinessSearchResult>();
watch([autoCompleteResult], () => {
// reset business validation state
validation.business = false;
formData.value.businessInformation.doingBusinessAs = null;

if (autoCompleteResult.value && autoCompleteResult.value.code) {
toggleErrorMessages(false, false, false);
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion processor/src/main/java/ca/bc/gov/app/ApplicationConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
14 changes: 6 additions & 8 deletions processor/src/main/java/ca/bc/gov/app/service/legacy/LegacyAbstractPersistenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -320,13 +319,12 @@ private Mono<String> createClientDoingBusinessAs(MessagingWrapper<ForestClientDt
.just(clientNumber)
//FSADT1-1388: Allow doing business as based on parameter
.filter(
forestClientNumber -> 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 ->
Expand Down
30 changes: 8 additions & 22 deletions ...ssor/src/main/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,12 @@ public Mono<MessagingWrapper<ForestClientDto>> 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 ->
Expand Down Expand Up @@ -139,15 +142,7 @@ public Mono<MessagingWrapper<ForestClientDto>> 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,
Expand All @@ -161,16 +156,7 @@ public Mono<MessagingWrapper<ForestClientDto>> 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()
)
);

Expand Down
6 changes: 3 additions & 3 deletions .../src/test/java/ca/bc/gov/app/service/legacy/LegacyRegisteredSPPersistenceServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ private static Stream<Arguments> 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"),
Expand Down Expand Up @@ -497,7 +497,7 @@ private static Stream<Arguments> 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"),
Expand Down Expand Up @@ -638,7 +638,7 @@ private static Stream<Arguments> 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")
Expand Down
Loading