feat(FSADT1-1390): First nartions - Part #1

bcgov · Aug 7, 2024 · 4d782e8 · 4d782e8
1 parent dbd2932
commit 4d782e8
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 51 deletions.
diff --git a/backend/src/main/java/ca/bc/gov/app/service/opendata/OpenDataService.java b/backend/src/main/java/ca/bc/gov/app/service/opendata/OpenDataService.java
@@ -5,12 +5,14 @@
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
 import ca.bc.gov.app.dto.opendata.Feature;
 import ca.bc.gov.app.dto.opendata.OpenData;
+import ca.bc.gov.app.repository.client.ProvinceCodeRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 @RequiredArgsConstructor
 @Slf4j
@@ -19,6 +21,7 @@ public class OpenDataService {
 
   private final BcMapsService bcMapsService;
   private final SacService sacService;
+  private final ProvinceCodeRepository provinceCodeRepository;
 
   public Flux<ClientDetailsDto> getFirstNationData(String nationName) {
     return bcMapsService
@@ -29,40 +32,53 @@ public Flux<ClientDetailsDto> getFirstNationData(String nationName) {
             log.info("Returning first nation data for nationName: {} {}", nationName,
                 openDataFeature)
         )
-        .map(this::convertToDto);
+        .flatMap(this::convertToDto);
   }
 
-  private ClientDetailsDto convertToDto(Feature openDataFeature) {
+  private Mono<ClientDetailsDto> convertToDto(Feature openDataFeature) {
+    return loadProvince("CA", openDataFeature.properties().officeProvince())
+        .map(provinceDto -> {
+            ClientAddressDto addressDto = new ClientAddressDto(
+                StringUtils.defaultIfBlank(
+                    openDataFeature.properties().addressLine2(),
+                    openDataFeature.properties().addressLine1()
+                ),
+                StringUtils.EMPTY,
+                null,
+                new ClientValueTextDto("CA", "Canada"),
+                provinceDto,
+                openDataFeature.properties().officeCity(),
+                StringUtils.defaultIfBlank(
+                    openDataFeature.properties().officePostalCode(), 
+                    StringUtils.EMPTY)
+                  .replace(" ", StringUtils.EMPTY),
+                StringUtils.EMPTY,
+                StringUtils.EMPTY,
+                StringUtils.EMPTY,
+                StringUtils.EMPTY,
+                StringUtils.EMPTY,
+                0,
+                "Mailing Address"
+            );
 
-    ClientAddressDto addressDto = new ClientAddressDto(
-        StringUtils.defaultIfBlank(
-            openDataFeature.properties().addressLine2(),
-            openDataFeature.properties().addressLine1()
-        ),
-        StringUtils.isNotBlank(openDataFeature.properties().addressLine2())
-            ? openDataFeature.properties().addressLine1() : StringUtils.EMPTY,
-        StringUtils.EMPTY,
-        new ClientValueTextDto("CA", "Canada"),
-        new ClientValueTextDto(openDataFeature.properties().officeProvince(), null),
-        openDataFeature.properties().officeCity(),
-        StringUtils.defaultIfBlank(openDataFeature.properties().officePostalCode(),
-            StringUtils.EMPTY).replace(" ", StringUtils.EMPTY),
-        StringUtils.EMPTY,
-        StringUtils.EMPTY,
-        StringUtils.EMPTY,
-        StringUtils.EMPTY,
-        StringUtils.EMPTY,
-        0,
-        "Mailing Address"
-    );
-
-    return new ClientDetailsDto(
-        openDataFeature.properties().getNationName(),
-        openDataFeature.properties().getNationId() + "",
-        true,
-        addressDto.isValid() ? List.of(addressDto) : List.of(),
-        List.of()
-    );
+            return new ClientDetailsDto(
+                openDataFeature.properties().getNationName(),
+                openDataFeature.properties().getNationId() + "",
+                true,
+                addressDto.isValid() ? List.of(addressDto) : List.of(),
+                List.of()
+            );
+        });
+  }
+
+  private Mono<ClientValueTextDto> loadProvince(String countryCode, String province) {
+    return
+        provinceCodeRepository
+            .findByCountryCodeAndProvinceCode(countryCode, province)
+            .map(
+                entity -> new ClientValueTextDto(entity.getProvinceCode(), entity.getDescription())
+            )
+            .defaultIfEmpty(new ClientValueTextDto(province, province));
   }
 
 }
diff --git a/frontend/src/pages/staffform/FirstNationClientInformationWizardStep.vue b/frontend/src/pages/staffform/FirstNationClientInformationWizardStep.vue
@@ -15,10 +15,9 @@ import type {
   FormDataDto,
 } from "@/dto/ApplyClientNumberDto";
 import type {
-  BusinessSearchResult,
-  CodeNameType,
-  IdentificationCodeNameType,
+  BusinessSearchResult
 } from "@/dto/CommonTypesDto";
+import { exportAddress } from "@/helpers/DataConversors";
 // Importing validators
 import {
   getValidations,
@@ -56,14 +55,6 @@ const validation = reactive<Record<string, boolean>>({
   businessName: !!formData.value.businessInformation.businessName,
 });
 
-watch(
-  () => formData.value.businessInformation.firstName,
-  (value) => {
-    // copy the firstName into the first contact
-    //formData.value.location.contacts[0].firstName = value;
-  }
-);
-
 const checkValid = () =>
   Object.values(validation).reduce(
     (accumulator: boolean, currentValue: boolean) =>
@@ -94,7 +85,6 @@ const showDetailsLoading = ref<boolean>(false);
 
 watch([autoCompleteResult], () => {
   if (autoCompleteResult.value && autoCompleteResult.value.code) {
-    console.log("Test " + JSON.stringify(autoCompleteResult.value));
     showDetailsLoading.value = true;
   }
   firstNationControl.value = false;
@@ -110,19 +100,18 @@ const parseSelectedNation = (
 ) => {
   if (selectedNation) {
     validation.businessName = true;
+    formData.value.location.addresses = exportAddress(
+      selectedNation.addresses
+    );
   }
   return selectedNation;
 };
 
-const mapFirstNationInfo = (firstNations: ForestClientDetailsDto[]) => {
-  let maapedFirstNations: any[];
-
-  maapedFirstNations = firstNations.map((v) => ({
+const mapFirstNationInfo = (firstNations: ForestClientDetailsDto[] = []) => {
+  return firstNations.map((v) => ({
     ...v,
     code: v.id,
   }));
-
-  return maapedFirstNations;
 };
 
 </script>

diff --git a/frontend/stub/__files/response-opendata-autocomplete.json b/frontend/stub/__files/response-opendata-autocomplete.json
@@ -14,7 +14,7 @@
         },
         "province": {
           "value": "BC",
-          "text": null
+          "text": "British Columbia"
         },
         "city": "NORTH VANCOUVER",
         "postalCode": "V7L4J5",
@@ -36,4 +36,4 @@
     "addresses": [],
     "contacts": []
   }
-]
+]