Update values/properties

build.gradle

@@ -188,7 +188,7 @@ dependencies {
   implementation group: 'org.springframework', name: 'spring-context-support'
   implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '1.0.2'
   implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '3.0.0'
-  implementation group: 'com.github.hmcts', name: 'core-case-data-store-client', version: '4.9.2'
+  implementation group: 'com.github.hmcts', name: 'core-case-data-store-client', version: '5.0.3'
   implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.13'
   implementation group: 'ch.qos.logback', name: 'logback-core', version: '1.2.13'
 

charts/adoption-cron-ccd-data-migration-tool/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: A Helm chart for ccd-migration App
 name: adoption-cron-ccd-data-migration-tool
 home: https://github.com/hmcts/ccd-case-migration-starter
-version: 0.1.0
+version: 0.1.1
 maintainers:
   - name: HMCTS ccd team
 dependencies:

charts/adoption-cron-ccd-data-migration-tool/values.yaml

@@ -14,7 +14,7 @@ job:
           alias: IDAM_USERNAME
         - name: idam-system-user-password
           alias: IDAM_PASSWORD
-        - name: idam-secret-cos-api
+        - name: idam-secret
           alias: IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET
         - name: s2s-secret-cos-api
           alias: DATA_STORE_IDAM_KEY
@@ -26,8 +26,8 @@ job:
     IDAM_API_URL: https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net
     CCD_DATA_STORE_API_BASE_URL: http://ccd-data-store-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     MIGRATION_QUERY_SIZE: 1000
-    IDAM_CLIENT_ID: adoption-cos-api
+    IDAM_CLIENT_ID: adoption-web
     DEFAULT_THREAD_LIMIT: 25
     DEFAULT_QUERY_SIZE: 100
-    MIGRATION_ID: DFPL-1124
+    MIGRATION_ID: ADOP-log
     ENABLED: false

src/main/java/uk/gov/hmcts/reform/migration/CaseMigrationProcessor.java

@@ -29,7 +29,7 @@
 @Slf4j
 @Component
 public class CaseMigrationProcessor {
-    public static final String EVENT_ID = "migrateCase";
+    public static final String EVENT_ID = "migrate-case";
     public static final String EVENT_SUMMARY = "Migrate Case";
     public static final String EVENT_DESCRIPTION = "Migrate Case";
     public static final String LOG_STRING = "-----------------------------------------";

src/main/java/uk/gov/hmcts/reform/migration/service/DataMigrationServiceImpl.java

@@ -29,19 +29,21 @@ public class DataMigrationServiceImpl implements DataMigrationService<Map<String
 
     public static final String COURT = "court";
     private final Map<String, Function<Map<String, Object>, Map<String, Object>>> migrations = Map.of(
-        "ADOP-log", this::triggerOnlyMigration
+        "ADOP-log", this::triggerOnlyMigration,
+        "ADOP-test", this::triggerOnlyMigration
         );
 
     private final Map<String, EsQuery> queries = Map.of(
-        "ADOP-1234", this.closedCases()
+        "ADOP-log", this.casesInState("Draft"),
+        "ADOP-test", this.casesInState("Draft")
     );
 
-    private EsQuery closedCases() {
-        final MatchQuery closedState = MatchQuery.of("state", "CLOSED");
+    private EsQuery casesInState(String state) {
+        final MatchQuery matchState = MatchQuery.of("state", state);
 
         return BooleanQuery.builder()
             .must(Must.builder()
-                .clauses(List.of(closedState))
+                .clauses(List.of(matchState))
                 .build())
             .build();
     }

src/main/resources/application.properties

@@ -2,12 +2,12 @@ spring.application.name=adoption-ccd-case-migration-tool
 spring.config.import=optional:configtree:/mnt/secrets/adoption/
 
 idam.api.url=${IDAM_API_URL:https://idam-api.aat.platform.hmcts.net/}
-idam.client.id=${IDAM_CLIENT_ID:adoption-cos-api}
+idam.client.id=${IDAM_CLIENT_ID:adoption-web}
 idam.client.secret=${IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET:ccd_gateway_secret}
 idam.client.redirect_uri=${IDAM_REDIRECT_URL:https://adoption-cos-api-aat.service.core-compute-aat.internal/oauth2/callback}
 
 idam.s2s-auth.url=${IDAM_S2S_URL:http://rpe-service-auth-provider-aat.service.core-compute-aat.internal/}
-idam.s2s-auth.microservice=adoption-cos-api
+idam.s2s-auth.microservice=adoption_cos_api
 idam.s2s-auth.totp_secret=${DATA_STORE_IDAM_KEY:AAAAAAAAAAAAAAAA}
 
 core_case_data.api.url=${CCD_DATA_STORE_API_BASE_URL:http://localhost:4452}
@@ -31,7 +31,7 @@ default.query.size=${DEFAULT_QUERY_SIZE:10}
 
 case-migration.elasticsearch.querySize= ${MIGRATION_QUERY_SIZE:100}
 case-migration.processing.limit= ${MIGRATION_CASE_LIMIT:500}
-case-migration.processing.id= ${MIGRATION_ID:DFPL-1124}
+case-migration.processing.id= ${MIGRATION_ID:ADOP-log}
 case-migration.enabled=${ENABLED:false}
 case-migration.timeout=${CASE_MIGRATION_TIMEOUT:7200}