FSADT1-722

backend/src/main/java/ca/bc/gov/app/dto/client/ClientLookUpDto.java

@@ -11,7 +11,7 @@
  "code": "00000002",
  "name": "BAXTER",
  "status": "ACTIVE",
- "clientType": "SP"
+ "legalType": "SP"
  }"""
 )
 public record ClientLookUpDto(
@@ -22,7 +22,7 @@ public record ClientLookUpDto(
  @Schema(description = "The status of the client, could be ACTIVE or INACTIVE",
  example = "ACTIVE")
  String status,
- @Schema(description = "The type of the client", example = "SP")
- String clientType
+ @Schema(description = "The legal type of the client", example = "SP")
+ String legalType
 ) {
 }

backend/src/main/resources/db/migration/V1__initializing_data.sql

@@ -198,9 +198,6 @@ insert into nrfc.client_type_code (client_type_code, description, effective_date
 insert into nrfc.client_type_code (client_type_code, description, effective_date, create_user) values ('S', 'Society', current_timestamp, 'mariamar') on conflict (client_type_code) do nothing;
 insert into nrfc.client_type_code (client_type_code, description, effective_date, create_user) values ('T', 'First Nation Tribal Council', current_timestamp, 'mariamar') on conflict (client_type_code) do nothing;
 insert into nrfc.client_type_code (client_type_code, description, effective_date, create_user) values ('U', 'Unregistered Company', current_timestamp, 'mariamar') on conflict (client_type_code) do nothing;
-insert into nrfc.client_type_code (client_type_code, description, effective_date, create_user) values ('Z', 'Sole Proprietorship', current_timestamp, 'mariamar') on conflict (client_type_code) do nothing;
-
-update nrfc.client_type_code set expiry_date = current_timestamp where client_type_code not in ('C', 'Z');
 
 insert into nrfc.contact_type_code (contact_type_code, description, effective_date, create_user) values ('AP', 'Accounts Payable', current_timestamp, 'mariamar') on conflict (contact_type_code) do nothing;
 insert into nrfc.contact_type_code (contact_type_code, description, effective_date, create_user) values ('AR', 'Accounts Receivable', current_timestamp, 'mariamar') on conflict (contact_type_code) do nothing;

backend/src/test/java/ca/bc/gov/app/TestConstants.java

@@ -55,7 +55,7 @@ public class TestConstants {
  "code": "BC0772006",
  "name": "U3 POWER CORP.",
  "status": "ACTIVE",
- "clientType": "SP"
+ "legalType": "SP"
  }
  ]""";
 
@@ -151,7 +151,7 @@ public class TestConstants {
  "code": "BC0772006",
  "name": "U3 POWER CORP.",
  "status": "ACTIVE",
- "clientType": "SP"
+ "legalType": "SP"
  }""";
 
  public static final String OPENMAPS_OK = """

backend/src/test/java/ca/bc/gov/app/endpoints/client/ClientControllerIntegrationTest.java

@@ -68,10 +68,10 @@ void shouldListCodesAsExpected() {
  .expectStatus().isOk()
  .expectBody()
  .jsonPath("$[0].code").isNotEmpty()
- .jsonPath("$[0].code").isEqualTo("C")
+ .jsonPath("$[0].code").isEqualTo("A")
 
  .jsonPath("$[1].code").isNotEmpty()
- .jsonPath("$[1].code").isEqualTo("Z");
+ .jsonPath("$[1].code").isEqualTo("C");
 
  }
 

backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java

@@ -25,8 +25,8 @@ class ClientServiceIntegrationTest extends AbstractTestContainerIntegrationTest
  void shouldListCodeAsExpected(LocalDate date) {
  StepVerifier
  .create(service.findActiveClientTypeCodes(date))
- .assertNext(results -> assertEquals("C", results.code()))
- .expectNextCount(1)
+ .assertNext(results -> assertEquals("A", results.code()))
+ .expectNextCount(11)
  .verifyComplete();
  }
 

frontend/components.d.ts

@@ -15,13 +15,13 @@ declare module '@vue/runtime-core' {
  BCardHeader: typeof import('bootstrap-vue-3')['BCardHeader']
  BCol: typeof import('bootstrap-vue-3')['BCol']
  BCollapse: typeof import('bootstrap-vue-3')['BCollapse']
+ BFormGroup: typeof import('bootstrap-vue-3')['BFormGroup']
  BFormInput: typeof import('bootstrap-vue-3')['BFormInput']
+ BFormRadio: typeof import('bootstrap-vue-3')['BFormRadio']
  BFormSelect: typeof import('bootstrap-vue-3')['BFormSelect']
  BPopover: typeof import('bootstrap-vue-3')['BPopover']
  BRow: typeof import('bootstrap-vue-3')['BRow']
  BTab: typeof import('bootstrap-vue-3')['BTab']
  BTabs: typeof import('bootstrap-vue-3')['BTabs']
- RouterLink: typeof import('vue-router')['RouterLink']
- RouterView: typeof import('vue-router')['RouterView']
  }
 }

frontend/src/App.vue

@@ -8,8 +8,11 @@
  :title="tab.title"
  :key="index"
  :active="index == 0"
- ><component :is="tab.content"
- /></b-tab>
+ >
+ <component :is="tab.content" 
+ :businessName="bceidBusinessName" 
+ :userId="userId"/>
+ </b-tab>
  </b-tabs>
  </div>
  </div>
@@ -26,6 +29,8 @@ import { navBlue, navSelectBlue } from "./utils/color";
 
 const keycloak: KeycloakInstance | undefined = inject("keycloak");
 let tabs: Ref<Array<{ title: string; content: DefineComponent }>> = ref([]);
+let bceidBusinessName = ref();
+let userId = ref();
 
 if (keycloak && 
  keycloak.tokenParsed && 
@@ -34,6 +39,8 @@ if (keycloak &&
 } 
 else {
  tabs.value = [{ title: "Apply a New Client", content: ApplyClientNumber }];
+ bceidBusinessName = keycloak && keycloak.tokenParsed ? keycloak.tokenParsed.displayed : "Dev Test Client Name";
+ userId = keycloak && keycloak.tokenParsed ? keycloak.subject : "devtest@gov.bc.ca";
 }
 </script>
 

frontend/src/common/LabelComponent.vue

@@ -3,14 +3,21 @@
  <label>{{ label }}</label>
  <!-- <bi-asterisk v-if="required" 
  style="font-size: 8px; color: red; margin-top: 2px; margin-right: 6px" /> -->
- <bi-question-circle-fill :id="'form-field-label-' + id" 
- v-if="tooltip" 
- style="font-size: 12px; color: #6c757d" />
- <b-popover :target="'form-field-label-' + id" 
- triggers="hover" 
- placement="top" 
- :content="tooltip">
- </b-popover>
+ <div v-if="tooltip">
+ &nbsp;
+<!-- <bi-question-circle-fill :id="'popover' + id"
+ style="font-size: 12px; 
+ color: #6c757d;
+ vertical-align: top;" /> -->
+ <bi-question-circle-fill :id="'popover' + id"
+ style="font-size: 12px; 
+ color: #6c757d;
+ vertical-align: top;" />
+ <b-popover :target="'popover' + id" 
+ placement="right">
+ <span v-html="tooltip" />
+ </b-popover>
+ </div>
  </div>
 </template>
 

frontend/src/dto/ApplyClientNumberDto.ts

@@ -1,10 +1,11 @@
 import type { CodeDescrType } from "@/core/CommonTypes";
 
 export interface FormDataDto {
- businessType: {
- clientType: CodeDescrType;
- };
+ userId: string,
  businessInformation: {
+ businessType: string,
+ legalType: string,
+ clientType: string;
  incorporationNumber: string;
  businessName: null | string;
  goodStanding: string;
@@ -42,10 +43,11 @@ export interface Contact {
 }
 
 export const formDataDto: FormDataDto = {
- businessType: {
- clientType: { value: "", text: "" },
- },
+ userId: "",
  businessInformation: {
+ businessType: "",
+ legalType: "",
+ clientType: "",
  incorporationNumber: "",
  businessName: "",
  goodStanding: "",