Skip to content

Commit daee8f8

Browse files
kiran-yenigala-hmctskiran-yenigala-hmcts
authored
DTSRD-3404: Address AAT deployment issue (#554)
* DTSRD-3404: Address AAT deployment issue * DTSRD-3404: Address AAT deployment issue
1 parent 46f68ec commit daee8f8

5 files changed

Lines changed: 30 additions & 6 deletions

File tree

‎src/functionalTest/resources/application-integration.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ route:
6464
VALUES (:#service_code,:#ccd_service_name,:#ccd_case_type, NOW() AT TIME ZONE 'utc')
6565
ON CONFLICT (service_code, ccd_case_type) DO NOTHING ?dataSource=#dataSource
6666
blob-path:
67-
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data/service-test.csv?credentials=#credsreg&operation=uploadBlockBlob
67+
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data?credentials=#credsreg&operation=uploadBlockBlob&blobName=service-test.csv
6868
processor-class: serviceToCcdCaseTypeProcessor
6969
mapper-class: serviceToCcdCaseTypeMapper
7070
csv-binder-object: serviceToCcdCaseType
@@ -78,7 +78,7 @@ route:
7878
ON CONFLICT (epimms_id) DO UPDATE SET building_location_name = :#building_location_name,building_location_status = :#building_location_status,area = :#area,region_id = :#region_id,cluster_id = :#cluster_id,
7979
court_finder_url = :#court_finder_url,postcode = :#postcode,address = :#address,welsh_building_location_name = :#welsh_building_location_name,welsh_address = :#welsh_address,uprn = :#uprn,latitude = :#latitude,longitude = :#longitude,mrd_building_location_id = :#mrd_building_location_id,mrd_created_time = :#mrd_created_time,mrd_updated_time = :#mrd_updated_time,mrd_deleted_time = :#mrd_deleted_time,updated_time = NOW() AT TIME ZONE 'utc'?dataSource=#dataSource
8080
blob-path:
81-
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data/building_location_test.csv?credentials=#credsreg&operation=uploadBlockBlob
81+
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data?credentials=#credsreg&operation=uploadBlockBlob&blobName=building_location_test.csv
8282
processor-class: buildingLocationProcessor
8383
mapper-class: buildingLocationMapper
8484
csv-binder-object: buildingLocation
@@ -111,7 +111,7 @@ route:
111111
mrd_created_time = :#mrd_created_time, mrd_updated_time = :#mrd_updated_time, mrd_deleted_time = :#mrd_deleted_time,
112112
external_short_name = :#external_short_name, updated_time = NOW() AT TIME ZONE 'utc'?dataSource=#dataSource
113113
blob-path:
114-
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data/court-venue-test.csv?credentials=#credsreg&operation=uploadBlockBlob
114+
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data?credentials=#credsreg&operation=uploadBlockBlob&blobName=court-venue-test.csv
115115
processor-class: courtVenueProcessor
116116
mapper-class: courtVenueMapper
117117
csv-binder-object: courtVenue

‎src/functionalTest/resources/db/testmigration/V1_28__spring-batch-schema-recreate.sql‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
drop table if exists batch_step_execution_context_archived;
2+
drop table if exists batch_job_execution_context_archived;
3+
drop table if exists batch_step_execution_archived;
4+
drop table if exists batch_job_execution_params_archived;
5+
drop table if exists batch_job_execution_archived;
6+
drop table if exists batch_job_instance_archived;
7+
8+
alter table if exists batch_step_execution_context rename to batch_step_execution_context_archived;
9+
alter table if exists batch_job_execution_context rename to batch_job_execution_context_archived;
10+
alter table if exists batch_step_execution rename to batch_step_execution_archived;
11+
alter table if exists batch_job_execution_params rename to batch_job_execution_params_archived;
12+
alter table if exists batch_job_execution rename to batch_job_execution_archived;
13+
alter table if exists batch_job_instance rename to batch_job_instance_archived;
14+
15+
alter table if exists batch_job_instance_archived rename constraint JOB_INST_UN to JOB_INST_UN_A;
16+
alter table if exists batch_job_execution_archived rename constraint JOB_INST_EXEC_FK to JOB_INST_EXEC_FK_A;
17+
alter table if exists batch_job_execution_params_archived rename constraint JOB_EXEC_PARAMS_FK to JOB_EXEC_PARAMS_FK_A;
18+
alter table if exists batch_step_execution_archived rename constraint JOB_EXEC_STEP_FK to JOB_EXEC_STEP_FK_A;
19+
alter table if exists batch_step_execution_context_archived rename constraint STEP_EXEC_CTX_FK to STEP_EXEC_CTX_FK_A;
20+
alter table if exists batch_job_execution_context_archived rename constraint JOB_EXEC_CTX_FK to JOB_EXEC_CTX_FK_A;
21+
22+
drop sequence if exists BATCH_STEP_EXECUTION_SEQ;
23+
drop sequence if exists BATCH_JOB_EXECUTION_SEQ;
24+
drop sequence if exists BATCH_JOB_SEQ;

‎src/main/resources/application-lrd-building-location-router.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ route:
1313
ON CONFLICT (epimms_id) DO UPDATE SET building_location_name = :#building_location_name,building_location_status = :#building_location_status,area = :#area,region_id = :#region_id,cluster_id = :#cluster_id,
1414
court_finder_url = :#court_finder_url,postcode = :#postcode,address = :#address,welsh_building_location_name = :#welsh_building_location_name,welsh_address = :#welsh_address,uprn = :#uprn,latitude = :#latitude,longitude = :#longitude,mrd_building_location_id = :#mrd_building_location_id,mrd_created_time = :#mrd_created_time,mrd_updated_time = :#mrd_updated_time,mrd_deleted_time = :#mrd_deleted_time,updated_time = NOW() AT TIME ZONE 'utc'?dataSource=#dataSource
1515
blob-path:
16-
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data/BuildingLocation.csv?credentials=#credsreg&operation=uploadBlockBlob
16+
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data?credentials=#credsreg&operation=uploadBlockBlob&blobName=BuildingLocation.csv
1717
processor-class: buildingLocationProcessor
1818
mapper-class: buildingLocationMapper
1919
csv-binder-object: buildingLocation

‎src/main/resources/application-lrd-court-venue-router.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ route:
2929
mrd_created_time = :#mrd_created_time, mrd_updated_time = :#mrd_updated_time, mrd_deleted_time = :#mrd_deleted_time,
3030
external_short_name = :#external_short_name, updated_time = NOW() AT TIME ZONE 'utc'?dataSource=#dataSource
3131
blob-path:
32-
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data/CourtVenue.csv?credentials=#credsreg&operation=uploadBlockBlob
32+
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data?credentials=#credsreg&operation=uploadBlockBlob&blobName=CourtVenue.csv
3333
processor-class: courtVenueProcessor
3434
mapper-class: courtVenueMapper
3535
csv-binder-object: courtVenue

‎src/main/resources/application-lrd-router.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ route:
1414
VALUES (:#service_code,:#ccd_service_name,:#ccd_case_type, NOW() AT TIME ZONE 'utc')
1515
ON CONFLICT (service_code, ccd_case_type) DO NOTHING ?dataSource=#dataSource
1616
blob-path:
17-
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data/OrgServiceCCDMapping.csv?credentials=#credsreg&operation=uploadBlockBlob
17+
azure-storage-blob://${azure.storage.account-name}/lrd-ref-data?credentials=#credsreg&operation=uploadBlockBlob&blobName=OrgServiceCCDMapping.csv
1818
processor-class: serviceToCcdCaseTypeProcessor
1919
mapper-class: serviceToCcdCaseTypeMapper
2020
csv-binder-object: serviceToCcdCaseType

0 commit comments

Comments
 (0)