diff --git a/.gitignore b/.gitignore index bbb6cc1..ccfc27e 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,5 @@ test-results/ # Snyk .dccache + +caab-service/src/main/resources/application-secret.yml diff --git a/caab-service/build.gradle b/caab-service/build.gradle index 0855ede..90a1be0 100644 --- a/caab-service/build.gradle +++ b/caab-service/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation platform('org.testcontainers:testcontainers-bom:1.19.3') testImplementation 'org.testcontainers:testcontainers' testImplementation 'org.testcontainers:junit-jupiter' - testImplementation 'org.testcontainers:oracle-xe' + testImplementation 'org.testcontainers:oracle-free' } test { diff --git a/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/IntegrationTestInterface.java b/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/IntegrationTestInterface.java index dae9a1b..1860771 100644 --- a/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/IntegrationTestInterface.java +++ b/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/IntegrationTestInterface.java @@ -5,6 +5,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; +import org.testcontainers.oracle.OracleContainer; import org.testcontainers.junit.jupiter.Testcontainers; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @@ -16,9 +17,10 @@ public interface IntegrationTestInterface { @DynamicPropertySource static void properties(DynamicPropertyRegistry registry) { - registry.add("spring.datasource.url", oracleContainerSingleton.getOracleContainer()::getJdbcUrl); - registry.add("spring.datasource.username", oracleContainerSingleton.getOracleContainer()::getUsername); - registry.add("spring.datasource.password", oracleContainerSingleton.getOracleContainer()::getPassword); + OracleContainer oracleContainer = oracleContainerSingleton.getOracleContainer(); + registry.add("spring.datasource.url", oracleContainer::getJdbcUrl); + registry.add("spring.datasource.username", oracleContainer::getUsername); + registry.add("spring.datasource.password", oracleContainer::getPassword); } } diff --git a/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/OracleContainerSingleton.java b/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/OracleContainerSingleton.java index d63bdbe..9c26325 100644 --- a/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/OracleContainerSingleton.java +++ b/caab-service/src/integrationTest/java/uk/gov/laa/ccms/data/api/OracleContainerSingleton.java @@ -1,6 +1,6 @@ package uk.gov.laa.ccms.data.api; -import org.testcontainers.containers.OracleContainer; +import org.testcontainers.oracle.OracleContainer; public class OracleContainerSingleton { @@ -8,7 +8,8 @@ public class OracleContainerSingleton { private final OracleContainer oracleContainer; private OracleContainerSingleton() { - oracleContainer = new OracleContainer("gvenzl/oracle-xe:21-slim-faststart"); + oracleContainer = new OracleContainer("gvenzl/oracle-free:23-slim-faststart") + .withUsername("XXCCMS_PUI"); oracleContainer.start(); } diff --git a/caab-service/src/integrationTest/resources/sql/application_insert.sql b/caab-service/src/integrationTest/resources/sql/application_insert.sql index a5665c8..60f93ec 100644 --- a/caab-service/src/integrationTest/resources/sql/application_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/application_insert.sql @@ -1,30 +1,30 @@ -INSERT INTO XXCCMS_ADDRESS +INSERT INTO XXCCMS_PUI.XXCCMS_ADDRESS (ID, NO_FIXED_ABODE, POSTCODE, HOUSE_NAME_NUMBER, ADDRESS_LINE1, ADDRESS_LINE2, CITY, COUNTY, COUNTRY, CARE_OF, PREFERRED_ADDRESS, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(42, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, TIMESTAMP '2023-10-04 10:23:17.672000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-04 10:23:17.672000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_ADDRESS +INSERT INTO XXCCMS_PUI.XXCCMS_ADDRESS (ID, NO_FIXED_ABODE, POSTCODE, HOUSE_NAME_NUMBER, ADDRESS_LINE1, ADDRESS_LINE2, CITY, COUNTY, COUNTRY, CARE_OF, PREFERRED_ADDRESS, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(22, 0, 'string', 'string', 'string', 'string', 'string', 'string', 'GBR', 'string', 'string', TIMESTAMP '2023-10-03 08:27:05.266000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-03 08:27:05.266000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_ADDRESS +INSERT INTO XXCCMS_PUI.XXCCMS_ADDRESS (ID, NO_FIXED_ABODE, POSTCODE, HOUSE_NAME_NUMBER, ADDRESS_LINE1, ADDRESS_LINE2, CITY, COUNTY, COUNTRY, CARE_OF, PREFERRED_ADDRESS, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(25, 0, 'string', 'string', 'string', 'string', 'string', 'string', 'GBR', 'string', 'string', TIMESTAMP '2023-10-03 08:49:50.262000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-03 08:49:50.262000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_COST_STRUCTURE +INSERT INTO XXCCMS_PUI.XXCCMS_COST_STRUCTURE (ID, DEFAULT_COST_LIMITATION, GRANTED_COST_LIMITATION, REQUESTED_COST_LIMITATION, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(43, 0, 0, 0, TIMESTAMP '2023-10-04 10:23:17.927000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-04 10:23:17.927000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_COST_STRUCTURE +INSERT INTO XXCCMS_PUI.XXCCMS_COST_STRUCTURE (ID, DEFAULT_COST_LIMITATION, GRANTED_COST_LIMITATION, REQUESTED_COST_LIMITATION, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(23, 0, 0, 0, TIMESTAMP '2023-10-03 08:27:05.592000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-03 08:27:05.592000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_COST_STRUCTURE +INSERT INTO XXCCMS_PUI.XXCCMS_COST_STRUCTURE (ID, DEFAULT_COST_LIMITATION, GRANTED_COST_LIMITATION, REQUESTED_COST_LIMITATION, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(26, 0, 0, 0, TIMESTAMP '2023-10-03 08:49:50.389000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-03 08:49:50.389000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_APPLICATION +INSERT INTO XXCCMS_PUI.XXCCMS_APPLICATION (ID, LSC_CASE_REFERENCE, PROVIDER_ID, PROVIDER_CASE_REFERENCE, PROVIDER_DISPLAY_VALUE, OFFICE_ID, OFFICE_DISPLAY_VALUE, SUPERVISOR, SUPERVISOR_DISPLAY_VALUE, FEE_EARNER, FEE_EARNER_DISPLAY_VALUE, PROVIDER_CONTACT, PROVIDER_CONTACT_DISPLAY_VALUE, CATEGORY_OF_LAW, CATEGORY_OF_LAW_DISPLAY_VALUE, RELATION_TO_LINKED_CASE, OPPONENT_APPLIED_FOR_FUNDING, DISPLAY_STATUS, ACTUAL_STATUS, CLIENT_FIRSTNAME, CLIENT_SURNAME, CLIENT_REFERENCE, AMENDMENT, MEANS_ASSESSMENT_AMENDED, MERITS_ASSESSMENT_AMENDED, COST_LIMIT_CHANGED, COST_LIMIT_AT_TIME_OF_MERITS, SUBMISSION_STATUS, POLL_TRANSACTION_ID, APPLICATION_TYPE, APPLICATION_TYPE_DISPLAY_VALUE, DEVOLVED_POWERS_USED, DATE_DEVOLVED_POWERS_USED, DEVOLVED_POWERS_CONTRACT_FLAG, MERITS_REASSESSMENT_REQD_IND, LAR_SCOPE_FLAG, LEAD_PROCEEDING_CHANGED, FK_COST_STRUCTURE, FK_CORRESPONDENCE_ADDRESS, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(41, '300001644533', '26517', NULL, 'SWITALSKI''S SOLICITORS LTD', 85391, 'SWITALSKI''S SOLICITORS LTD-0P322F', NULL, NULL, NULL, NULL, NULL, NULL, 'AAP', 'Claim Against Public Authority', NULL, NULL, 'Unsubmitted', 'UNSUBMITTED', 'PTEST', 'PP', '62595640', 0, 0, 0, 0, NULL, NULL, NULL, 'ECF', 'Exceptional Case Funding', 'N', NULL, 'Yes - Excluding JR Proceedings', 0, 'Y', 0, 43, 42, TIMESTAMP '2023-10-04 10:23:17.995000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-04 10:23:17.995000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_APPLICATION +INSERT INTO XXCCMS_PUI.XXCCMS_APPLICATION (ID, LSC_CASE_REFERENCE, PROVIDER_ID, PROVIDER_CASE_REFERENCE, PROVIDER_DISPLAY_VALUE, OFFICE_ID, OFFICE_DISPLAY_VALUE, SUPERVISOR, SUPERVISOR_DISPLAY_VALUE, FEE_EARNER, FEE_EARNER_DISPLAY_VALUE, PROVIDER_CONTACT, PROVIDER_CONTACT_DISPLAY_VALUE, CATEGORY_OF_LAW, CATEGORY_OF_LAW_DISPLAY_VALUE, RELATION_TO_LINKED_CASE, OPPONENT_APPLIED_FOR_FUNDING, DISPLAY_STATUS, ACTUAL_STATUS, CLIENT_FIRSTNAME, CLIENT_SURNAME, CLIENT_REFERENCE, AMENDMENT, MEANS_ASSESSMENT_AMENDED, MERITS_ASSESSMENT_AMENDED, COST_LIMIT_CHANGED, COST_LIMIT_AT_TIME_OF_MERITS, SUBMISSION_STATUS, POLL_TRANSACTION_ID, APPLICATION_TYPE, APPLICATION_TYPE_DISPLAY_VALUE, DEVOLVED_POWERS_USED, DATE_DEVOLVED_POWERS_USED, DEVOLVED_POWERS_CONTRACT_FLAG, MERITS_REASSESSMENT_REQD_IND, LAR_SCOPE_FLAG, LEAD_PROCEEDING_CHANGED, FK_COST_STRUCTURE, FK_CORRESPONDENCE_ADDRESS, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(21, '300001644516', '26517', '329635', 'SWITALSKI''S SOLICITORS LTD', 145512, 'SWITALSKI''S SOLICITORS LTD-2L847Q', '2854148', 'David Greenwood', '2027148', 'Carole Spencer', '2027079', 'CAROLE.SPENCER@SWITALSKIS.COM', 'AAP', 'Claim Against Public Authority', NULL, NULL, 'Unsubmitted', 'UNSUBMITTED', 'Phil', 'Payne', 'PhilTest', 0, 0, 0, 0, 1350, NULL, NULL, 'SUB', 'Substantive', 'N', NULL, 'Yes - Excluding JR Proceedings', 0, 'Y', 0, 23, 22, TIMESTAMP '2023-10-03 08:27:05.652000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-03 08:27:05.652000', 'PENNY.WALL@SWITALSKIS.COM'); -INSERT INTO XXCCMS_APPLICATION +INSERT INTO XXCCMS_PUI.XXCCMS_APPLICATION (ID, LSC_CASE_REFERENCE, PROVIDER_ID, PROVIDER_CASE_REFERENCE, PROVIDER_DISPLAY_VALUE, OFFICE_ID, OFFICE_DISPLAY_VALUE, SUPERVISOR, SUPERVISOR_DISPLAY_VALUE, FEE_EARNER, FEE_EARNER_DISPLAY_VALUE, PROVIDER_CONTACT, PROVIDER_CONTACT_DISPLAY_VALUE, CATEGORY_OF_LAW, CATEGORY_OF_LAW_DISPLAY_VALUE, RELATION_TO_LINKED_CASE, OPPONENT_APPLIED_FOR_FUNDING, DISPLAY_STATUS, ACTUAL_STATUS, CLIENT_FIRSTNAME, CLIENT_SURNAME, CLIENT_REFERENCE, AMENDMENT, MEANS_ASSESSMENT_AMENDED, MERITS_ASSESSMENT_AMENDED, COST_LIMIT_CHANGED, COST_LIMIT_AT_TIME_OF_MERITS, SUBMISSION_STATUS, POLL_TRANSACTION_ID, APPLICATION_TYPE, APPLICATION_TYPE_DISPLAY_VALUE, DEVOLVED_POWERS_USED, DATE_DEVOLVED_POWERS_USED, DEVOLVED_POWERS_CONTRACT_FLAG, MERITS_REASSESSMENT_REQD_IND, LAR_SCOPE_FLAG, LEAD_PROCEEDING_CHANGED, FK_COST_STRUCTURE, FK_CORRESPONDENCE_ADDRESS, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(24, '300001644517', '26517', '329635', 'SWITALSKI''S SOLICITORS LTD', 145512, 'SWITALSKI''S SOLICITORS LTD-2L847Q', '2854148', 'David Greenwood', '2027148', 'Carole Spencer', '2027079', 'CAROLE.SPENCER@SWITALSKIS.COM', 'AAP', 'Claim Against Public Authority', NULL, NULL, 'Unsubmitted', 'UNSUBMITTED', 'Phil', 'Payne', 'PhilTest', 0, 0, 0, 0, 1350, NULL, NULL, 'ECF', 'Exceptional Case Funding', 'N', NULL, 'Yes - Excluding JR Proceedings', 0, 'Y', 0, 26, 25, TIMESTAMP '2023-10-03 08:49:50.403000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-10-03 08:49:50.410000', 'PENNY.WALL@SWITALSKIS.COM'); diff --git a/caab-service/src/integrationTest/resources/sql/application_tables_create_schema.sql b/caab-service/src/integrationTest/resources/sql/application_tables_create_schema.sql index 48ffca8..a94141a 100644 --- a/caab-service/src/integrationTest/resources/sql/application_tables_create_schema.sql +++ b/caab-service/src/integrationTest/resources/sql/application_tables_create_schema.sql @@ -1,4 +1,4 @@ -create table XXCCMS_ADDRESS ( +CREATE table XXCCMS_PUI.XXCCMS_ADDRESS ( ID number(19,0) not null, NO_FIXED_ABODE number(1,0), POSTCODE varchar2(15 char), @@ -17,7 +17,7 @@ create table XXCCMS_ADDRESS ( primary key (ID) ); -create table XXCCMS_APPLICATION ( +CREATE table XXCCMS_PUI.XXCCMS_APPLICATION ( ID number(19,0) not null, LSC_CASE_REFERENCE varchar2(35 char) not null, PROVIDER_ID varchar2(19 char) not null, @@ -65,7 +65,7 @@ create table XXCCMS_APPLICATION ( unique (LSC_CASE_REFERENCE, PROVIDER_ID) ); -create table XXCCMS_BILL ( +CREATE table XXCCMS_PUI.XXCCMS_BILL ( ID number(19,0) not null, CASE_REFERENCE_NUMBER varchar2(50 char) not null, PROVIDER_ID varchar2(19 char) not null, @@ -88,7 +88,7 @@ create table XXCCMS_BILL ( unique (CASE_REFERENCE_NUMBER, PROVIDER_ID) ); -create table XXCCMS_CASE_OUTCOME ( +CREATE table XXCCMS_PUI.XXCCMS_CASE_OUTCOME ( ID number(19,0) not null, LSC_CASE_REFERENCE varchar2(50 char) not null, PROVIDER_ID varchar2(19 char) not null, @@ -110,7 +110,7 @@ create table XXCCMS_CASE_OUTCOME ( unique (LSC_CASE_REFERENCE, PROVIDER_ID) ); -create table XXCCMS_COST_AWARD ( +CREATE table XXCCMS_PUI.XXCCMS_COST_AWARD ( ID number(19,0) not null, AWARD_TYPE varchar2(50 char), DESCRIPTION varchar2(50 char), @@ -142,7 +142,7 @@ create table XXCCMS_COST_AWARD ( primary key (ID) ); -create table XXCCMS_COST_ENTRY ( +CREATE table XXCCMS_PUI.XXCCMS_COST_ENTRY ( ID number(19,0) not null, EBS_ID varchar2(15 char), RESOURCE_NAME varchar2(300 char), @@ -158,7 +158,7 @@ create table XXCCMS_COST_ENTRY ( primary key (ID) ); -create table XXCCMS_COST_STRUCTURE ( +CREATE table XXCCMS_PUI.XXCCMS_COST_STRUCTURE ( ID number(19,0) not null, DEFAULT_COST_LIMITATION number(10,2), GRANTED_COST_LIMITATION number(10,2), @@ -170,7 +170,7 @@ create table XXCCMS_COST_STRUCTURE ( primary key (ID) ); -create table XXCCMS_FINANCIAL_AWARD ( +CREATE table XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD ( ID number(19,0) not null, AWARD_TYPE varchar2(50 char), DESCRIPTION varchar2(50 char), @@ -198,7 +198,7 @@ create table XXCCMS_FINANCIAL_AWARD ( primary key (ID) ); -create table XXCCMS_LAND_AWARD ( +CREATE table XXCCMS_PUI.XXCCMS_LAND_AWARD ( ID number(19,0) not null, AWARD_TYPE varchar2(50 char), DESCRIPTION varchar2(50 char), @@ -235,7 +235,7 @@ create table XXCCMS_LAND_AWARD ( primary key (ID) ); -create table XXCCMS_LIABLE_PARTY ( +CREATE table XXCCMS_PUI.XXCCMS_LIABLE_PARTY ( ID number(19,0) not null, AWARD_TYPE varchar2(50 char), FK_OPPONENT number(19,0) not null, @@ -250,7 +250,7 @@ create table XXCCMS_LIABLE_PARTY ( primary key (ID) ); -create table XXCCMS_LINKED_CASE ( +CREATE table XXCCMS_PUI.XXCCMS_LINKED_CASE ( ID number(19,0) not null, LSC_CASE_REFERENCE varchar2(35 char), PROVIDER_CASE_REFERENCE varchar2(35 char), @@ -269,7 +269,7 @@ create table XXCCMS_LINKED_CASE ( primary key (ID) ); -create table XXCCMS_NOTIFICATION_ATTACHMENT ( +CREATE table XXCCMS_PUI.XXCCMS_NOTIFICATION_ATTACHMENT ( ID number(19,0) not null, NOTIFICATION_REFERENCE varchar2(50 char) not null, PROVIDER_ID varchar2(19 char) not null, @@ -288,7 +288,7 @@ create table XXCCMS_NOTIFICATION_ATTACHMENT ( primary key (ID) ); -create table XXCCMS_OPPONENT ( +CREATE table XXCCMS_PUI.XXCCMS_OPPONENT ( ID number(19,0) not null, EBS_ID varchar2(50 char), TYPE varchar2(50 char), @@ -337,7 +337,7 @@ create table XXCCMS_OPPONENT ( primary key (ID) ); -create table XXCCMS_OTHER_ASSET_AWARD ( +CREATE table XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD ( ID number(19,0) not null, AWARD_TYPE varchar2(50 char), DESCRIPTION varchar2(50 char), @@ -370,7 +370,7 @@ create table XXCCMS_OTHER_ASSET_AWARD ( primary key (ID) ); -create table XXCCMS_PAYMENT_ON_ACCOUNT ( +CREATE table XXCCMS_PUI.XXCCMS_PAYMENT_ON_ACCOUNT ( ID number(19,0) not null, LSC_CASE_REFERENCE varchar2(50 char) not null, PROVIDER_ID varchar2(19 char) not null, @@ -391,7 +391,7 @@ create table XXCCMS_PAYMENT_ON_ACCOUNT ( unique (LSC_CASE_REFERENCE, PROVIDER_ID) ); -create table XXCCMS_PRIOR_AUTHORITY ( +CREATE table XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY ( ID number(19,0) not null, EBS_ID varchar2(50 char), TYPE varchar2(50 char), @@ -409,7 +409,7 @@ create table XXCCMS_PRIOR_AUTHORITY ( primary key (ID) ); -create table XXCCMS_PROCEEDING ( +CREATE table XXCCMS_PUI.XXCCMS_PROCEEDING ( ID number(19,0) not null, EBS_ID varchar2(50 char), MATTER_TYPE varchar2(50 char), @@ -440,7 +440,7 @@ create table XXCCMS_PROCEEDING ( primary key (ID) ); -create table XXCCMS_PROCEEDING_OUTCOME ( +CREATE table XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME ( ID number(19,0) not null, DATE_OF_ISSUE date, DESCRIPTION varchar2(542 char), @@ -466,7 +466,7 @@ create table XXCCMS_PROCEEDING_OUTCOME ( primary key (ID) ); -create table XXCCMS_RECOVERY ( +CREATE table XXCCMS_PUI.XXCCMS_RECOVERY ( ID number(19,0) not null, AWARD_TYPE varchar2(50 char), DESCRIPTION varchar2(50 char), @@ -492,7 +492,7 @@ create table XXCCMS_RECOVERY ( primary key (ID) ); -create table XXCCMS_REFERENCE_DATA_ITEM ( +CREATE table XXCCMS_PUI.XXCCMS_REFERENCE_DATA_ITEM ( ID number(19,0) not null, CODE varchar2(50 char), LABEL varchar2(150 char), @@ -505,7 +505,7 @@ create table XXCCMS_REFERENCE_DATA_ITEM ( primary key (ID) ); -create table XXCCMS_SCOPE_LIMITATION ( +CREATE table XXCCMS_PUI.XXCCMS_SCOPE_LIMITATION ( ID number(19,0) not null, EBS_ID varchar2(50 char), SCOPE_LIMITATION varchar2(50 char), @@ -521,7 +521,7 @@ create table XXCCMS_SCOPE_LIMITATION ( primary key (ID) ); -create table XXCCMS_TIME_RECOVERY ( +CREATE table XXCCMS_PUI.XXCCMS_TIME_RECOVERY ( ID number(19,0) not null, AWARD_TYPE varchar2(50 char), DESCRIPTION varchar2(50 char), @@ -536,7 +536,7 @@ create table XXCCMS_TIME_RECOVERY ( primary key (ID) ); -create table XXCCMS_UNDERTAKING ( +CREATE table XXCCMS_PUI.XXCCMS_UNDERTAKING ( ID number(19,0) not null, LSC_CASE_REFERENCE varchar2(50 char) not null, PROVIDER_ID varchar2(19 char) not null, @@ -552,184 +552,184 @@ create table XXCCMS_UNDERTAKING ( unique (LSC_CASE_REFERENCE, PROVIDER_ID) ); -create index XXCCMS_APPLICATION_I3 on XXCCMS_APPLICATION (FK_CORRESPONDENCE_ADDRESS); +CREATE index XXCCMS_PUI.XXCCMS_APPLICATION_I3 on XXCCMS_PUI.XXCCMS_APPLICATION (FK_CORRESPONDENCE_ADDRESS); -create index XXCCMS_APPLICATION_I2 on XXCCMS_APPLICATION (FK_COST_STRUCTURE); +CREATE index XXCCMS_PUI.XXCCMS_APPLICATION_I2 on XXCCMS_PUI.XXCCMS_APPLICATION (FK_COST_STRUCTURE); -alter table XXCCMS_APPLICATION +alter table XXCCMS_PUI.XXCCMS_APPLICATION add constraint XXCCMS_APPLICATION_F1 foreign key (FK_COST_STRUCTURE) - references XXCCMS_COST_STRUCTURE; + references XXCCMS_PUI.XXCCMS_COST_STRUCTURE; -alter table XXCCMS_APPLICATION +alter table XXCCMS_PUI.XXCCMS_APPLICATION add constraint XXCCMS_APPLICATION_F2 foreign key (FK_CORRESPONDENCE_ADDRESS) - references XXCCMS_ADDRESS; + references XXCCMS_PUI.XXCCMS_ADDRESS; -create index XXCCMS_COST_AWARD_I2 on XXCCMS_COST_AWARD (FK_COST_RECOVERY); +CREATE index XXCCMS_PUI.XXCCMS_COST_AWARD_I2 on XXCCMS_PUI.XXCCMS_COST_AWARD (FK_COST_RECOVERY); -create index XXCCMS_COST_AWARD_I1 on XXCCMS_COST_AWARD (FK_COST_CASE_OUTCOME); +CREATE index XXCCMS_PUI.XXCCMS_COST_AWARD_I1 on XXCCMS_PUI.XXCCMS_COST_AWARD (FK_COST_CASE_OUTCOME); -alter table XXCCMS_COST_AWARD +alter table XXCCMS_PUI.XXCCMS_COST_AWARD add constraint FKC29DD024FD68D189 foreign key (FK_COST_CASE_OUTCOME) - references XXCCMS_CASE_OUTCOME; + references XXCCMS_PUI.XXCCMS_CASE_OUTCOME; -alter table XXCCMS_COST_AWARD +alter table XXCCMS_PUI.XXCCMS_COST_AWARD add constraint FKC29DD0241FC208D6 foreign key (FK_COST_RECOVERY) - references XXCCMS_RECOVERY; + references XXCCMS_PUI.XXCCMS_RECOVERY; -create index XXCCMS_COST_ENTRY_I1 on XXCCMS_COST_ENTRY (FK_COST_STRUCTURE); +CREATE index XXCCMS_PUI.XXCCMS_COST_ENTRY_I1 on XXCCMS_PUI.XXCCMS_COST_ENTRY (FK_COST_STRUCTURE); -alter table XXCCMS_COST_ENTRY +alter table XXCCMS_PUI.XXCCMS_COST_ENTRY add constraint XXCCMS_COST_ENTRY_F1 foreign key (FK_COST_STRUCTURE) - references XXCCMS_COST_STRUCTURE; + references XXCCMS_PUI.XXCCMS_COST_STRUCTURE; -create index XXCCMS_FINANCIAL_AWARD_I2 on XXCCMS_FINANCIAL_AWARD (FK_COST_RECOVERY); +CREATE index XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD_I2 on XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD (FK_COST_RECOVERY); -create index XXCCMS_FINANCIAL_AWARD_I1 on XXCCMS_FINANCIAL_AWARD (FK_FINANCIAL_CASE_OUTCOME); +CREATE index XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD_I1 on XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD (FK_FINANCIAL_CASE_OUTCOME); -alter table XXCCMS_FINANCIAL_AWARD +alter table XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD add constraint FKEAA2ADAE58E74C01 foreign key (FK_FINANCIAL_CASE_OUTCOME) - references XXCCMS_CASE_OUTCOME; + references XXCCMS_PUI.XXCCMS_CASE_OUTCOME; -alter table XXCCMS_FINANCIAL_AWARD +alter table XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD add constraint FKEAA2ADAE1FC208D6 foreign key (FK_COST_RECOVERY) - references XXCCMS_RECOVERY; + references XXCCMS_PUI.XXCCMS_RECOVERY; -create index XXCCMS_LAND_AWARD_I1 on XXCCMS_LAND_AWARD (FK_LAND_CASE_OUTCOME); +CREATE index XXCCMS_PUI.XXCCMS_LAND_AWARD_I1 on XXCCMS_PUI.XXCCMS_LAND_AWARD (FK_LAND_CASE_OUTCOME); -create index XXCCMS_LAND_AWARD_I2 on XXCCMS_LAND_AWARD (FK_LAND_RECOVERY); +CREATE index XXCCMS_PUI.XXCCMS_LAND_AWARD_I2 on XXCCMS_PUI.XXCCMS_LAND_AWARD (FK_LAND_RECOVERY); -alter table XXCCMS_LAND_AWARD +alter table XXCCMS_PUI.XXCCMS_LAND_AWARD add constraint FKE7AB23C27C966865 foreign key (FK_LAND_RECOVERY) - references XXCCMS_TIME_RECOVERY; + references XXCCMS_PUI.XXCCMS_TIME_RECOVERY; -alter table XXCCMS_LAND_AWARD +alter table XXCCMS_PUI.XXCCMS_LAND_AWARD add constraint FKE7AB23C29E41D02B foreign key (FK_LAND_CASE_OUTCOME) - references XXCCMS_CASE_OUTCOME; + references XXCCMS_PUI.XXCCMS_CASE_OUTCOME; -create index XXCCMS_LIABLE_PARTY_I5 on XXCCMS_LIABLE_PARTY (FK_OTHER_ASSET_AWARD); +CREATE index XXCCMS_PUI.XXCCMS_LIABLE_PARTY_I5 on XXCCMS_PUI.XXCCMS_LIABLE_PARTY (FK_OTHER_ASSET_AWARD); -create index XXCCMS_LIABLE_PARTY_I3 on XXCCMS_LIABLE_PARTY (FK_FINANCIAL_AWARD); +CREATE index XXCCMS_PUI.XXCCMS_LIABLE_PARTY_I3 on XXCCMS_PUI.XXCCMS_LIABLE_PARTY (FK_FINANCIAL_AWARD); -create index XXCCMS_LIABLE_PARTY_I4 on XXCCMS_LIABLE_PARTY (FK_LAND_AWARD); +CREATE index XXCCMS_PUI.XXCCMS_LIABLE_PARTY_I4 on XXCCMS_PUI.XXCCMS_LIABLE_PARTY (FK_LAND_AWARD); -create index XXCCMS_LIABLE_PARTY_I1 on XXCCMS_LIABLE_PARTY (FK_OPPONENT); +CREATE index XXCCMS_PUI.XXCCMS_LIABLE_PARTY_I1 on XXCCMS_PUI.XXCCMS_LIABLE_PARTY (FK_OPPONENT); -create index XXCCMS_LIABLE_PARTY_I2 on XXCCMS_LIABLE_PARTY (FK_COST_AWARD); +CREATE index XXCCMS_PUI.XXCCMS_LIABLE_PARTY_I2 on XXCCMS_PUI.XXCCMS_LIABLE_PARTY (FK_COST_AWARD); -alter table XXCCMS_LIABLE_PARTY +alter table XXCCMS_PUI.XXCCMS_LIABLE_PARTY add constraint FKECA8777712B5CB75 foreign key (FK_FINANCIAL_AWARD) - references XXCCMS_FINANCIAL_AWARD; + references XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD; -alter table XXCCMS_LIABLE_PARTY +alter table XXCCMS_PUI.XXCCMS_LIABLE_PARTY add constraint FKECA877774A6C1101 foreign key (FK_LAND_AWARD) - references XXCCMS_LAND_AWARD; + references XXCCMS_PUI.XXCCMS_LAND_AWARD; -alter table XXCCMS_LIABLE_PARTY +alter table XXCCMS_PUI.XXCCMS_LIABLE_PARTY add constraint FKECA87777C113FCC1 foreign key (FK_COST_AWARD) - references XXCCMS_COST_AWARD; + references XXCCMS_PUI.XXCCMS_COST_AWARD; -alter table XXCCMS_LIABLE_PARTY +alter table XXCCMS_PUI.XXCCMS_LIABLE_PARTY add constraint FKECA877776F94E468 foreign key (FK_OPPONENT) - references XXCCMS_OPPONENT; + references XXCCMS_PUI.XXCCMS_OPPONENT; -alter table XXCCMS_LIABLE_PARTY +alter table XXCCMS_PUI.XXCCMS_LIABLE_PARTY add constraint FKECA877775F538B2E foreign key (FK_OTHER_ASSET_AWARD) - references XXCCMS_OTHER_ASSET_AWARD; + references XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD; -create index XXCCMS_LINKED_CASE_I1 on XXCCMS_LINKED_CASE (FK_APPLICATION); +CREATE index XXCCMS_PUI.XXCCMS_LINKED_CASE_I1 on XXCCMS_PUI.XXCCMS_LINKED_CASE (FK_APPLICATION); -alter table XXCCMS_LINKED_CASE +alter table XXCCMS_PUI.XXCCMS_LINKED_CASE add constraint XXCCMS_LINKED_CASE_F1 foreign key (FK_APPLICATION) - references XXCCMS_APPLICATION; + references XXCCMS_PUI.XXCCMS_APPLICATION; -create index XXCCMS_OPPONENT_I4 on XXCCMS_OPPONENT (FK_ADDRESS); +CREATE index XXCCMS_PUI.XXCCMS_OPPONENT_I4 on XXCCMS_PUI.XXCCMS_OPPONENT (FK_ADDRESS); -create index XXCCMS_OPPONENT_I3 on XXCCMS_OPPONENT (FK_OUTCOME); +CREATE index XXCCMS_PUI.XXCCMS_OPPONENT_I3 on XXCCMS_PUI.XXCCMS_OPPONENT (FK_OUTCOME); -create index XXCCMS_OPPONENT_I1 on XXCCMS_OPPONENT (FK_APPLICATION); +CREATE index XXCCMS_PUI.XXCCMS_OPPONENT_I1 on XXCCMS_PUI.XXCCMS_OPPONENT (FK_APPLICATION); -alter table XXCCMS_OPPONENT +alter table XXCCMS_PUI.XXCCMS_OPPONENT add constraint FK1CE244763F793FE6 foreign key (FK_OUTCOME) - references XXCCMS_CASE_OUTCOME; + references XXCCMS_PUI.XXCCMS_CASE_OUTCOME; -alter table XXCCMS_OPPONENT +alter table XXCCMS_PUI.XXCCMS_OPPONENT add constraint XXCCMS_OPPONENT_F1 foreign key (FK_APPLICATION) - references XXCCMS_APPLICATION; + references XXCCMS_PUI.XXCCMS_APPLICATION; -alter table XXCCMS_OPPONENT +alter table XXCCMS_PUI.XXCCMS_OPPONENT add constraint XXCCMS_OPPONENT_F2 foreign key (FK_ADDRESS) - references XXCCMS_ADDRESS; + references XXCCMS_PUI.XXCCMS_ADDRESS; -create index XXCCMS_OTHER_ASSET_AWARD_I2 on XXCCMS_OTHER_ASSET_AWARD (FK_OTHER_ASSET_RECOVERY); +CREATE index XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD_I2 on XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD (FK_OTHER_ASSET_RECOVERY); -create index XXCCMS_OTHER_ASSET_AWARD_I1 on XXCCMS_OTHER_ASSET_AWARD (FK_OTHER_ASSET_CASE_OUTCOME); +CREATE index XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD_I1 on XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD (FK_OTHER_ASSET_CASE_OUTCOME); -alter table XXCCMS_OTHER_ASSET_AWARD +alter table XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD add constraint FK537C72467A92DB43 foreign key (FK_OTHER_ASSET_RECOVERY) - references XXCCMS_TIME_RECOVERY; + references XXCCMS_PUI.XXCCMS_TIME_RECOVERY; -alter table XXCCMS_OTHER_ASSET_AWARD +alter table XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD add constraint FK537C724690EDA409 foreign key (FK_OTHER_ASSET_CASE_OUTCOME) - references XXCCMS_CASE_OUTCOME; + references XXCCMS_PUI.XXCCMS_CASE_OUTCOME; -create index XXCCMS_PRIOR_AUTHORITY_I1 on XXCCMS_PRIOR_AUTHORITY (FK_APPLICATION); +CREATE index XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY_I1 on XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY (FK_APPLICATION); -alter table XXCCMS_PRIOR_AUTHORITY +alter table XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY add constraint XXCCMS_PRIOR_AUTHORITY_F1 foreign key (FK_APPLICATION) - references XXCCMS_APPLICATION; + references XXCCMS_PUI.XXCCMS_APPLICATION; -create index XXCCMS_PROCEEDING_I1 on XXCCMS_PROCEEDING (FK_APPLICATION); +CREATE index XXCCMS_PUI.XXCCMS_PROCEEDING_I1 on XXCCMS_PUI.XXCCMS_PROCEEDING (FK_APPLICATION); -alter table XXCCMS_PROCEEDING +alter table XXCCMS_PUI.XXCCMS_PROCEEDING add constraint XXCCMS_PROCEEDING_F1 foreign key (FK_APPLICATION) - references XXCCMS_APPLICATION; + references XXCCMS_PUI.XXCCMS_APPLICATION; -create index XXCCMS_PROCEEDING_OUTCOME_I1 on XXCCMS_PROCEEDING_OUTCOME (FK_PROCEEDING_CASE_OUTCOME); +CREATE index XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME_I1 on XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME (FK_PROCEEDING_CASE_OUTCOME); -alter table XXCCMS_PROCEEDING_OUTCOME +alter table XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME add constraint FKF884AE40329097C2 foreign key (FK_PROCEEDING_CASE_OUTCOME) - references XXCCMS_CASE_OUTCOME; + references XXCCMS_PUI.XXCCMS_CASE_OUTCOME; -create index XXCCMS_DATA_ITEM_I1 on XXCCMS_REFERENCE_DATA_ITEM (FK_PRIOR_AUTHORITY); +CREATE index XXCCMS_PUI.XXCCMS_DATA_ITEM_I1 on XXCCMS_PUI.XXCCMS_REFERENCE_DATA_ITEM (FK_PRIOR_AUTHORITY); -alter table XXCCMS_REFERENCE_DATA_ITEM +alter table XXCCMS_PUI.XXCCMS_REFERENCE_DATA_ITEM add constraint XXCCMS_DATA_ITEM_F1 foreign key (FK_PRIOR_AUTHORITY) - references XXCCMS_PRIOR_AUTHORITY; + references XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY; -create index XXCCMS_SCOPE_LIMITATION_I1 on XXCCMS_SCOPE_LIMITATION (FK_PROCEEDING); +CREATE index XXCCMS_PUI.XXCCMS_SCOPE_LIMITATION_I1 on XXCCMS_PUI.XXCCMS_SCOPE_LIMITATION (FK_PROCEEDING); -alter table XXCCMS_SCOPE_LIMITATION +alter table XXCCMS_PUI.XXCCMS_SCOPE_LIMITATION add constraint XXCCMS_SCOPE_LIMITATION_F1 foreign key (FK_PROCEEDING) - references XXCCMS_PROCEEDING; + references XXCCMS_PUI.XXCCMS_PROCEEDING; -create sequence XXCCMS_GENERATED_ID_S; +CREATE sequence XXCCMS_PUI.XXCCMS_GENERATED_ID_S; -CREATE TABLE XXCCMS_EVIDENCE_DOCUMENTS +CREATE TABLE XXCCMS_PUI.XXCCMS_EVIDENCE_DOCUMENTS ( ID NUMBER(19) NOT NULL, NOTIFICATION_REFERENCE VARCHAR2(50), @@ -764,5 +764,5 @@ CREATE TABLE FND_LOOKUP_VALUES DESCRIPTION VARCHAR2(240) ); -ALTER TABLE xxccms_notification_attachment modify file_bytes blob; +ALTER TABLE XXCCMS_PUI.XXCCMS_notification_attachment modify file_bytes blob; diff --git a/caab-service/src/integrationTest/resources/sql/application_tables_drop_schema.sql b/caab-service/src/integrationTest/resources/sql/application_tables_drop_schema.sql index 0e6c688..f13c39b 100644 --- a/caab-service/src/integrationTest/resources/sql/application_tables_drop_schema.sql +++ b/caab-service/src/integrationTest/resources/sql/application_tables_drop_schema.sql @@ -1,30 +1,30 @@ -- drop tables DROP TABLE FND_LOOKUP_VALUES; -DROP TABLE XXCCMS_BILL; -DROP TABLE XXCCMS_LIABLE_PARTY; -DROP TABLE XXCCMS_COST_AWARD; -DROP TABLE XXCCMS_FINANCIAL_AWARD; -DROP TABLE XXCCMS_LAND_AWARD; -DROP TABLE XXCCMS_OTHER_ASSET_AWARD; -DROP TABLE XXCCMS_RECOVERY; -DROP TABLE XXCCMS_TIME_RECOVERY; +DROP TABLE XXCCMS_PUI.XXCCMS_BILL; +DROP TABLE XXCCMS_PUI.XXCCMS_LIABLE_PARTY; +DROP TABLE XXCCMS_PUI.XXCCMS_COST_AWARD; +DROP TABLE XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD; +DROP TABLE XXCCMS_PUI.XXCCMS_LAND_AWARD; +DROP TABLE XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD; +DROP TABLE XXCCMS_PUI.XXCCMS_RECOVERY; +DROP TABLE XXCCMS_PUI.XXCCMS_TIME_RECOVERY; -DROP TABLE XXCCMS_SCOPE_LIMITATION; -DROP TABLE XXCCMS_PROCEEDING_OUTCOME; -DROP TABLE XXCCMS_PROCEEDING; -DROP TABLE XXCCMS_OPPONENT; -DROP TABLE XXCCMS_CASE_OUTCOME; -DROP TABLE XXCCMS_REFERENCE_DATA_ITEM; -DROP TABLE XXCCMS_PRIOR_AUTHORITY; -DROP TABLE XXCCMS_LINKED_CASE; -DROP TABLE XXCCMS_COST_ENTRY; -DROP TABLE XXCCMS_APPLICATION; -DROP TABLE XXCCMS_COST_STRUCTURE; -DROP TABLE XXCCMS_EVIDENCE_DOCUMENTS; -DROP TABLE XXCCMS_NOTIFICATION_ATTACHMENT; -DROP TABLE XXCCMS_PAYMENT_ON_ACCOUNT; -DROP TABLE XXCCMS_UNDERTAKING; -DROP TABLE XXCCMS_ADDRESS; +DROP TABLE XXCCMS_PUI.XXCCMS_SCOPE_LIMITATION; +DROP TABLE XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME; +DROP TABLE XXCCMS_PUI.XXCCMS_PROCEEDING; +DROP TABLE XXCCMS_PUI.XXCCMS_OPPONENT; +DROP TABLE XXCCMS_PUI.XXCCMS_CASE_OUTCOME; +DROP TABLE XXCCMS_PUI.XXCCMS_REFERENCE_DATA_ITEM; +DROP TABLE XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY; +DROP TABLE XXCCMS_PUI.XXCCMS_LINKED_CASE; +DROP TABLE XXCCMS_PUI.XXCCMS_COST_ENTRY; +DROP TABLE XXCCMS_PUI.XXCCMS_APPLICATION; +DROP TABLE XXCCMS_PUI.XXCCMS_COST_STRUCTURE; +DROP TABLE XXCCMS_PUI.XXCCMS_EVIDENCE_DOCUMENTS; +DROP TABLE XXCCMS_PUI.XXCCMS_NOTIFICATION_ATTACHMENT; +DROP TABLE XXCCMS_PUI.XXCCMS_PAYMENT_ON_ACCOUNT; +DROP TABLE XXCCMS_PUI.XXCCMS_UNDERTAKING; +DROP TABLE XXCCMS_PUI.XXCCMS_ADDRESS; -- drop sequence -DROP SEQUENCE XXCCMS_GENERATED_ID_S; +DROP SEQUENCE XXCCMS_PUI.XXCCMS_GENERATED_ID_S; diff --git a/caab-service/src/integrationTest/resources/sql/case_outcome_insert.sql b/caab-service/src/integrationTest/resources/sql/case_outcome_insert.sql index 93a2367..e752354 100644 --- a/caab-service/src/integrationTest/resources/sql/case_outcome_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/case_outcome_insert.sql @@ -1,4 +1,4 @@ -insert into XXCCMS_CASE_OUTCOME (ID, +insert into XXCCMS_PUI.XXCCMS_CASE_OUTCOME (ID, LSC_CASE_REFERENCE, PROVIDER_ID, PRE_CERTIFICATE_COSTS, @@ -33,7 +33,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_CASE_OUTCOME (ID, +insert into XXCCMS_PUI.XXCCMS_CASE_OUTCOME (ID, LSC_CASE_REFERENCE, PROVIDER_ID, PRE_CERTIFICATE_COSTS, @@ -69,7 +69,7 @@ values (2, 'testUser'); -insert into XXCCMS_PROCEEDING_OUTCOME (ID, +insert into XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME (ID, DATE_OF_ISSUE, DESCRIPTION, STAGE_END, @@ -114,7 +114,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_RECOVERY (ID, +insert into XXCCMS_PUI.XXCCMS_RECOVERY (ID, AWARD_TYPE, DESCRIPTION, AWARD_AMT, @@ -159,7 +159,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_TIME_RECOVERY (ID, +insert into XXCCMS_PUI.XXCCMS_TIME_RECOVERY (ID, AWARD_TYPE, DESCRIPTION, TRIGGERING_EVENT, @@ -182,7 +182,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_COST_AWARD (ID, +insert into XXCCMS_PUI.XXCCMS_COST_AWARD (ID, AWARD_TYPE, DESCRIPTION, AWARDED_BY, @@ -239,7 +239,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_FINANCIAL_AWARD (ID, +insert into XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD (ID, AWARD_TYPE, DESCRIPTION, AWARDED_BY, @@ -288,7 +288,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_LAND_AWARD (ID, +insert into XXCCMS_PUI.XXCCMS_LAND_AWARD (ID, AWARD_TYPE, DESCRIPTION, AWARDED_BY, @@ -355,7 +355,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_OTHER_ASSET_AWARD (ID, +insert into XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD (ID, AWARD_TYPE, DESCRIPTION, AWARDED_BY, @@ -414,7 +414,7 @@ values (1, SYSDATE, 'testUser'); -insert into XXCCMS_LIABLE_PARTY (ID, +insert into XXCCMS_PUI.XXCCMS_LIABLE_PARTY (ID, AWARD_TYPE, FK_COST_AWARD, FK_FINANCIAL_AWARD, diff --git a/caab-service/src/integrationTest/resources/sql/delete_data.sql b/caab-service/src/integrationTest/resources/sql/delete_data.sql index a743615..1f9acc6 100644 --- a/caab-service/src/integrationTest/resources/sql/delete_data.sql +++ b/caab-service/src/integrationTest/resources/sql/delete_data.sql @@ -1,25 +1,25 @@ -DELETE FROM XXCCMS_LIABLE_PARTY; -DELETE FROM XXCCMS_COST_AWARD; -DELETE FROM XXCCMS_FINANCIAL_AWARD; -DELETE FROM XXCCMS_LAND_AWARD; -DELETE FROM XXCCMS_OTHER_ASSET_AWARD; -DELETE FROM XXCCMS_PROCEEDING_OUTCOME; -DELETE FROM XXCCMS_RECOVERY; -DELETE FROM XXCCMS_TIME_RECOVERY; +DELETE FROM XXCCMS_PUI.XXCCMS_LIABLE_PARTY; +DELETE FROM XXCCMS_PUI.XXCCMS_COST_AWARD; +DELETE FROM XXCCMS_PUI.XXCCMS_FINANCIAL_AWARD; +DELETE FROM XXCCMS_PUI.XXCCMS_LAND_AWARD; +DELETE FROM XXCCMS_PUI.XXCCMS_OTHER_ASSET_AWARD; +DELETE FROM XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME; +DELETE FROM XXCCMS_PUI.XXCCMS_RECOVERY; +DELETE FROM XXCCMS_PUI.XXCCMS_TIME_RECOVERY; -DELETE FROM XXCCMS_REFERENCE_DATA_ITEM; -DELETE FROM XXCCMS_SCOPE_LIMITATION; -DELETE FROM XXCCMS_PROCEEDING_OUTCOME; -DELETE FROM XXCCMS_PROCEEDING; -DELETE FROM XXCCMS_OPPONENT; -DELETE FROM XXCCMS_CASE_OUTCOME; -DELETE FROM XXCCMS_PRIOR_AUTHORITY; -DELETE FROM XXCCMS_OPPONENT; -DELETE FROM XXCCMS_CASE_OUTCOME; -DELETE FROM XXCCMS_LINKED_CASE; -DELETE FROM XXCCMS_COST_ENTRY; -DELETE FROM XXCCMS_APPLICATION; -DELETE FROM XXCCMS_COST_STRUCTURE; -DELETE FROM XXCCMS_ADDRESS; -DELETE FROM XXCCMS_EVIDENCE_DOCUMENTS; -DELETE FROM XXCCMS_NOTIFICATION_ATTACHMENT; +DELETE FROM XXCCMS_PUI.XXCCMS_REFERENCE_DATA_ITEM; +DELETE FROM XXCCMS_PUI.XXCCMS_SCOPE_LIMITATION; +DELETE FROM XXCCMS_PUI.XXCCMS_PROCEEDING_OUTCOME; +DELETE FROM XXCCMS_PUI.XXCCMS_PROCEEDING; +DELETE FROM XXCCMS_PUI.XXCCMS_OPPONENT; +DELETE FROM XXCCMS_PUI.XXCCMS_CASE_OUTCOME; +DELETE FROM XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY; +DELETE FROM XXCCMS_PUI.XXCCMS_OPPONENT; +DELETE FROM XXCCMS_PUI.XXCCMS_CASE_OUTCOME; +DELETE FROM XXCCMS_PUI.XXCCMS_LINKED_CASE; +DELETE FROM XXCCMS_PUI.XXCCMS_COST_ENTRY; +DELETE FROM XXCCMS_PUI.XXCCMS_APPLICATION; +DELETE FROM XXCCMS_PUI.XXCCMS_COST_STRUCTURE; +DELETE FROM XXCCMS_PUI.XXCCMS_ADDRESS; +DELETE FROM XXCCMS_PUI.XXCCMS_EVIDENCE_DOCUMENTS; +DELETE FROM XXCCMS_PUI.XXCCMS_NOTIFICATION_ATTACHMENT; diff --git a/caab-service/src/integrationTest/resources/sql/evidence_document_insert.sql b/caab-service/src/integrationTest/resources/sql/evidence_document_insert.sql index 77039c6..e5b42b2 100644 --- a/caab-service/src/integrationTest/resources/sql/evidence_document_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/evidence_document_insert.sql @@ -1,4 +1,4 @@ -insert into XXCCMS_EVIDENCE_DOCUMENTS ( +insert into XXCCMS_PUI.XXCCMS_EVIDENCE_DOCUMENTS ( ID, CASE_ID, CCMS_MODULE, @@ -46,7 +46,7 @@ insert into XXCCMS_EVIDENCE_DOCUMENTS ( 'code', 'the code'); -insert into XXCCMS_EVIDENCE_DOCUMENTS ( +insert into XXCCMS_PUI.XXCCMS_EVIDENCE_DOCUMENTS ( ID, CASE_ID, CCMS_MODULE, diff --git a/caab-service/src/integrationTest/resources/sql/linked_cases_insert.sql b/caab-service/src/integrationTest/resources/sql/linked_cases_insert.sql index aed97bc..7c46d51 100644 --- a/caab-service/src/integrationTest/resources/sql/linked_cases_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/linked_cases_insert.sql @@ -1,3 +1,3 @@ -INSERT INTO XXCCMS_LINKED_CASE +INSERT INTO XXCCMS_PUI.XXCCMS_LINKED_CASE (ID, LSC_CASE_REFERENCE, PROVIDER_CASE_REFERENCE, FEE_EARNER, CLIENT_FIRST_NAME, CLIENT_SURNAME, CLIENT_REFERENCE, CATEGORY_OF_LAW, RELATION_TO_LINKED_CASE, STATUS, FK_APPLICATION, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(2, 'BLAH123456', 'BLAH123', 'Fee Earner Name', 'BLAH', 'BLAH', 'BLAH', 'Category of Law Example', 'Relation to Case Example', 'Active', 41, TIMESTAMP '2024-01-15 10:18:39.961000', 'TEST', TIMESTAMP '2024-01-15 10:18:39.961000', 'TEST'); \ No newline at end of file diff --git a/caab-service/src/integrationTest/resources/sql/notification_attachment_insert.sql b/caab-service/src/integrationTest/resources/sql/notification_attachment_insert.sql index 7d85a94..5754db7 100644 --- a/caab-service/src/integrationTest/resources/sql/notification_attachment_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/notification_attachment_insert.sql @@ -1,4 +1,4 @@ -INSERT INTO XXCCMS_NOTIFICATION_ATTACHMENT ( +INSERT INTO XXCCMS_PUI.XXCCMS_NOTIFICATION_ATTACHMENT ( ID, NOTIFICATION_REFERENCE, PROVIDER_ID, @@ -33,7 +33,7 @@ VALUES ( null ); -INSERT INTO XXCCMS_NOTIFICATION_ATTACHMENT ( +INSERT INTO XXCCMS_PUI.XXCCMS_NOTIFICATION_ATTACHMENT ( ID, NOTIFICATION_REFERENCE, PROVIDER_ID, @@ -68,7 +68,7 @@ VALUES ( null ); -INSERT INTO XXCCMS_NOTIFICATION_ATTACHMENT ( +INSERT INTO XXCCMS_PUI.XXCCMS_NOTIFICATION_ATTACHMENT ( ID, NOTIFICATION_REFERENCE, PROVIDER_ID, diff --git a/caab-service/src/integrationTest/resources/sql/opponent_insert.sql b/caab-service/src/integrationTest/resources/sql/opponent_insert.sql index b00adfe..152f7f8 100644 --- a/caab-service/src/integrationTest/resources/sql/opponent_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/opponent_insert.sql @@ -1,4 +1,4 @@ -insert into XXCCMS_OPPONENT (ID, EBS_ID, TYPE, TITLE, FIRST_NAME, MIDDLE_NAMES, SURNAME, +insert into XXCCMS_PUI.XXCCMS_OPPONENT (ID, EBS_ID, TYPE, TITLE, FIRST_NAME, MIDDLE_NAMES, SURNAME, DATE_OF_BIRTH, NATIONAL_INSURANCE_NUMBER, RELATIONSHIP_TO_CASE, RELATIONSHIP_TO_CLIENT, TELEPHONE_HOME, TELEPHONE_WORK, TELEPHONE_MOBILE, diff --git a/caab-service/src/integrationTest/resources/sql/prior_authority_insert.sql b/caab-service/src/integrationTest/resources/sql/prior_authority_insert.sql index a64a011..1c4f6c6 100644 --- a/caab-service/src/integrationTest/resources/sql/prior_authority_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/prior_authority_insert.sql @@ -1,3 +1,3 @@ -INSERT INTO XXCCMS_PRIOR_AUTHORITY +INSERT INTO XXCCMS_PUI.XXCCMS_PRIOR_AUTHORITY (ID, EBS_ID, "TYPE", TYPE_DISPLAY_VALUE, SUMMARY, JUSTIFICATION, VALUE_REQUIRED_FLAG, AMOUNT_REQUESTED, STATUS, FK_APPLICATION, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(2, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'Draft', 41, TIMESTAMP '2024-01-15 14:43:13.902000', 'TEST', TIMESTAMP '2024-01-15 14:43:13.919000', 'TEST'); \ No newline at end of file diff --git a/caab-service/src/integrationTest/resources/sql/proceeding_insert.sql b/caab-service/src/integrationTest/resources/sql/proceeding_insert.sql index dcc8da9..0d43e62 100644 --- a/caab-service/src/integrationTest/resources/sql/proceeding_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/proceeding_insert.sql @@ -1,3 +1,3 @@ -INSERT INTO XXCCMS_PROCEEDING +INSERT INTO XXCCMS_PUI.XXCCMS_PROCEEDING (ID, EBS_ID, MATTER_TYPE, MATTER_TYPE_DISPLAY_VALUE, PROCEEDING_TYPE, PROCEEDING_TYPE_DISPLAY_VALUE, DESCRIPTION, LEVEL_OF_SERVICE, LEVEL_OF_SERVICE_DISPLAY_VALUE, CLIENT_INVOLVEMENT, CLIENT_DISPLAY_VALUE, COST_LIMITATION, STATUS, DISPLAY_STATUS, TYPE_OF_ORDER, DATE_GRANTED, EDITED, DEFAULT_SCOPE_LIMITATION, STAGE, DATE_COSTS_VALID, LEAD_PROCEEDING_IND, LAR_SCOPE, FK_APPLICATION, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(2, NULL, 'KPBLB', 'Pub Law - Fam', 'PBM32', 'Special Guardianship Order - Pub Law - Fam', 'Special Guardianship Order - Pub Law - Fam', '3', 'Full Representation', 'W', 'Subject of proceedings (child)', 0, 'Draft', 'Unchanged', NULL, NULL, 0, NULL, '8', NULL, 0, 'I', 41, TIMESTAMP '2023-12-06 15:34:21.464000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2023-12-06 15:34:21.464000', 'PENNY.WALL@SWITALSKIS.COM'); \ No newline at end of file diff --git a/caab-service/src/integrationTest/resources/sql/scope_limitation_insert.sql b/caab-service/src/integrationTest/resources/sql/scope_limitation_insert.sql index b9bbf8b..12c5fe5 100644 --- a/caab-service/src/integrationTest/resources/sql/scope_limitation_insert.sql +++ b/caab-service/src/integrationTest/resources/sql/scope_limitation_insert.sql @@ -1,3 +1,3 @@ -INSERT INTO XXCCMS_SCOPE_LIMITATION +INSERT INTO XXCCMS_PUI.XXCCMS_SCOPE_LIMITATION (ID, EBS_ID, SCOPE_LIMITATION, SCOPE_LIMITATION_DISPLAY_VALUE, SCOPE_LIMITATION_WORDING, DEFAULT_IND, DELEGATED_FUNC_APPLY_IND, FK_PROCEEDING, CREATED, CREATED_BY, MODIFIED, MODIFIED_BY) VALUES(3, NULL, 'FM062', 'Final Hearing (fam/public law)', 'Limited to all steps up to and including final hearing and any action necessary to implement (but not enforce) the order.', 0, 0, 2, TIMESTAMP '2024-01-16 09:06:05.679000', 'PENNY.WALL@SWITALSKIS.COM', TIMESTAMP '2024-01-16 09:06:05.679000', 'PENNY.WALL@SWITALSKIS.COM'); \ No newline at end of file diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Address.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Address.java index 0b4e326..9bc97f5 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Address.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Address.java @@ -25,13 +25,14 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_ADDRESS") +@Table(name = "XXCCMS_ADDRESS", schema = "XXCCMS_PUI") @Setter @Getter @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_ADDRESS_S") + name = "XXCCMS_ADDRESS_S", + schema = "XXCCMS_PUI") @RequiredArgsConstructor public class Address implements Serializable { diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Application.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Application.java index a4b710d..81fd497 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Application.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Application.java @@ -35,11 +35,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_APPLICATION") +@Table(name = "XXCCMS_APPLICATION", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_APPLICATION_S") + name = "XXCCMS_APPLICATION_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CaseOutcome.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CaseOutcome.java index 4bdf5ee..c42d8a7 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CaseOutcome.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CaseOutcome.java @@ -28,11 +28,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_CASE_OUTCOME") +@Table(name = "XXCCMS_CASE_OUTCOME", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_CASE_OUTCOME_S") + name = "XXCCMS_CASE_OUTCOME_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostAward.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostAward.java index 719ea44..d60d4aa 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostAward.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostAward.java @@ -21,11 +21,12 @@ * Entity to represent a cost award entry in the XXCCMS_COST_AWARD TDS table. */ @Entity -@Table(name = "XXCCMS_COST_AWARD") +@Table(name = "XXCCMS_COST_AWARD", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_COST_AWARD_S") + name = "XXCCMS_COST_AWARD_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostEntry.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostEntry.java index ed7f9d2..4c42c66 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostEntry.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostEntry.java @@ -28,11 +28,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_COST_ENTRY") +@Table(name = "XXCCMS_COST_ENTRY", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_COST_ENTRY_S") + name = "XXCCMS_COST_ENTRY_S", + schema = "XXCCMS_PUI") @Setter @Getter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostStructure.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostStructure.java index c0439c4..fa26cb1 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostStructure.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/CostStructure.java @@ -28,13 +28,14 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_COST_STRUCTURE") +@Table(name = "XXCCMS_COST_STRUCTURE", schema = "XXCCMS_PUI") @Getter @Setter @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_COST_STRUCTURE_S") + name = "XXCCMS_COST_STRUCTURE_S", + schema = "XXCCMS_PUI") @RequiredArgsConstructor public class CostStructure implements Serializable { diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/EvidenceDocument.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/EvidenceDocument.java index 0798d76..bc3b99b 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/EvidenceDocument.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/EvidenceDocument.java @@ -27,11 +27,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_EVIDENCE_DOCUMENTS") +@Table(name = "XXCCMS_EVIDENCE_DOCUMENTS", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_EVIDENCE_DOCUMENTS_S") + name = "XXCCMS_EVIDENCE_DOCUMENTS_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/FinancialAward.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/FinancialAward.java index 7179d55..55896f3 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/FinancialAward.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/FinancialAward.java @@ -20,11 +20,12 @@ * Entity to represent a financial award entry in the XXCCMS_FINANCIAL_AWARD TDS table. */ @Entity -@Table(name = "XXCCMS_FINANCIAL_AWARD") +@Table(name = "XXCCMS_FINANCIAL_AWARD", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_FINANCIAL_AWARD_S") + name = "XXCCMS_FINANCIAL_AWARD_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LandAward.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LandAward.java index a8bf200..d2d3766 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LandAward.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LandAward.java @@ -23,11 +23,12 @@ * Entity to represent a land award entry in the XXCCMS_LAND_AWARD TDS table. */ @Entity -@Table(name = "XXCCMS_LAND_AWARD") +@Table(name = "XXCCMS_LAND_AWARD", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_LAND_AWARD_S") + name = "XXCCMS_LAND_AWARD_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LiableParty.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LiableParty.java index 80d3bd1..60ccd59 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LiableParty.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LiableParty.java @@ -19,12 +19,13 @@ * Entity to represent a liable party entry in the XXCCMS_LIABLE_PARTY TDS table. */ @Entity -@Table(name = "XXCCMS_LIABLE_PARTY") +@Table(name = "XXCCMS_LIABLE_PARTY", schema = "XXCCMS_PUI") @EntityListeners(AuditingEntityListener.class) @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_LIABLE_PARTY_S") + name = "XXCCMS_LIABLE_PARTY_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LinkedCase.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LinkedCase.java index acbab0c..2871847 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LinkedCase.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/LinkedCase.java @@ -27,11 +27,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_LINKED_CASE") +@Table(name = "XXCCMS_LINKED_CASE", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_LINKED_CASE_S") + name = "XXCCMS_LINKED_CASE_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/NotificationAttachment.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/NotificationAttachment.java index dfdb03a..28f8225 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/NotificationAttachment.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/NotificationAttachment.java @@ -25,11 +25,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_NOTIFICATION_ATTACHMENT") +@Table(name = "XXCCMS_NOTIFICATION_ATTACHMENT", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_NOTIFICATION_ATTACHMENT_S") + name = "XXCCMS_NOTIFICATION_ATTACHMENT_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Opponent.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Opponent.java index f3a0800..6ad347c 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Opponent.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Opponent.java @@ -35,11 +35,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_OPPONENT") +@Table(name = "XXCCMS_OPPONENT", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_OPPONENT_S") + name = "XXCCMS_OPPONENT_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/OtherAssetAward.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/OtherAssetAward.java index 4415aca..b8dd563 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/OtherAssetAward.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/OtherAssetAward.java @@ -23,11 +23,12 @@ * Entity to represent an other asset award entry in the XXCCMS_OTHER_ASSET_AWARD TDS table. */ @Entity -@Table(name = "XXCCMS_OTHER_ASSET_AWARD") +@Table(name = "XXCCMS_OTHER_ASSET_AWARD", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_OTHER_ASSET_AWARD_S") + name = "XXCCMS_OTHER_ASSET_AWARD_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/PriorAuthority.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/PriorAuthority.java index c572d34..ddc57d9 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/PriorAuthority.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/PriorAuthority.java @@ -33,11 +33,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_PRIOR_AUTHORITY") +@Table(name = "XXCCMS_PRIOR_AUTHORITY", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_PRIOR_AUTHORITY_S") + name = "XXCCMS_PRIOR_AUTHORITY_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Proceeding.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Proceeding.java index 3687272..829539d 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Proceeding.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Proceeding.java @@ -33,11 +33,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_PROCEEDING") +@Table(name = "XXCCMS_PROCEEDING", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_PROCEEDING_S") + name = "XXCCMS_PROCEEDING_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ProceedingOutcome.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ProceedingOutcome.java index 63b13f5..9b7bf38 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ProceedingOutcome.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ProceedingOutcome.java @@ -21,11 +21,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_PROCEEDING_OUTCOME") +@Table(name = "XXCCMS_PROCEEDING_OUTCOME", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_PROCEEDING_OUTCOME_S") + name = "XXCCMS_PROCEEDING_OUTCOME_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Recovery.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Recovery.java index 16c5a1c..6b64fa0 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Recovery.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/Recovery.java @@ -23,11 +23,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_RECOVERY") +@Table(name = "XXCCMS_RECOVERY", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_RECOVERY_S") + name = "XXCCMS_RECOVERY_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ReferenceDataItem.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ReferenceDataItem.java index 4e43d5d..c10b40f 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ReferenceDataItem.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ReferenceDataItem.java @@ -21,11 +21,12 @@ * both the NotificationRequest and the PriorAuthority. */ @Entity -@Table(name = "XXCCMS_REFERENCE_DATA_ITEM") +@Table(name = "XXCCMS_REFERENCE_DATA_ITEM", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_REFERENCE_DATA_ITEM_S") + name = "XXCCMS_REFERENCE_DATA_ITEM_S", + schema = "XXCCMS_PUI") @Setter @Getter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ScopeLimitation.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ScopeLimitation.java index fa016b9..e8df143 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ScopeLimitation.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/ScopeLimitation.java @@ -27,11 +27,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_SCOPE_LIMITATION") +@Table(name = "XXCCMS_SCOPE_LIMITATION", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_SCOPE_LIMITATION_S") + name = "XXCCMS_SCOPE_LIMITATION_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor diff --git a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/TimeRecovery.java b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/TimeRecovery.java index 435c30d..0d99713 100644 --- a/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/TimeRecovery.java +++ b/caab-service/src/main/java/uk/gov/laa/ccms/caab/api/entity/TimeRecovery.java @@ -21,11 +21,12 @@ */ @Entity @EntityListeners(AuditingEntityListener.class) -@Table(name = "XXCCMS_TIME_RECOVERY") +@Table(name = "XXCCMS_TIME_RECOVERY", schema = "XXCCMS_PUI") @SequenceGenerator( allocationSize = 1, sequenceName = "XXCCMS_GENERATED_ID_S", - name = "XXCCMS_TIME_RECOVERY_S") + name = "XXCCMS_TIME_RECOVERY_S", + schema = "XXCCMS_PUI") @Getter @Setter @RequiredArgsConstructor