Merge pull request #200 from CodeForPhilly/check-lookup-fix

fix: updated check lookup to use Document ID instead of ID property

Author: Michael-Dratch

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

@@ -120,7 +120,6 @@ public static List<Map<String, Object>> getFirestoreDocsByIds(String collection,
 
     public static Optional<Map<String, Object>> getFirestoreDocById(String collection, String id) {
         try {
-
             DocumentSnapshot doc = db.collection(collection)
                     .document(id)
                     .get().get();
@@ -130,7 +129,6 @@ public static Optional<Map<String, Object>> getFirestoreDocById(String collectio
                 return Optional.empty();
             }
 
-
             Map<String, Object> data = doc.getData();
             data.put("id", doc.getId());
 

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

@@ -23,7 +23,6 @@ public interface StorageService {
 
     String getScreenerPublishedFormSchemaPath(String screenerId);
 
-
     String getCheckDmnModelPath(String userId, String checkId);
 
     String getCheckDmnModelPath(String userId, String module, String checkId, Integer version);

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

@@ -87,11 +87,11 @@ public Optional<EligibilityCheck> getPublishedCustomCheck(String userId, String
     private Optional<EligibilityCheck> getCustomCheck(String userId, String checkId, boolean isPublished){
         String collectionName = isPublished ? CollectionNames.PUBLISHED_CUSTOM_CHECK_COLLECTION : CollectionNames.WORKING_CUSTOM_CHECK_COLLECTION;
 
-        List<Map<String, Object>> checkMaps = FirestoreUtils.getFirestoreDocsByField(collectionName, FieldNames.ID, checkId);
-        if (checkMaps.isEmpty()){
+        Optional<Map<String, Object>> checkMap = FirestoreUtils.getFirestoreDocById(collectionName, checkId);
+        if (checkMap.isEmpty()){
             return Optional.empty();
         }
-        Map<String, Object> data = checkMaps.getFirst();
+        Map<String, Object> data = checkMap.get();
 
         ObjectMapper mapper = new ObjectMapper();
         EligibilityCheck check = mapper.convertValue(data, EligibilityCheck.class);