Merge pull request #197 from hmcts/nfdiv-4455-retain-and-dispose-migration

[NFDIV-4455] Retain and dispose TTL migration

Author: adamg-hmcts

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

@@ -20,9 +20,9 @@
 @Slf4j
 @Component
 public class CaseMigrationProcessor {
-    private static final String EVENT_ID = "system-migrate-organisation-policies";
-    private static final String EVENT_SUMMARY = "Data Migration - Set default organisation policies for NoC";
-    private static final String EVENT_DESCRIPTION = "Data Migration - Set default organisation policies for NoC";
+    private static final String EVENT_ID = "system-set-ttl";
+    private static final String EVENT_SUMMARY = "Data Migration - Set retain and dispose time to live";
+    private static final String EVENT_DESCRIPTION = "Data Migration - Set retain and dispose time to live";
     public static final String LOG_STRING = "-----------------------------------------";
 
     @Autowired

src/main/java/uk/gov/hmcts/reform/migration/ccd/CoreCaseDataService.java

@@ -54,7 +54,7 @@ public CaseDetails update(String authorisation, String eventId,
                     .summary(eventSummary)
                     .description(eventDescription)
                     .build()
-            ).data(dataMigrationService.migrate(updatedCaseDetails.getData()))
+            ).data(dataMigrationService.migrate(updatedCaseDetails))
             .build();
 
         return coreCaseDataApi.submitEventForCaseWorker(

src/main/java/uk/gov/hmcts/reform/migration/query/ElasticSearchQuery.java

@@ -9,71 +9,22 @@ public class ElasticSearchQuery {
         {
           "query": {
             "bool": {
-              "must_not": [
+              "must": [
                 {
                   "terms": {
-                    "state.keyword": [
-                      "Draft",
-                      "AwaitingApplicant1Response",
-                      "AwaitingApplicant2Response",
-                      "Applicant2Approved",
-                      "AwaitingPayment",
-                      "AwaitingHWFDecision",
-                      "Withdrawn",
-                      "Archived",
-                      "Rejected",
-                      "NewPaperCase",
-                      "FinalOrderComplete"
-                    ]
-                  }
-                }
-              ],
-              "should": [
-                {
-                  "bool": {
-                    "must_not":
-                      { "exists": {
-                        "field": "data_classification.applicant1SolicitorOrganisationPolicy.value.Organisation"
-                      }
-                    }
-                  }
-                },
-                {
-                  "bool": {
-                    "must_not":
-                      { "exists": {
-                        "field": "data_classification.applicant2SolicitorOrganisationPolicy.value.Organisation"
-                      }
-                    }
-                  }
-                },
-                {
-                  "bool": {
-                    "must_not": [
-                      { "match": {
-                        "data.applicant1SolicitorOrganisationPolicy.OrgPolicyCaseAssignedRole": "[APPONESOLICITOR]"
-                      } }
-                    ]
-                  }
-                },
-                {
-                  "bool": {
-                    "must_not": [
-                      { "match": {
-                        "data.applicant2SolicitorOrganisationPolicy.OrgPolicyCaseAssignedRole": "[APPTWOSOLICITOR]"
-                      } }
-                    ]
+                    "state.keyword": ["Draft"]
                   }
                 }
               ],
-              "minimum_should_match": 1
+              "must_not": [
+                  { "exists": { "field": "data.TTL" } }
+              ]
             }
           },
           "_source": [
             "reference",
             "state",
-            "data.applicant1SolicitorOrganisationPolicy",
-            "data.applicant2SolicitorOrganisationPolicy"
+            "data.TTL"
           ],
           "size": %s,
           "sort": [

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

@@ -2,11 +2,10 @@
 
 import uk.gov.hmcts.reform.ccd.client.model.CaseDetails;
 
-import java.util.Map;
 import java.util.function.Predicate;
 
 public interface DataMigrationService<T> {
     Predicate<CaseDetails> accepts();
 
-    T migrate(Map<String, Object> data);
+    T migrate(CaseDetails details);
 }

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

@@ -1,70 +1,36 @@
 package uk.gov.hmcts.reform.migration.service;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import uk.gov.hmcts.ccd.sdk.type.Organisation;
-import uk.gov.hmcts.ccd.sdk.type.OrganisationPolicy;
 import uk.gov.hmcts.reform.ccd.client.model.CaseDetails;
-import uk.gov.hmcts.reform.domain.model.UserRole;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.HashMap;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Predicate;
 
 @Service
 public class DataMigrationServiceImpl implements DataMigrationService<Map<String, Object>> {
-
-    private final String applicant1OrganisationPolicyKey = "applicant1SolicitorOrganisationPolicy";
-    private final String applicant2OrganisationPolicyKey = "applicant2SolicitorOrganisationPolicy";
-    private final ObjectMapper objectMapper;
-
-    @Autowired
-    public DataMigrationServiceImpl(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
-    }
-
     @Override
     public Predicate<CaseDetails> accepts() {
         return caseDetails -> caseDetails == null ? false : true;
     }
 
     @Override
-    public Map<String, Object> migrate(Map<String, Object> caseData) {
-        if (caseData == null) {
+    public Map<String, Object> migrate(CaseDetails details) {
+        if (details == null || details.getData() == null) {
             return null;
         }
 
-        setOrgPolicy(caseData, applicant1OrganisationPolicyKey, UserRole.APPLICANT_1_SOLICITOR);
-        setOrgPolicy(caseData, applicant2OrganisationPolicyKey, UserRole.APPLICANT_2_SOLICITOR);
-
-        return caseData;
-    }
-
-    private void setOrgPolicy(Map<String, Object> caseData, String orgPolicyKey, UserRole solRole) {
-        OrganisationPolicy<UserRole> orgPolicy = getOrInitializeOrgPolicy(caseData, orgPolicyKey);
-
-        if (orgPolicy.getOrganisation() != null && orgPolicy.getOrgPolicyCaseAssignedRole() == solRole) {
-            return;
-        }
-
-        setDefaultOrgPolicyFields(orgPolicy, solRole);
-
-        caseData.put(orgPolicyKey, orgPolicy);
-    }
-
-    @SuppressWarnings("unchecked")
-    private OrganisationPolicy<UserRole> getOrInitializeOrgPolicy(Map<String, Object> data, String orgPolicyKey) {
-        return objectMapper.convertValue(Optional.ofNullable(data.get(orgPolicyKey))
-            .orElseGet(OrganisationPolicy::new), OrganisationPolicy.class);
-    }
+        Map<String, Object> ttlMap = new HashMap<>();
+        LocalDate deleteDate = details.getLastModified().plusMonths(6).toLocalDate();
+        ttlMap.put("Suspended", "No");
+        ttlMap.put("OverrideTTL", null);
+        ttlMap.put("SystemTTL", deleteDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
 
-    private void setDefaultOrgPolicyFields(OrganisationPolicy<UserRole> organisationPolicy, UserRole solicitorRole) {
-        organisationPolicy.setOrgPolicyCaseAssignedRole(solicitorRole);
+        Map<String, Object> caseData = details.getData();
+        caseData.put("TTL", ttlMap);
 
-        organisationPolicy.setOrganisation(
-            Optional.ofNullable(organisationPolicy.getOrganisation())
-                .orElse(new Organisation(null, null))
-        );
+        return caseData;
     }
 }

src/test/java/uk/gov/hmcts/reform/migration/CaseMigrationProcessorTest.java

@@ -29,9 +29,9 @@
 public class CaseMigrationProcessorTest {
 
     private static final String USER_TOKEN = "Bearer eeeejjjttt";
-    private static final String EVENT_ID = "system-migrate-organisation-policies";
-    private static final String EVENT_SUMMARY = "Data Migration - Set default organisation policies for NoC";
-    private static final String EVENT_DESCRIPTION = "Data Migration - Set default organisation policies for NoC";
+    private static final String EVENT_ID = "system-set-ttl";
+    private static final String EVENT_SUMMARY = "Data Migration - Set retain and dispose time to live";
+    private static final String EVENT_DESCRIPTION = "Data Migration - Set retain and dispose time to live";
     private static final String CASE_TYPE = "Test_Case_Type";
 
     @InjectMocks

src/test/java/uk/gov/hmcts/reform/migration/ccd/CoreCaseDataServiceTest.java

@@ -111,7 +111,7 @@ private void setupMocks(UserDetails userDetails, Map<String, Object> data) {
             .caseDetails(caseDetails)
             .build();
 
-        when(dataMigrationService.migrate(data))
+        when(dataMigrationService.migrate(caseDetails))
             .thenReturn(data);
 
         when(coreCaseDataApi.startEventForCaseWorker(AUTH_TOKEN, AUTH_TOKEN, "30",