fix(FSADT1-1595): fixing missing contact code desc

backend/src/main/java/ca/bc/gov/app/dto/legacy/ForestClientContactDto.java

@@ -9,6 +9,7 @@ public record ForestClientContactDto(
     String clientLocnCode,
     List<String> locationCode,
     String contactCode,
+    String contactCodeDescription,
     String contactName,
     String businessPhone,
     String secondaryPhone,

backend/src/main/java/ca/bc/gov/app/repository/client/ContactTypeCodeRepository.java

@@ -2,6 +2,7 @@
 
 import ca.bc.gov.app.entity.client.ContactTypeCodeEntity;
 import java.time.LocalDate;
+import java.util.Set;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.r2dbc.repository.Query;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
@@ -25,4 +26,6 @@ public interface ContactTypeCodeRepository
   Flux<ContactTypeCodeEntity> findActiveAt(LocalDate activeDate, Pageable pageable);
 
   Mono<ContactTypeCodeEntity> findByOrDescription(String id, String description);
+
+  Flux<ContactTypeCodeEntity> findByContactTypeCodeIn(Set<String> contactTypeCodes);
 }

backend/src/main/java/ca/bc/gov/app/service/client/ClientCodeService.java

@@ -5,6 +5,7 @@
 import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.IdentificationTypeDto;
 import ca.bc.gov.app.entity.client.ClientTypeCodeEntity;
+import ca.bc.gov.app.entity.client.ContactTypeCodeEntity;
 import ca.bc.gov.app.predicates.QueryPredicates;
 import ca.bc.gov.app.repository.client.ClientTypeCodeRepository;
 import ca.bc.gov.app.repository.client.ContactTypeCodeRepository;
@@ -13,6 +14,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -155,5 +157,14 @@ public Mono<CodeNameDto> getIdentificationTypeByCode(String idCode) {
             entity.getDescription()));
   }
 
+  public Mono<Map<String,String>> fetchContactTypesFromList(Set<String> contactTypes){
+
+    return contactTypeCodeRepository
+        .findByContactTypeCodeIn(contactTypes)
+        .collectMap(
+            ContactTypeCodeEntity::getContactTypeCode,
+            ContactTypeCodeEntity::getDescription
+        );
+  }
 
 }

backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java

@@ -13,6 +13,7 @@
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
 import ca.bc.gov.app.dto.client.EmailRequestDto;
 import ca.bc.gov.app.dto.client.LegalTypeEnum;
+import ca.bc.gov.app.dto.legacy.ForestClientContactDto;
 import ca.bc.gov.app.dto.legacy.ForestClientDetailsDto;
 import ca.bc.gov.app.dto.legacy.ForestClientDto;
 import ca.bc.gov.app.exception.ClientAlreadyExistException;
@@ -28,15 +29,19 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -48,6 +53,7 @@ public class ClientService {
 
   private final ClientCountryProvinceService countryProvinceService;
   private final BcRegistryService bcRegistryService;
+  private final ClientCodeService codeService;
   private final ChesService chesService;
   private final ClientLegacyService legacyService;
   private final Predicate<BcRegistryAddressDto> isMultiAddressEnabled;
@@ -147,6 +153,7 @@ public Mono<ClientDetailsDto> getClientDetailsByIncorporationNumber(
   public Mono<ForestClientDetailsDto> getClientDetailsByClientNumber(String clientNumber) {
     return legacyService
         .searchByClientNumber(clientNumber)
+        .flatMap(this::populateContactTypes)
         .flatMap(forestClientDetailsDto -> Mono
             .just(forestClientDetailsDto)
             .filter(dto -> (StringUtils.isNotBlank(dto.corpRegnNmbr())))
@@ -158,6 +165,7 @@ public Mono<ForestClientDetailsDto> getClientDetailsByClientNumber(String client
                     .next()
             )
             .flatMap(documentMono -> populateGoodStandingInd(forestClientDetailsDto, documentMono))
+
             .onErrorContinue(NoClientDataFound.class, (ex, obj) ->
                 log.error("No data found on BC Registry for client number: {}", clientNumber)
             )
@@ -169,27 +177,6 @@ public Mono<ForestClientDetailsDto> getClientDetailsByClientNumber(String client
         );
   }
 
-  private Mono<ForestClientDetailsDto> populateGoodStandingInd(
-      ForestClientDetailsDto forestClientDetailsDto,
-      BcRegistryDocumentDto document
-  ) {
-    Boolean goodStandingInd = document.business().goodStanding();
-    String goodStanding = BooleanUtils.toString(
-        goodStandingInd,
-        "Y",
-        "N",
-        StringUtils.EMPTY
-    );
-
-    log.info("Setting goodStandingInd for client: {} to {}",
-        forestClientDetailsDto.clientNumber(), goodStanding);
-
-    ForestClientDetailsDto updatedDetails =
-        forestClientDetailsDto.withGoodStandingInd(goodStanding);
-
-    return Mono.just(updatedDetails);
-  }
-
   /**
    * Searches the BC Registry API for {@link BcRegistryFacetSearchResultEntryDto} instances matching
    * the given value and maps them to {@link ClientLookUpDto} instances.
@@ -268,6 +255,61 @@ public Mono<Void> triggerEmailDuplicatedClient(
             .then();
   }
 
+  private Mono<ForestClientDetailsDto> populateContactTypes(
+      ForestClientDetailsDto forestClientDetailsDto
+  ) {
+
+    if(CollectionUtils.isEmpty(forestClientDetailsDto.contacts()))
+      return Mono.just(forestClientDetailsDto);
+
+    Set<String> contactCodes =
+    forestClientDetailsDto
+        .contacts()
+        .stream()
+        .filter(Objects::nonNull)
+        .map(ForestClientContactDto::contactCode)
+        .filter(StringUtils::isNotBlank)
+        .collect(Collectors.toSet());
+
+
+    return codeService
+        .fetchContactTypesFromList(contactCodes)
+        .map(map ->
+          forestClientDetailsDto
+              .withContacts(
+                 forestClientDetailsDto
+                .contacts()
+                .stream()
+                .map(contact ->
+                    contact.withContactCodeDescription(map.getOrDefault(contact.contactCode(), StringUtils.EMPTY))
+                )
+                .toList()
+              )
+        );
+  }
+
+
+  private Mono<ForestClientDetailsDto> populateGoodStandingInd(
+      ForestClientDetailsDto forestClientDetailsDto,
+      BcRegistryDocumentDto document
+  ) {
+    Boolean goodStandingInd = document.business().goodStanding();
+    String goodStanding = BooleanUtils.toString(
+        goodStandingInd,
+        "Y",
+        "N",
+        StringUtils.EMPTY
+    );
+
+    log.info("Setting goodStandingInd for client: {} to {}",
+        forestClientDetailsDto.clientNumber(), goodStanding);
+
+    ForestClientDetailsDto updatedDetails =
+        forestClientDetailsDto.withGoodStandingInd(goodStanding);
+
+    return Mono.just(updatedDetails);
+  }
+
   private Function<BcRegistryDocumentDto, Mono<ClientDetailsDto>> buildDetails() {
     return document ->
         buildAddress(

frontend/src/pages/ClientDetailsPage.vue

@@ -70,8 +70,8 @@ const formatCount = (count = 0) => {
 };
 
 const formatAddress = (location: ClientLocation) => {
-  const { addressOne, city, provinceCode, countryDesc, postalCode } = location;
-  const list = [addressOne, city, provinceCode, countryDesc, postalCode];
+  const { addressOne, city, province, country, postalCode } = location;
+  const list = [addressOne, city, province, country, postalCode];
   return list.join(", ");
 };
 

frontend/src/pages/SearchPage.vue

@@ -142,7 +142,11 @@ const openClientDetails = (clientCode: string) => {
     const url = featureFlags.STAFF_CLIENT_DETAIL
       ? `/clients/details/${clientCode}`
       : `https://${greenDomain}/int/client/client02MaintenanceAction.do?bean.clientNumber=${clientCode}`;
-    window.open(url, "_blank", "noopener");
+
+    if(featureFlags.STAFF_CLIENT_DETAIL)
+      window.open(url, "_self");
+    else
+      window.open(url, "_blank", "noopener");
   }
 };
 

frontend/src/pages/client-details/ContactView.vue

@@ -17,7 +17,7 @@ const faxNumber = computed(() => formatPhoneNumber(props.data.faxNumber));
 <template>
   <div :id="`contact-${index}-general-section`" class="flex-column-1_5rem margin-left-1_75rem">
     <read-only-component label="Contact type" :id="`contact-${index}-contactType`">
-      <span class="body-compact-01">{{ data.contactTypeDesc }}</span>
+      <span class="body-compact-01">{{ data.contactCodeDescription }}</span>
     </read-only-component>
     <read-only-component label="Associated locations" :id="`contact-${index}-associatedLocations`">
       <span class="body-compact-01">{{ associatedLocationsString }}</span>

frontend/src/pages/client-details/LocationView.vue

@@ -38,10 +38,10 @@ const faxNumber = computed(() => formatPhoneNumber(props.data.faxNumber));
             {{ data.addressOne }}
           </span>
           <span :id="`location-${indexString}-city-province`" class="body-compact-01">
-            {{ data.city }}, {{ data.provinceDesc }}
+            {{ data.city }}, {{ data.province }}
           </span>
           <span :id="`location-${indexString}-country`" class="body-compact-01">
-            {{ data.countryDesc }}
+            {{ data.country }}
           </span>
           <span :id="`location-${indexString}-postalCode`" class="body-compact-01">
             {{ data.postalCode }}