Merge branch 'main' into fix/fe/submissions-menu-icon

.github/workflows/merge-main.yml

@@ -297,6 +297,7 @@ jobs:
             -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
             -p PROMOTE=${{ github.repository }}/processor:${{ env.ZONE }}
             -p URL_ZONE=${{ env.ZONE }}
+            -p BCREGISTRY_URI='https://bcregistry-prod.apigee.net'
 
   image-promotions:
     name: Promote images to PROD
@@ -449,3 +450,4 @@ jobs:
             -p ZONE=${{ env.ZONE }} -p NAME=${{ github.event.repository.name }}
             -p PROMOTE=${{ github.repository }}/processor:${{ env.PREV }}
             -p URL_ZONE=${{ env.ZONE }}
+            -p BCREGISTRY_URI='https://bcregistry-prod.apigee.net'

.github/workflows/pr-open.yml

@@ -256,6 +256,7 @@ jobs:
             -p ZONE=${{ github.event.number }} -p NAME=${{ github.event.repository.name }}
             -p PROMOTE=${{ github.repository }}/processor:${{ github.event.number }}
             -p URL_ZONE=$((${{ github.event.number }} % 50))
+            -p BCREGISTRY_URI='https://bcregistry-prod.apigee.net'
 
   cypress-run:
     name: "User flow test"

.github/workflows/unit-tests.yml

@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   tests-java:
-    name: Integrated Tests
+    name: Backend Tests
     if: github.event_name != 'pull_request' || !github.event.pull_request.draft
     runs-on: ubuntu-22.04
     steps:
@@ -70,7 +70,7 @@ jobs:
             -Dsonar.projectKey=nr-forest-client_processor
             -Dsonar.coverage.jacoco.xmlReportPaths=target/coverage-reports/merged-test-report/jacoco.xml        
             -Dsonar.java.checkstyle.reportPaths=target/checkstyle-result.xml
-            -Dsonar.coverage.exclusions=**/configuration/**,**/dto/**,**/entity/**,**/repository/**,**/*$*Builder*,**/ProcessApplication***/ApplicationConstant*
+            -Dsonar.coverage.exclusions=**/configuration/**,**/dto/**,**/exception/**,**/entity/**,**/repository/**,**/*$*Builder*,**/ProcessApplication***/ApplicationConstant*
           sonar_project_token: ${{ secrets.SONAR_TOKEN_PROCESSOR }}
 
       - name: Archive CycloneDX

backend/pom.xml

@@ -138,8 +138,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8-standalone</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
             <version>3.0.1</version>
             <scope>test</scope>
         </dependency>

frontend/src/assets/styles/global.scss

@@ -297,6 +297,7 @@ div#app {
   align-items: center;
   background: var(--light-theme-layer-layer-02, #fff);
   flex-grow: 1;
+  margin-top: 3.5rem;
 }
 
 .full {

legacy/pom.xml

@@ -150,8 +150,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.github.tomakehurst</groupId>
-			<artifactId>wiremock-jre8-standalone</artifactId>
+			<groupId>org.wiremock</groupId>
+			<artifactId>wiremock-standalone</artifactId>
 			<version>3.0.1</version>
 			<scope>test</scope>
 		</dependency>

processor/openshift.deploy.yml

@@ -40,6 +40,9 @@ parameters:
   - name: URL_ZONE
     description: Zone to use for URL
     required: true
+  - name: BCREGISTRY_URI
+    description: Bc Registry API address
+    required: true
 objects:
   - apiVersion: v1
     kind: ImageStream
@@ -195,6 +198,18 @@ objects:
                   value: 30S
                 - name: TZ
                   value: America/Vancouver
+                - name: BCREGISTRY_URI
+                  value: ${BCREGISTRY_URI}
+                - name: BCREGISTRY_KEY
+                  valueFrom:
+                    secretKeyRef:
+                      name: ${NAME}-${ZONE}
+                      key: bcregistry-key
+                - name: BCREGISTRY_ACCOUNT
+                  valueFrom:
+                    secretKeyRef:
+                      name: ${NAME}-${ZONE}
+                      key: bcregistry-account
               ports:
                 - containerPort: 3000
                   protocol: TCP

processor/pom.xml

@@ -160,9 +160,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8-standalone</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
             <version>3.0.1</version>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>

processor/src/main/java/ca/bc/gov/app/ApplicationConstant.java

@@ -1,5 +1,9 @@
 package ca.bc.gov.app;
 
+import ca.bc.gov.app.dto.bcregistry.BcRegistryDocumentAccessRequestDto;
+import ca.bc.gov.app.dto.bcregistry.BcRegistryDocumentAccessTypeDto;
+import ca.bc.gov.app.dto.bcregistry.BcRegistryDocumentRequestBodyDto;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
@@ -17,6 +21,7 @@ public final class ApplicationConstant {
   public static final String REVIEW_CHANNEL = "reviewChannel";
   public static final String SUBMISSION_MAIL_CHANNEL = "submissionMailChannel";
   public static final String SUBMISSION_LEGACY_CLIENT_CHANNEL = "submissionLegacyClientChannel";
+  public static final String SUBMISSION_LEGACY_CLIENT_PERSIST_CHANNEL = "submissionLegacyClientPersistChannel";
   public static final String SUBMISSION_LEGACY_LOCATION_CHANNEL = "submissionLegacyLocationChannel";
   public static final String SUBMISSION_LEGACY_CONTACT_CHANNEL = "submissionLegacyContactChannel";
   public static final String SUBMISSION_LEGACY_AGGREGATE_CHANNEL = "submissionLegacyAggregateChannel";
@@ -42,4 +47,20 @@ public final class ApplicationConstant {
   public static final String LOCATION_CODE = "locationCode";
   public static final String SUBMISSION_MAIL_BUILD_CHANNEL = "submissionMailBuildChannel";
   public static final String CLIENT_NUMBER = "CLIENT_NUMBER";
+  public static final String CLIENT_TYPE_CODE = "CLIENT_TYPE_CODE";
+  public static final String SUBMISSION_LEGACY_INDIVIDUAL_CHANNEL = "submissionLegacyIndividualChannel";
+  public static final String SUBMISSION_LEGACY_USP_CHANNEL = "submissionLegacyUSPChannel";
+  public static final String SUBMISSION_LEGACY_RSP_CHANNEL = "submissionLegacyRSPChannel";
+  public static final String SUBMISSION_LEGACY_OTHER_CHANNEL = "submissionLegacyOtherChannel";
+  public static final String CLIENT_EXISTS = "client-exists";
+
+  public static final BcRegistryDocumentRequestBodyDto
+      BUSINESS_SUMMARY_FILING_HISTORY =
+      new BcRegistryDocumentRequestBodyDto(
+          new BcRegistryDocumentAccessRequestDto(
+              List.of(
+                  new BcRegistryDocumentAccessTypeDto("BUSINESS_SUMMARY_FILING_HISTORY")
+              )
+          )
+      );
 }

processor/src/main/java/ca/bc/gov/app/configuration/ForestClientConfiguration.java

@@ -27,6 +27,9 @@ public class ForestClientConfiguration {
   @NestedConfigurationProperty
   private BackendConfiguration backend;
 
+  @NestedConfigurationProperty
+  private BcRegistryConfiguration bcregistry;
+
   @Data
   @Builder
   @NoArgsConstructor
@@ -43,4 +46,18 @@ public static class BackendConfiguration {
     private String uri;
   }
 
+  /**
+   * The BC Registry configuration.
+   */
+  @Data
+  @Builder
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class BcRegistryConfiguration {
+
+    private String uri;
+    private String apiKey;
+    private String accountId;
+  }
+
 }

processor/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java

@@ -25,4 +25,20 @@ public WebClient forestClientApi(ForestClientConfiguration configuration) {
         .build();
   }
 
+  /**
+   * Returns a configured instance of WebClient for accessing the BC Registry API.
+   *
+   * @param configuration The configuration for the ForestClient.
+   * @return A configured instance of WebClient for accessing the BC Registry API.
+   */
+  @Bean
+  public WebClient bcRegistryApi(ForestClientConfiguration configuration) {
+    return WebClient
+        .builder()
+        .baseUrl(configuration.getBcregistry().getUri())
+        .defaultHeader("x-apikey", configuration.getBcregistry().getApiKey())
+        .defaultHeader("Account-Id", configuration.getBcregistry().getAccountId())
+        .build();
+  }
+
 }

processor/src/main/java/ca/bc/gov/app/configuration/ProcessorIntegrationConfiguration.java

@@ -92,6 +92,32 @@ public FluxMessageChannel submissionLegacyNotifyChannel() {
     return new FluxMessageChannel();
   }
 
+  @Bean
+  public FluxMessageChannel submissionLegacyClientPersistChannel() {
+    return new FluxMessageChannel();
+  }
+
+  @Bean
+  public FluxMessageChannel submissionLegacyIndividualChannel() {
+    return new FluxMessageChannel();
+  }
+
+  @Bean
+  public FluxMessageChannel submissionLegacyUSPChannel() {
+    return new FluxMessageChannel();
+  }
+
+  @Bean
+  public FluxMessageChannel submissionLegacyRSPChannel() {
+    return new FluxMessageChannel();
+  }
+
+  @Bean
+  public FluxMessageChannel submissionLegacyOtherChannel() {
+    return new FluxMessageChannel();
+  }
+
+
 
   @Bean
   public R2dbcMessageSource submissionMessages(

processor/src/main/java/ca/bc/gov/app/dto/SubmissionInformationDto.java

@@ -1,11 +1,14 @@
 package ca.bc.gov.app.dto;
 
+import java.time.LocalDate;
 import lombok.With;
 
 @With
 public record SubmissionInformationDto(
-    String legalName,
+    String corporationName,
+    LocalDate dateOfBirth,
     String incorporationNumber,
-    String goodStanding
+    String goodStanding,
+    String clientType
 ) {
 }

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryDocumentAccessRequestDto.java

@@ -0,0 +1,12 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+import lombok.With;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryDocumentAccessRequestDto(
+    List<BcRegistryDocumentAccessTypeDto> documents
+) {
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryDocumentAccessTypeDto.java

@@ -0,0 +1,13 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.With;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryDocumentAccessTypeDto(
+    @JsonProperty("type")
+    String documentType
+) {
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryDocumentDto.java

@@ -0,0 +1,23 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+import lombok.With;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryDocumentDto(
+    List<BcRegistryPartyDto> parties
+) {
+
+  public BcRegistryPartyDto getProprietor() {
+    if (parties == null) {
+      return null;
+    }
+    return parties
+        .stream()
+        .filter(BcRegistryPartyDto::isProprietor)
+        .findFirst()
+        .orElse(null);
+  }
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryDocumentRequestBodyDto.java

@@ -0,0 +1,11 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.With;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryDocumentRequestBodyDto(
+    BcRegistryDocumentAccessRequestDto documentAccessRequest
+) {
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryDocumentRequestDocumentDto.java

@@ -0,0 +1,14 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.With;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryDocumentRequestDocumentDto(
+    String documentKey,
+    String documentType,
+    String fileName,
+    Long id
+) {
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryDocumentRequestResponseDto.java

@@ -0,0 +1,16 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+import lombok.With;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryDocumentRequestResponseDto(
+    String businessIdentifier,
+    String businessName,
+    List<BcRegistryDocumentRequestDocumentDto> documents,
+    String paymentStatus,
+    String status
+) {
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryExceptionMessageDto.java

@@ -0,0 +1,12 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.With;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryExceptionMessageDto(
+    String errorMessage,
+    String rootCause
+) {
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryOfficerDto.java

@@ -0,0 +1,13 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryOfficerDto(
+    String email,
+    String firstName,
+    String lastName,
+    String middleInitial,
+    String partyType
+) {
+}

processor/src/main/java/ca/bc/gov/app/dto/bcregistry/BcRegistryPartyDto.java

@@ -0,0 +1,24 @@
+package ca.bc.gov.app.dto.bcregistry;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+import lombok.With;
+import org.apache.commons.lang3.StringUtils;
+
+@With
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record BcRegistryPartyDto(
+    BcRegistryOfficerDto officer,
+    List<BcRegistryRoleDto> roles
+) {
+
+  public boolean isProprietor() {
+    if (roles == null) {
+      return false;
+    }
+    return roles
+        .stream()
+        .filter(BcRegistryRoleDto::active)
+        .anyMatch(role -> StringUtils.equalsIgnoreCase(role.roleType(), "Proprietor"));
+  }
+}