Merge pull request #226 from CodeForPhilly/update-custom-check-form-keys

feat: Updated Custom Checks to accept inputs from the FormEditor that begin with 'custom.'

Author: Michael-Dratch

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

@@ -87,7 +87,7 @@ public Response evaluatePublishedScreener(
     public Response evaluateScreener(
         @Context SecurityIdentity identity,
         @QueryParam("screenerId") String screenerId,
-        Map<String, Object> inputData
+        Map<String, Object> formData
     ) throws Exception {
         // Authorize user and get benefit
         String userId = AuthUtils.getUserId(identity);
@@ -111,7 +111,7 @@ public Response evaluateScreener(
             //TODO: consider ways of processing benefits in parallel
             for (Benefit benefit : benefits) {
                 // Evaluate benefit
-                Map<String, Object> benefitResults = evaluateBenefit(benefit, inputData);
+                Map<String, Object> benefitResults = evaluateBenefit(benefit, formData);
                 screenerResults.put(benefit.getId(), benefitResults);
             }
             return Response.ok().entity(screenerResults).build();
@@ -121,8 +121,8 @@ public Response evaluateScreener(
         }
     }
 
-    private Map<String, Object> evaluateBenefit(Benefit benefit, Map<String, Object> inputData) throws Exception {
-        if (benefit.getPublic()){
+    private Map<String, Object> evaluateBenefit(Benefit benefit, Map<String, Object> formData) throws Exception {
+        if (benefit.getPublic()) {
             // Public benefit, call the Library API to evaluate
             Map<String, Object> result = new HashMap<>();
             return result;
@@ -138,10 +138,14 @@ private Map<String, Object> evaluateBenefit(Benefit benefit, Map<String, Object>
                 if (isLibraryCheck(checkConfig)){
                     EligibilityCheck check = libraryApi.getById(checkConfig.getCheckId());
                     String path = check.getPath();
-                    evaluationResult = libraryApi.evaluateCheck(checkConfig, path, inputData);
+                    evaluationResult = libraryApi.evaluateCheck(checkConfig, path, formData);
                 } else {
+                    Map<String, Object> customFormValues = (Map<String, Object>) formData.get("custom");
+                    if (customFormValues == null) {
+                        customFormValues = new HashMap<String, Object>();
+                    }
                     evaluationResult = dmnService.evaluateDmn(
-                            dmnFilepath, checkConfig.getCheckName(), inputData, checkConfig.getParameters()
+                        dmnFilepath, checkConfig.getCheckName(), customFormValues, checkConfig.getParameters()
                     );
                 }
                 resultsList.add(evaluationResult);
@@ -178,7 +182,7 @@ private Map<String, Object> evaluateBenefit(Benefit benefit, Map<String, Object>
     @Path("/decision/working-check")
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
-    public Response evaluateCheck(
+    public Response evaluateCustomCheck(
         @Context SecurityIdentity identity,
         @QueryParam("checkId") String checkId,
         EvaluateCheckRequest request

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

@@ -32,81 +32,6 @@ public class EligibilityCheckResource {
     @Inject
     DmnService dmnService;
 
-    @GET
-    @Path("/checks")
-    public Response getPublicChecks(@Context SecurityIdentity identity) {
-        String userId = AuthUtils.getUserId(identity);
-        if (userId == null) {
-            return Response.status(Response.Status.UNAUTHORIZED).build();
-        }
-        Log.info("Fetching all eligibility checks. User:  " + userId);
-        List<EligibilityCheck> checks = eligibilityCheckRepository.getPublicChecks();
-
-        return Response.ok(checks, MediaType.APPLICATION_JSON).build();
-    }
-
-    @GET
-    @Path("/checks/{checkId}")
-    public Response getPublicCheck(@Context SecurityIdentity identity, @PathParam("checkId") String checkId) {
-        String userId = AuthUtils.getUserId(identity);
-        if (userId == null){
-            return Response.status(Response.Status.UNAUTHORIZED).build();
-        }
-        Log.info("Fetching all eligibility checks. User:  " + userId);
-        Optional<EligibilityCheck> checkOpt = eligibilityCheckRepository.getPublicCheck(checkId);
-
-        if (checkOpt.isEmpty()){
-            return Response.status(Response.Status.NOT_FOUND).build();
-        }
-
-        EligibilityCheck check = checkOpt.get();
-
-        if (!check.getPublic() && !check.getOwnerId().equals(userId)){
-            return Response.status(Response.Status.UNAUTHORIZED).build();
-        }
-        return Response.ok(check, MediaType.APPLICATION_JSON).build();
-    }
-
-    // Utility endpoint, public checks come from the Library API schema and shouldn't usually be created through the app
-    @POST
-    @Path("/checks")
-    public Response createPublicCheck(@Context SecurityIdentity identity,
-                                EligibilityCheck newCheck) {
-        String userId = AuthUtils.getUserId(identity);
-
-        // TODO: Add validations for user provided data
-        newCheck.setOwnerId(userId);
-        newCheck.setPublic(true);
-        newCheck.setVersion(0);
-        try {
-            String checkId = eligibilityCheckRepository.savePublicCheck(newCheck);
-            return Response.ok(newCheck, MediaType.APPLICATION_JSON).build();
-        } catch (Exception e){
-            return  Response.status(Response.Status.INTERNAL_SERVER_ERROR)
-                    .entity(Map.of("error", "Could not save Check"))
-                    .build();
-        }
-    }
-
-    // Utility endpoint, public checks are static and come from the library api schema
-    // and usually should not be updated through the app
-    @PUT
-    @Path("/checks")
-    public Response updatePublicCheck(@Context SecurityIdentity identity,
-                                EligibilityCheck updateCheck){
-        String userId = AuthUtils.getUserId(identity);
-
-        // TODO: Add authorization to update check
-        try {
-            eligibilityCheckRepository.savePublicCheck(updateCheck);
-            return Response.ok().entity(updateCheck).build();
-        } catch (Exception e){
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR)
-                    .entity(Map.of("error", "could not update Check"))
-                    .build();
-        }
-    }
-
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Path("/save-check-dmn")

builder-api/src/main/java/org/acme/service/KieDmnService.java

@@ -170,7 +170,10 @@ public EvaluationResult evaluateDmn(
         // Prepare model and context using inputs
         DMNModel dmnModel = dmnModels.get(0);
         DMNContext context = dmnRuntime.newContext();
-        context.set("inputs", inputs);
+
+        for (Map.Entry<String, Object> input : inputs.entrySet()) {
+            context.set(input.getKey(), input.getValue());
+        }
         context.set("parameters", parameters);
         DMNResult dmnResult = dmnRuntime.evaluateAll(dmnModel, context);
 

builder-frontend/src/api/check.ts

@@ -21,7 +21,8 @@ export const fetchPublicChecks = async (): Promise<EligibilityCheck[]> => {
     return data;
   } catch (error) {
     console.error("Error fetching checks:", error);
-    throw error; // rethrow so you can handle it in your component if needed
+    // TODO: handle error appropriately
+    return [];
   }
 };