removed working and published ids functions from EligibilityCheck

Author: Michael-Dratch

builder-api/src/main/java/org/acme/controller/EligibilityCheckResource.java

@@ -14,7 +14,6 @@
 import org.acme.persistence.EligibilityCheckRepository;
 import org.acme.persistence.StorageService;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -217,7 +216,7 @@ public Response createCustomCheck(@Context SecurityIdentity identity,
         newCheck.setPublic(false);
         newCheck.setVersion(1);
         try {
-            eligibilityCheckRepository.saveWorkingCustomCheck(newCheck);
+            eligibilityCheckRepository.saveNewWorkingCustomCheck(newCheck);
             return Response.ok(newCheck, MediaType.APPLICATION_JSON).build();
         } catch (Exception e){
             return  Response.status(Response.Status.INTERNAL_SERVER_ERROR)
@@ -274,17 +273,15 @@ public Response publishCustomCheck(@Context SecurityIdentity identity, @PathPara
         }
 
         // Create new published custom check
-        check.setId(check.getPublishedId());
         try {
             // save published check meta data document
-            eligibilityCheckRepository.savePublishedCustomCheck(check);
+            String publishedCheckId = eligibilityCheckRepository.saveNewPublishedCustomCheck(check);
 
             // save published check DMN to storage
-            Optional<String> workingDmnOpt = storageService.getStringFromStorage(storageService.getCheckDmnModelPath(userId, check.getWorkingId()));
+            Optional<String> workingDmnOpt = storageService.getStringFromStorage(storageService.getCheckDmnModelPath(userId, check.getId()));
             if (workingDmnOpt.isPresent()){
                 String workingDmn = workingDmnOpt.get();
-                storageService.writeStringToStorage(storageService.getCheckDmnModelPath(userId, check.getPublishedId()), workingDmn, "application/xml");
-
+                storageService.writeStringToStorage(storageService.getCheckDmnModelPath(userId, publishedCheckId), workingDmn, "application/xml");
             }
         } catch (Exception e){
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR)

builder-api/src/main/java/org/acme/model/domain/EligibilityCheck.java

@@ -21,14 +21,6 @@ public class EligibilityCheck {
     @JsonProperty("isPublic")
     private Boolean isPublic;
 
-    public String getWorkingId() {
-        return CheckStatus.WORKING.getCode() + "-" + ownerId + "-" + module + "-" + name;
-    }
-
-    public String getPublishedId() {
-        return CheckStatus.PUBLISHED.getCode() + "-" + ownerId + "-" + module + "-" + name + "-" + version.toString();
-    }
-
     public String getId() {
         return this.id;
     }

builder-api/src/main/java/org/acme/persistence/EligibilityCheckRepository.java

@@ -22,9 +22,9 @@ public interface EligibilityCheckRepository {
 
     Optional<EligibilityCheck> getPublishedCustomCheck(String userId, String checkId);
 
-    String saveWorkingCustomCheck(EligibilityCheck check) throws Exception;
+    String saveNewWorkingCustomCheck(EligibilityCheck check) throws Exception;
 
-    String savePublishedCustomCheck(EligibilityCheck check) throws Exception;
+    String saveNewPublishedCustomCheck(EligibilityCheck check) throws Exception;
 
     void updateWorkingCustomCheck(EligibilityCheck check) throws Exception;
 

builder-api/src/main/java/org/acme/persistence/impl/EligibilityCheckRepositoryImpl.java

@@ -6,6 +6,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
+import org.acme.constants.CheckStatus;
 import org.acme.constants.CollectionNames;
 import org.acme.constants.FieldNames;
 import org.acme.model.domain.Benefit;
@@ -107,39 +108,48 @@ private Optional<EligibilityCheck> getCustomCheck(String userId, String checkId,
         return Optional.of(check);
     }
 
-    public String saveWorkingCustomCheck(EligibilityCheck check) throws Exception{
+    public String saveNewWorkingCustomCheck(EligibilityCheck check) throws Exception{
+        String checkId = getWorkingId(check);
+        check.setId(checkId);
         ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
         Map<String, Object> data = mapper.convertValue(check, Map.class);
-        String checkDocId = check.getWorkingId();
-        return FirestoreUtils.persistDocumentWithId(CollectionNames.WORKING_CUSTOM_CHECK_COLLECTION, checkDocId, data);
+        return FirestoreUtils.persistDocumentWithId(CollectionNames.WORKING_CUSTOM_CHECK_COLLECTION, checkId, data);
     }
 
     public void updateWorkingCustomCheck(EligibilityCheck check) throws Exception{
         ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
         Map<String, Object> data = mapper.convertValue(check, Map.class);
-        String checkDocId = check.getWorkingId();
-        FirestoreUtils.updateDocument(CollectionNames.WORKING_CUSTOM_CHECK_COLLECTION, data, checkDocId);
+        FirestoreUtils.updateDocument(CollectionNames.WORKING_CUSTOM_CHECK_COLLECTION, data, check.getId());
     }
 
-    public String savePublishedCustomCheck(EligibilityCheck check) throws Exception{
+    public String saveNewPublishedCustomCheck(EligibilityCheck check) throws Exception{
+        check.setId(getPublishedId(check));
         ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
         Map<String, Object> data = mapper.convertValue(check, Map.class);
-        String checkDocId = check.getPublishedId();
+        String checkDocId = getPublishedId(check);
         return FirestoreUtils.persistDocumentWithId(CollectionNames.PUBLISHED_CUSTOM_CHECK_COLLECTION, checkDocId, data);
     }
 
 
     public void updatePublishedCustomCheck(EligibilityCheck check) throws Exception{
         ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
         Map<String, Object> data = mapper.convertValue(check, Map.class);
-        String checkDocId = check.getPublishedId();
-        FirestoreUtils.updateDocument(CollectionNames.PUBLISHED_CUSTOM_CHECK_COLLECTION, data, checkDocId);
+        FirestoreUtils.updateDocument(CollectionNames.PUBLISHED_CUSTOM_CHECK_COLLECTION, data, check.getId());
     }
 
     public String savePublicCheck(EligibilityCheck check) throws Exception{
+        String checkId = getPublishedId(check);
+        check.setId(checkId);
         ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);
         Map<String, Object> data = mapper.convertValue(check, Map.class);
-        String checkDocId = check.getPublishedId();
-        return FirestoreUtils.persistDocumentWithId(CollectionNames.PUBLIC_CHECK_COLLECTION, checkDocId, data);
+        return FirestoreUtils.persistDocumentWithId(CollectionNames.PUBLIC_CHECK_COLLECTION, checkId , data);
+    }
+
+    public String getWorkingId(EligibilityCheck check) {
+        return CheckStatus.WORKING.getCode() + "-" + check.getOwnerId() + "-" + check.getModule() + "-" + check.getName();
+    }
+
+    public String getPublishedId(EligibilityCheck check) {
+        return CheckStatus.PUBLISHED.getCode() + "-" + check.getOwnerId() + "-" + check.getModule() + "-" + check.getName() + "-" + check.getVersion().toString();
     }
 }