Merge pull request #206 from CodeForPhilly/customize-benefits-update

Michael-Dratch · web-flow · commit 3f0dd7f65a1f · 2025-11-20T17:13:45.000-05:00
diff --git a/builder-api/src/main/java/org/acme/controller/DecisionResource.java b/builder-api/src/main/java/org/acme/controller/DecisionResource.java
@@ -127,19 +127,22 @@ private Map<String, Object> evaluateBenefit(Benefit benefit, Map<String, Object>
             List<OptionalBoolean> checkResultsList = new ArrayList<>();
             Map<String, Object> checkResults = new HashMap<>();
 
+            int checkNum = 0;
             for (CheckConfig checkConfig : benefit.getChecks()) {
                 String dmnFilepath = storageService.getCheckDmnModelPath(checkConfig.getCheckId());
-                OptionalBoolean result = dmnService.evaluateSimpleDmn(
-                        dmnFilepath, checkConfig.getCheckName(), inputData, checkConfig.getParameters()
+                OptionalBoolean result = dmnService.evaluateDmn(
+                    dmnFilepath, checkConfig.getCheckName(), inputData, checkConfig.getParameters()
                 );
                 checkResultsList.add(result);
-                checkResults.put(checkConfig.getCheckId(), Map.of("name", checkConfig.getCheckName(), "result", result));
+
+                String uniqueCheckKey = checkConfig.getCheckId() + checkNum;
+                checkResults.put(uniqueCheckKey, Map.of("name", checkConfig.getCheckName(), "result", result));
+                checkNum += 1;
             }
 
             // Determine overall Benefit result
             Boolean allChecksTrue = checkResultsList.stream().allMatch(result -> result == OptionalBoolean.TRUE);
             Boolean anyChecksFalse = checkResultsList.stream().anyMatch(result -> result == OptionalBoolean.FALSE);
-            Log.info("All True: " + allChecksTrue + " Any False: " + anyChecksFalse);
 
             OptionalBoolean benefitResult;
             if (allChecksTrue) {
@@ -151,11 +154,11 @@ private Map<String, Object> evaluateBenefit(Benefit benefit, Map<String, Object>
             }
 
             return new HashMap<String, Object>(
-                    Map.of(
-                            "name", benefit.getName(),
-                            "result", benefitResult,
-                            "check_results", checkResults
-                    )
+                Map.of(
+                    "name", benefit.getName(),
+                    "result", benefitResult,
+                    "check_results", checkResults
+                )
             );
         }
     }
@@ -188,10 +191,9 @@ public Response evaluateCheck(
 
         try {
             String dmnFilepath = storageService.getCheckDmnModelPath(check.getId());
-            String dmnModelName = check.getId();
 
-            OptionalBoolean result = dmnService.evaluateSimpleDmn(
-                dmnFilepath, dmnModelName, request.inputData, request.checkConfig.getParameters()
+            OptionalBoolean result = dmnService.evaluateDmn(
+                dmnFilepath, request.checkConfig.getCheckName(), request.inputData, request.checkConfig.getParameters()
             );
             return Response.ok().entity(Map.of("result", result)).build();
         } catch (Exception e) {
diff --git a/builder-api/src/main/java/org/acme/controller/EligibilityCheckResource.java b/builder-api/src/main/java/org/acme/controller/EligibilityCheckResource.java
@@ -72,7 +72,7 @@ public Response createPublicCheck(@Context SecurityIdentity identity,
         // TODO: Add validations for user provided data
         newCheck.setOwnerId(userId);
         newCheck.setPublic(true);
-        newCheck.setVersion(1);
+        newCheck.setVersion(0);
         try {
             String checkId = eligibilityCheckRepository.savePublicCheck(newCheck);
             return Response.ok(newCheck, MediaType.APPLICATION_JSON).build();
@@ -152,7 +152,10 @@ public Response updateCheckDmn(@Context SecurityIdentity identity, SaveDmnReques
     // then all the working check objects owned by the user are returned
     @GET
     @Path("/custom-checks")
-    public Response getCustomChecks(@Context SecurityIdentity identity, @QueryParam("working") Boolean working) {
+    public Response getCustomChecks(
+        @Context SecurityIdentity identity,
+        @QueryParam("working") Boolean working
+    ) {
         String userId = AuthUtils.getUserId(identity);
         if (userId == null) {
             return Response.status(Response.Status.UNAUTHORIZED).build();
@@ -165,7 +168,7 @@ public Response getCustomChecks(@Context SecurityIdentity identity, @QueryParam(
             checks = eligibilityCheckRepository.getWorkingCustomChecks(userId);
         } else {
             Log.info("Fetching all published custom checks. User:  " + userId);
-            checks = eligibilityCheckRepository.getPublishedCustomChecks(userId);
+            checks = eligibilityCheckRepository.getLatestVersionPublishedCustomChecks(userId);
         }
 
         return Response.ok(checks, MediaType.APPLICATION_JSON).build();
@@ -214,7 +217,7 @@ public Response createCustomCheck(@Context SecurityIdentity identity,
         //TODO: Add validations for user provided data
         newCheck.setOwnerId(userId);
         newCheck.setPublic(false);
-        newCheck.setVersion(1);
+        newCheck.setVersion(0);
         try {
             eligibilityCheckRepository.saveNewWorkingCustomCheck(newCheck);
             return Response.ok(newCheck, MediaType.APPLICATION_JSON).build();
diff --git a/builder-api/src/main/java/org/acme/persistence/EligibilityCheckRepository.java b/builder-api/src/main/java/org/acme/persistence/EligibilityCheckRepository.java
@@ -18,6 +18,8 @@ public interface EligibilityCheckRepository {
 
     List<EligibilityCheck> getPublishedCheckVersions(EligibilityCheck workingCustomCheck);
 
+    List<EligibilityCheck> getLatestVersionPublishedCustomChecks(String userId);
+
     List<EligibilityCheck> getPublishedCustomChecks(String userId);
 
     Optional<EligibilityCheck> getWorkingCustomCheck(String userId, String checkId);
diff --git a/builder-api/src/main/java/org/acme/persistence/impl/EligibilityCheckRepositoryImpl.java b/builder-api/src/main/java/org/acme/persistence/impl/EligibilityCheckRepositoryImpl.java
@@ -81,6 +81,17 @@ public List<EligibilityCheck> getPublishedCustomChecks(String userId){
         return checkMaps.stream().map(checkMap -> mapper.convertValue(checkMap, EligibilityCheck.class)).toList();
     }
 
+    public List<EligibilityCheck> getLatestVersionPublishedCustomChecks(String userId) {
+        List<EligibilityCheck> publishedChecks = getPublishedCustomChecks(userId);
+        Map<String, EligibilityCheck> latestVersionMap = publishedChecks.stream()
+            .collect(java.util.stream.Collectors.toMap(
+                check -> getPublishedPrefix(check),
+                check -> check,
+                (check1, check2) -> check1.getVersion() > check2.getVersion() ? check1 : check2
+            ));
+        return new ArrayList<>(latestVersionMap.values());
+    }
+
     public List<EligibilityCheck> getPublishedCheckVersions(EligibilityCheck workingCustomCheck){
         Map<String, String> fieldValues = Map.of(
             "ownerId", workingCustomCheck.getOwnerId(),
diff --git a/builder-api/src/main/java/org/acme/service/DmnService.java b/builder-api/src/main/java/org/acme/service/DmnService.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 
 public interface DmnService {
-    public OptionalBoolean evaluateSimpleDmn(
+    public OptionalBoolean evaluateDmn(
         String dmnFilePath,
         String dmnModelName,
         Map<String, Object> inputs,
diff --git a/builder-api/src/main/java/org/acme/service/KieDmnService.java b/builder-api/src/main/java/org/acme/service/KieDmnService.java
@@ -83,7 +83,7 @@ private byte[] compileDmnModel(String dmnXml, Map<String, String> dependenciesMa
         return kieModuleBytes;
     }
 
-    public OptionalBoolean evaluateSimpleDmn(
+    public OptionalBoolean evaluateDmn(
         String dmnFilePath,
         String dmnModelName,
         Map<String, Object> inputs,
diff --git a/builder-frontend/src/api/check.ts b/builder-frontend/src/api/check.ts
@@ -143,12 +143,8 @@ export const saveCheckDmn = async (checkId: string, dmnModel: string) => {
 export const fetchUserDefinedChecks = async (
   working: boolean
 ): Promise<EligibilityCheck[]> => {
-  let url: string;
-  if (working) {
-    url = apiUrl + "/custom-checks?working=true";
-  } else {
-    url = apiUrl + "/custom-checks?working=false";
-  }
+  const workingQueryParam = working ? "true" : "false";
+  let url: string = apiUrl + `/custom-checks?working=${workingQueryParam}`;
 
   try {
     const response = await authFetch(url, {
diff --git a/builder-frontend/src/components/project/manageBenefits/configureBenefit/ConfigureBenefit.tsx b/builder-frontend/src/components/project/manageBenefits/configureBenefit/ConfigureBenefit.tsx
@@ -8,7 +8,7 @@ import BenefitResource from "./benefitResource";
 import { fetchPublicChecks, fetchUserDefinedChecks } from "@/api/check";
 
 import type { EligibilityCheckListMode } from "./EligibilityCheckListView";
-import type { EligibilityCheck } from "@/types";
+import type { EligibilityCheck, ParameterValues } from "@/types";
 
 const ConfigureBenefit = ({
   screenerId,
@@ -19,7 +19,7 @@ const ConfigureBenefit = ({
   benefitId: Accessor<string>;
   setBenefitId: (benefitId: string | null) => void;
 }) => {
-  const { benefit, actions, initialLoadStatus } = BenefitResource(
+  const { benefit, actions, actionInProgress, initialLoadStatus } = BenefitResource(
     screenerId,
     benefitId
   );
@@ -28,7 +28,7 @@ const ConfigureBenefit = ({
     createSignal<EligibilityCheckListMode>("public");
   const [publicChecks] = createResource<EligibilityCheck[]>(fetchPublicChecks);
   const [userDefinedChecks] = createResource<EligibilityCheck[]>(
-    fetchUserDefinedChecks
+    () => fetchUserDefinedChecks(false)
   );
 
   const getSelectedCheck = (checkId: string) => {
@@ -39,9 +39,13 @@ const ConfigureBenefit = ({
     return allChecks.find((check) => check.id === checkId);
   };
 
+  const onRemoveEligibilityCheck = (checkIndexToRemove: number) => {
+    actions.removeCheck(checkIndexToRemove);
+  };
+
   return (
     <>
-      <Show when={initialLoadStatus.loading()}>
+      <Show when={initialLoadStatus.loading() || actionInProgress()}>
         <Loading />
       </Show>
 
@@ -69,13 +73,11 @@ const ConfigureBenefit = ({
               class="flex-3 border-2 border-gray-200 rounded-lg h-min"
             >
               <EligibilityCheckListView
-                benefit={benefit}
                 mode={checkListMode}
                 setMode={setCheckListMode}
                 publicChecks={publicChecks}
                 userDefinedChecks={userDefinedChecks}
                 addCheck={actions.addCheck}
-                removeCheck={actions.removeCheck}
               />
             </div>
             <div id="selected-eligibility-checks" class="flex-2">
@@ -98,9 +100,13 @@ const ConfigureBenefit = ({
                           <SelectedEligibilityCheck
                             check={getSelectedCheck(checkConfig.checkId)}
                             checkConfig={() => checkConfig}
-                            checkIndex={checkIndex()}
+                            onRemove={() =>
+                              onRemoveEligibilityCheck(checkIndex())
+                            }
                             updateCheckConfigParams={
-                              actions.updateCheckConfigParams
+                              (newCheckData: ParameterValues) => {
+                                actions.updateCheckConfigParams(checkIndex(), newCheckData);
+                              }
                             }
                           />
                         </Show>
diff --git a/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx b/builder-frontend/src/components/project/manageBenefits/configureBenefit/EligibilityCheckListView.tsx
@@ -1,6 +1,9 @@
 import { Accessor, For, Resource, Setter } from "solid-js";
 
-import type { Benefit, CheckConfig, EligibilityCheck } from "@/types";
+import { titleCase } from "@/utils/title_case";
+
+import type { CheckConfig, EligibilityCheck } from "@/types";
+
 
 export type EligibilityCheckListMode = "user-defined" | "public";
 interface CheckModeConfig {
@@ -33,17 +36,13 @@ const UserDefinedCheckConfig: CheckModeConfig = {
     - userDefinedChecks: resource containing the list of user-defined eligibility checks
 */
 const EligibilityCheckListView = ({
-  benefit,
   addCheck,
-  removeCheck,
   mode,
   setMode,
   publicChecks,
   userDefinedChecks,
 }: {
-  benefit: Accessor<Benefit>;
   addCheck: (newCheck: CheckConfig) => void;
-  removeCheck: (indexToRemove: number) => void;
   mode: Accessor<EligibilityCheckListMode>;
   setMode: Setter<EligibilityCheckListMode>;
   publicChecks: Resource<EligibilityCheck[]>;
@@ -53,23 +52,14 @@ const EligibilityCheckListView = ({
     mode() === "public" ? PublicCheckConfig : UserDefinedCheckConfig;
   const activeChecks: Accessor<Resource<EligibilityCheck[]>> = () =>
     mode() === "public" ? publicChecks : userDefinedChecks;
-  const onEligibilityCheckToggle = (check: EligibilityCheck) => {
-    const isCheckSelected = benefit().checks.some(
-      (selected) => selected.checkId === check.id
-    );
-    if (isCheckSelected) {
-      const checkIndexToRemove = benefit().checks.findIndex(
-        (selected) => selected.checkId === check.id
-      );
-      removeCheck(checkIndexToRemove);
-    } else {
-      const checkConfig: CheckConfig = {
-        checkId: check.id,
-        checkName: check.name,
-        parameters: {},
-      };
-      addCheck(checkConfig);
-    }
+
+  const onAddEligibilityCheck = (check: EligibilityCheck) => {
+    const checkConfig: CheckConfig = {
+      checkId: check.id,
+      checkName: check.name,
+      parameters: {},
+    };
+    addCheck(checkConfig);
   };
 
   return (
@@ -102,9 +92,10 @@ const EligibilityCheckListView = ({
       <table class="table-auto w-full mt-4 border-collapse">
         <thead>
           <tr>
-            <th class="eligibility-check-table-header">Select</th>
+            <th class="eligibility-check-table-header">Add</th>
             <th class="eligibility-check-table-header">Check Name</th>
             <th class="eligibility-check-table-header">Description</th>
+            <th class="eligibility-check-table-header">Version</th>
           </tr>
         </thead>
         <tbody>
@@ -126,8 +117,7 @@ const EligibilityCheckListView = ({
             {(check) => (
               <EligibilityCheckRow
                 check={check}
-                selectedCheckConfigs={benefit().checks}
-                onToggle={() => onEligibilityCheckToggle(check)}
+                onAdd={() => onAddEligibilityCheck(check)}
               />
             )}
           </For>
@@ -139,30 +129,19 @@ const EligibilityCheckListView = ({
 
 const EligibilityCheckRow = ({
   check,
-  selectedCheckConfigs,
-  onToggle,
+  onAdd,
 }: {
   check: EligibilityCheck;
-  selectedCheckConfigs: CheckConfig[];
-  onToggle: (check: EligibilityCheck) => void;
+  onAdd: (check: EligibilityCheck) => void;
 }) => {
-  const isCheckSelected = () =>
-    selectedCheckConfigs.some((selected) => selected.checkId === check.id);
-
   return (
     <tr>
       <td class="eligibility-check-table-cell border-top">
-        <input
-          class="form-checkbox rounded-sm"
-          type="checkbox"
-          checked={isCheckSelected()}
-          onChange={() => onToggle(check)}
-        />
-      </td>
-      <td class="eligibility-check-table-cell border-top">{check.name}</td>
-      <td class="eligibility-check-table-cell border-top">
-        {check.description}
+        <div class="btn-default btn-blue" onClick={() => onAdd(check)}>Add</div>
       </td>
+      <td class="eligibility-check-table-cell border-top">{titleCase(check.name)}</td>
+      <td class="eligibility-check-table-cell border-top">{check.description}</td>
+      <td class="eligibility-check-table-cell border-top">{check.version}</td>
     </tr>
   );
 };
diff --git a/builder-frontend/src/components/project/manageBenefits/configureBenefit/SelectedEligibilityCheck.tsx b/builder-frontend/src/components/project/manageBenefits/configureBenefit/SelectedEligibilityCheck.tsx
@@ -17,10 +17,11 @@ interface ParameterWithConfiguredValue {
 }
 
 const SelectedEligibilityCheck = (
-  { check, checkConfig, updateCheckConfigParams }:
+  { check, checkConfig, onRemove, updateCheckConfigParams }:
   {
     check: EligibilityCheck;
     checkConfig: Accessor<CheckConfig>;
+    onRemove: () => void;
     updateCheckConfigParams: (newCheckData: ParameterValues) => void
   }
 ) => {
@@ -44,11 +45,18 @@ const SelectedEligibilityCheck = (
           setConfiguringCheckModalOpen(true);
         }}
         class="
-          mb-4 p-4 cursor-pointer select-none
+          mb-4 p-4 cursor-pointer select-none relative
           border-2 border-gray-200 rounded-lg hover:bg-gray-200"
       >
+        <div
+          class="absolute px-2 top-2 right-2 hover:bg-gray-300 rounded-xl font-bold"
+          onClick={(e) => { e.stopPropagation(); onRemove(); }}
+        >
+          X
+        </div>
         <div class="text-xl font-bold mb-2">{titleCase(check.name)}</div>
         <div class="pl-2 [&:has(+div)]:mb-2">{check.description}</div>
+
         {check.inputs.length > 0 && (
           <div class="[&:has(+div)]:mb-2">
             <div class="text-lg font-bold pl-2">Inputs</div>
@@ -91,6 +99,7 @@ const SelectedEligibilityCheck = (
           </div>
         )}
       </div>
+      
       {configuringCheckModalOpen() && (
         <ConfigureCheckModal
           check={check}
diff --git a/builder-frontend/src/components/project/manageBenefits/configureBenefit/benefitResource.ts b/builder-frontend/src/components/project/manageBenefits/configureBenefit/benefitResource.ts
diff --git a/builder-frontend/src/components/project/manageBenefits/configureBenefit/modals/ConfigureCheckModal.tsx b/builder-frontend/src/components/project/manageBenefits/configureBenefit/modals/ConfigureCheckModal.tsx

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ private byte[] compileDmnModel(String dmnXml, Map<String, String> dependenciesMa`
`83`	`83`	`return kieModuleBytes;`
`84`	`84`	`}`
`85`	`85`
`86`		`- public OptionalBoolean evaluateSimpleDmn(`
	`86`	`+ public OptionalBoolean evaluateDmn(`
`87`	`87`	`String dmnFilePath,`
`88`	`88`	`String dmnModelName,`
`89`	`89`	`Map<String, Object> inputs,`