updated api urls in frontend

Author: Michael-Dratch

builder-api/src/main/java/org/acme/constants/CheckStatus.java

@@ -0,0 +1,18 @@
+package org.acme.constants;
+
+import org.apache.hc.client5.http.impl.auth.AuthCacheKeeper;
+
+public enum CheckStatus {
+    WORKING('W'),
+    PUBLISHED('P');
+
+    private final char code;
+
+    CheckStatus(char code) {
+        this.code = code;
+    }
+
+    public char getCode() {
+        return code;
+    }
+}

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

@@ -8,6 +8,7 @@
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
 import org.acme.auth.AuthUtils;
+import org.acme.constants.CheckStatus;
 import org.acme.model.domain.EligibilityCheck;
 import org.acme.model.dto.SaveDmnRequest;
 import org.acme.persistence.EligibilityCheckRepository;
@@ -134,7 +135,7 @@ public Response updateCheckDmn(@Context SecurityIdentity identity, SaveDmnReques
                     .build();
         }
         try {
-            String filePath = storageService.getCheckDmnModelPath(userId, check.getModule(), check.getId(), check.getVersion());
+            String filePath = storageService.getCheckDmnModelPath(userId, checkId);
             storageService.writeStringToStorage(filePath, dmnModel, "application/xml");
             Log.info("Saved DMN model of check " + checkId + " to storage");
 
@@ -174,15 +175,19 @@ public Response getCustomChecks(@Context SecurityIdentity identity, @QueryParam(
 
     @GET
     @Path("/custom-checks/{checkId}")
-    public Response getCustomCheck(@Context SecurityIdentity identity, @PathParam("checkId") String checkId,  @QueryParam("working") Boolean working) {
+    public Response getCustomCheck(@Context SecurityIdentity identity, @PathParam("checkId") String checkId) {
         String userId = AuthUtils.getUserId(identity);
         if (userId == null) {
             return Response.status(Response.Status.UNAUTHORIZED).build();
         }
 
+        char statusIndicator = (checkId != null && !checkId.isEmpty())
+                ? checkId.charAt(0)
+                : '\0';
+
         Optional<EligibilityCheck> checkOpt;
 
-        if (working != null && working){
+        if (statusIndicator == CheckStatus.WORKING.getCode()){
             Log.info("Fetching working custom check: " + checkId + " User:  " + userId);
             checkOpt = eligibilityCheckRepository.getWorkingCustomCheck(userId, userId);
         } else {

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

@@ -2,6 +2,8 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.acme.constants.CheckStatus;
+
 import java.util.List;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -19,8 +21,13 @@ public class EligibilityCheck {
     @JsonProperty("isPublic")
     private Boolean isPublic;
 
-    public String getId() {
-        return id;
+    public String getWorkingId() {
+        return CheckStatus.WORKING.getCode() + "-" + ownerId + "-" + module + "-" + name;
+    }
+
+    public String getPublishedId() {
+        return CheckStatus.PUBLISHED.getCode() + "-" + ownerId + "-" + module + "-" + name;
+
     }
 
     public void setId(String id) {

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

@@ -140,8 +140,8 @@ public String getScreenerPublishedFormSchemaPath(String screenerId){
     }
 
     @Override
-    public String getCheckDmnModelPath(String module, String checkId, String version){
-        return "check/" + module + "/" + checkId + "/" + version + "/" + checkId + ".dmn";
+    public String getCheckDmnModelPath(String userId, String checkId){
+        return "check/" + userId + "/" + checkId + ".dmn";
     }
 
     @Override

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

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

builder-frontend/src/api/check.ts

@@ -5,7 +5,7 @@ import type { EligibilityCheck } from "@/types";
 const apiUrl = import.meta.env.VITE_API_URL;
 
 export const fetchPublicChecks = async (): Promise<EligibilityCheck[]> => {
-  const url = apiUrl + "/check";
+  const url = apiUrl + "/checks";
   try {
     const response = await authFetch(url, {
       method: "GET",
@@ -28,7 +28,7 @@ export const fetchPublicChecks = async (): Promise<EligibilityCheck[]> => {
 export const fetchCheck = async (
   checkId: string
 ): Promise<EligibilityCheck> => {
-  const url = apiUrl + `/check/${checkId}`;
+  const url = apiUrl + `/checks/${checkId}`;
   try {
     const response = await authFetch(url, {
       method: "GET",
@@ -52,7 +52,7 @@ export const fetchCheck = async (
 export const fetchCustomCheck = async (
   checkId: string
 ): Promise<EligibilityCheck> => {
-  const url = apiUrl + `/account/check/${checkId}`;
+  const url = apiUrl + `/custom-checks/${checkId}`;
   try {
     const response = await authFetch(url, {
       method: "GET",
@@ -74,7 +74,7 @@ export const fetchCustomCheck = async (
 };
 
 export const addCheck = async (check: EligibilityCheck) => {
-  const url = apiUrl + "/account/check";
+  const url = apiUrl + "/custom-checks";
   try {
     const response = await authFetch(url, {
       method: "POST",
@@ -97,7 +97,7 @@ export const addCheck = async (check: EligibilityCheck) => {
 };
 
 export const updateCheck = async (check: EligibilityCheck) => {
-  const url = apiUrl + "/account/check";
+  const url = apiUrl + "/custom-checks";
   try {
     const response = await authFetch(url, {
       method: "PUT",
@@ -142,8 +142,16 @@ export const saveCheckDmn = async (checkId: string, dmnModel: string) => {
   }
 };
 
-export const fetchUserDefinedChecks = async (): Promise<EligibilityCheck[]> => {
-  const url = apiUrl + "/account/check";
+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";
+  }
+
   try {
     const response = await authFetch(url, {
       method: "GET",