fix: multi-location association

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

@@ -1,8 +1,13 @@
 package ca.bc.gov.app.dto.legacy;
 
+import java.util.List;
+import lombok.With;
+
+@With
 public record ForestClientContactDto(
     String clientNumber,
     String clientLocnCode,
+    List<String> locationCode,
     String contactCode,
     String contactName,
     String businessPhone,

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

@@ -531,7 +531,7 @@ private void cleanMatchers(SubmissionMatchDetailEntity entity) {
     });
   }
 
-  private Mono<SubmissionLocationContactEntity> saveAndAssociateContact(
+  private Flux<SubmissionLocationContactEntity> saveAndAssociateContact(
       List<SubmissionLocationEntity> locations,
       ClientContactDto contact,
       Integer submissionId,
@@ -544,14 +544,18 @@ private Mono<SubmissionLocationContactEntity> saveAndAssociateContact(
             .map(contactEntity -> contactEntity.withSubmissionId(submissionId))
             .map(contactEntity -> contactEntity.withUserId(contact.index() == 0 ? userId : null))
             .flatMap(submissionContactRepository::save)
-            .map(contactEntity ->
-                SubmissionLocationContactEntity
-                    .builder()
-                    .submissionLocationId(getLocationIdByName(locations, contact))
-                    .submissionContactId(contactEntity.getSubmissionContactId())
-                    .build()
-            )
-            .flatMap(submissionLocationContactRepository::save);
+            .flatMapMany(contactEntity ->
+                Flux
+                    .fromIterable(contact.locationNames())
+                    .map(locationName ->
+                        SubmissionLocationContactEntity
+                            .builder()
+                            .submissionLocationId(getLocationIdByName(locations, locationName.text()))
+                            .submissionContactId(contactEntity.getSubmissionContactId())
+                            .build()
+                    )
+                    .flatMap(submissionLocationContactRepository::save)
+            );
   }
 
   private Mono<List<SubmissionLocationEntity>> saveAddresses(

backend/src/main/java/ca/bc/gov/app/util/ClientMapper.java

@@ -18,6 +18,9 @@
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ClientMapper {
 
+  public static final String FIRST_NAME = "firstName";
+  public static final String LAST_NAME = "lastName";
+
   /**
    * Maps a {@link ClientBusinessInformationDto} object to a {@link SubmissionDetailEntity} object,
    * using the specified submission ID.
@@ -160,6 +163,19 @@ public static Integer getLocationIdByName(
             .orElse(0);
   }
 
+  public static Integer getLocationIdByName(
+      List<SubmissionLocationEntity> locations,
+      String locationName
+  ) {
+    return
+        locations
+            .stream()
+            .filter(location -> locationName.equalsIgnoreCase(location.getName()))
+            .map(SubmissionLocationEntity::getSubmissionLocationId)
+            .findFirst()
+            .orElse(0);
+  }
+
   public static Map<String, String> parseName(String displayName, String provider) {
     String[] nameParts =
         displayName.contains(",")
@@ -168,13 +184,13 @@ public static Map<String, String> parseName(String displayName, String provider)
 
     if ("IDIR".equalsIgnoreCase(provider) && nameParts.length >= 2) {
 
-      String firstName = nameParts[1].replaceAll("\\s+\\w+:\\w+$", StringUtils.EMPTY).trim();
+      String firstName = nameParts[1].replaceAll("\\s+[^\\s:]+:[^\\s:]+$", StringUtils.EMPTY).trim();
       String lastName = nameParts[0].trim();
 
       return
           Map.of(
-              "firstName", firstName.split(" ")[0].trim(),
-              "lastName",
+              FIRST_NAME, firstName.split(" ")[0].trim(),
+              LAST_NAME,
 
               Stream.concat(
                       Stream
@@ -187,14 +203,14 @@ public static Map<String, String> parseName(String displayName, String provider)
 
     } else if (nameParts.length >= 2) {
       return Map.of(
-          "firstName", nameParts[0].trim(),
-          "lastName", String.join(" ", Arrays.copyOfRange(nameParts, 1, nameParts.length))
+          FIRST_NAME, nameParts[0].trim(),
+          LAST_NAME, String.join(" ", Arrays.copyOfRange(nameParts, 1, nameParts.length))
       );
     }
 
     return Map.of(
-        "firstName", nameParts[0],
-        "lastName", ""
+        FIRST_NAME, nameParts[0],
+        LAST_NAME, ""
     );
   }
 

frontend/src/pages/ClientDetailsPage.vue

@@ -117,7 +117,7 @@ const formatLocations = (
 const associatedLocationsRecord = computed(() => {
   const result: Record<string, string> = {};
   sortedContacts.value?.forEach((contact) => {
-    result[contact.contactCode] = formatLocations(contact.clientLocnCode);
+    result[contact.contactCode] = formatLocations(contact.locationCode);
   });
   return result;
 });

frontend/stub/__files/response-clients-details-G.json

@@ -13,7 +13,7 @@
     "wcbFirmNumber": "{{randomValue length=7 type='NUMERIC'}}",
     "contacts": [
         {
-            "clientLocnCode": ["00"],
+            "locationCode": ["00"],
             "contactCode": "00",
             "contactName": "Cheryl Bibby",
             "contactTypeCode": "BL",
@@ -24,7 +24,7 @@
             "emailAddress": "[email protected]"
         },
         {
-            "clientLocnCode": ["01", "02"],
+            "locationCode": ["01", "02"],
             "contactCode": "01",
             "contactName": "Edward Burns",
             "contactTypeCode": "DI",
@@ -35,7 +35,7 @@
             "emailAddress": "[email protected]"
         },
         {
-            "clientLocnCode": ["02"],
+            "locationCode": ["02"],
             "contactCode": "02",
             "contactName": "Christoffer Stewart",
             "contactTypeCode": "BL",

frontend/stub/__files/response-clients-details-S.json

@@ -18,7 +18,7 @@
     "clientComment": "Email from Michael Scott to request any letters for sec deposits be mailed to 3000, 28th St, Scranton",
     "wcbFirmNumber": "{{randomValue length=7 type='NUMERIC'}}",
     "contacts": [{
-        "clientLocnCode": ["00"],
+        "locationCode": ["00"],
         "contactCode": "00",
         "contactName": "Cheryl Bibby",
         "contactTypeCode": "BL",

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

@@ -1,11 +1,13 @@
 package ca.bc.gov.app.dto;
 
+import java.util.List;
 import lombok.With;
 
 @With
 public record ForestClientContactDto(
     String clientNumber,
     String clientLocnCode,
+    List<String> locationCode,
     String contactCode,
     String contactName,
     String businessPhone,

legacy/src/main/java/ca/bc/gov/app/mappers/AbstractForestClientMapper.java

@@ -2,6 +2,7 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Objects;
 import org.apache.commons.lang3.StringUtils;
 import org.mapstruct.InheritInverseConfiguration;
@@ -49,4 +50,9 @@ default LocalDateTime toLocalDateTime(LocalDate date) {
     return date == null ? null : date.atStartOfDay();
   }
 
+  @Named("AddToListQualifier")
+  default List<String> addToList(String value) {
+    return value != null ? List.of(value) : List.of();
+  }
+
 }

legacy/src/main/java/ca/bc/gov/app/mappers/ForestClientContactMapper.java

@@ -22,6 +22,11 @@ public interface ForestClientContactMapper extends
       source = "cellPhone",
       target = "secondaryPhone"
   )
+  @Mapping(
+      source = "clientLocnCode",
+      target = "locationCode",
+      qualifiedByName = "AddToListQualifier"
+  )
   ForestClientContactDto toDto(ForestClientContactEntity entity);
 
   @Override