Merge pull request #152 from juanjemdIos/main

Get methods. Description and ID

Author: dgarijo

src/main/java/fair/Constants.java

@@ -44,9 +44,9 @@ public class Constants {
 
     public static final String OM42_URL = "https://w3id.org/foops/test/OM4.2";
 
-    public static final String OM5_1_URL = "https://w3id.org/foops/test/OM5_1";
+    public static final String OM5_1_URL = "https://w3id.org/foops/test/OM5.1";
 
-    public static final String OM5_2_URL = "https://w3id.org/foops/test/OM5_2";
+    public static final String OM5_2_URL = "https://w3id.org/foops/test/OM5.2";
 
     public static final String PURL1_URL = "https://w3id.org/foops/test/PURL1";
 
@@ -182,14 +182,14 @@ public class Constants {
     public static final String OM4_2_EXPLANATION_ERROR = "The license used could not be resolved";
 
     //provenance
-    public static final String OM5_1 = "OM5_1";
+    public static final String OM5_1 = "OM5.1";
     public static final String OM5_1_TITLE = "Basic provenance metadata";
     public static final String OM5_1_DESC = "This check verifies if basic provenance is available for the ontology: " +
             "[author, creation date]. This check also verifies whether [contributor, previous version] are present" +
             ", but with no penalty (as no all ontologies may have a previous version or a contributor)";
     public static final String OM5_1_EXPLANATION = "The following provenance information was not found: ";
 
-    public static final String OM5_2 = "OM5_2";
+    public static final String OM5_2 = "OM5.2";
     public static final String OM5_2_TITLE = "Detailed provenance metadata";
     public static final String OM5_2_DESC = "This check verifies if detailed provenance information is available " +
             "for the ontology: [issued date, publisher]";

src/main/java/fair/FOOPS.java

@@ -20,6 +20,8 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import entities.Check;
 import entities.checks.*;
 import entities.Ontology;
@@ -38,7 +40,8 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Optional;
-
+import java.util.HashMap;
+import java.util.Map;
 
 public class FOOPS {
     private static final Logger logger = LoggerFactory.getLogger(FOOPS.class);
@@ -90,22 +93,28 @@ public void fairTest(){
     * @param name Name test. 
     * @return ????????
     */
-    public Optional<Check> getTestByName(String name) {
-        logger.info("------ Get test -----");
-        // Gson gson = new GsonBuilder().
-        // excludeFieldsWithoutExposeAnnotation().
-        // setPrettyPrinting().
-        // create();
-        
-        // checks.forEach(check -> { 
-        //     logger.info("Objeto completo del check: " + check);       
-        //     String jsonCheck = gson.toJson(check);
-        //     logger.info("JSON completo del check: " + jsonCheck);   
-        // });
+    public Optional<Map<String, String>> getTestByName(String name) {
+   
+        Gson gson = new GsonBuilder()
+                .excludeFieldsWithoutExposeAnnotation()
+                .setPrettyPrinting()
+                .create();
+
         return checks.stream()
-                    .peek(check -> logger.info("Verificando check: " + check.getClass().getSimpleName()))
-                    .filter(check -> check.getClass().getSimpleName().equals(name))
-                    .findFirst();
+                .map(check -> {
+                    String jsonCheck = gson.toJson(check);
+                    JsonObject jsonObject = JsonParser.parseString(jsonCheck).getAsJsonObject();
+                    return jsonObject;
+                })
+                .filter(jsonObject -> jsonObject.get("abbreviation").getAsString().equals(name))
+                .map(jsonObject -> {
+                    Map<String, String> details = new HashMap<>();
+                    details.put("description", jsonObject.get("description").getAsString());
+                    details.put("id", jsonObject.get("id").getAsString());
+                    details.put("title", jsonObject.get("title").getAsString());
+                    return details;
+                })
+                .findFirst();
     }
     /**
     * In construction

src/main/java/server/FOOPSController.java

@@ -35,6 +35,9 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import java.util.Optional;
+import java.util.Map;
+import java.nio.file.Files;
+import java.util.HashMap;
 
 @RestController
 public class FOOPSController {
@@ -75,6 +78,7 @@ public String assessPOST(
         Response r = null;
         FOOPS f = null;
         Path ontologyPath = null;
+        
         try{
             try { //has an onto URI been provided?
                 Gson gson = new Gson();
@@ -135,25 +139,62 @@ public String assessPOST(
     public String testByNamePOST( 
         @ApiParam(value = "Name of test", required = true) 
         @RequestBody String body) {
-
+        
+        //hay que extraer el id del json del boy
+        // FOOPS f = null;
+        // Path ontologyPath = null;
+        // ontologyPath = Path.of("ontology");
+        // f = new FOOPS(String.valueOf(ontologyPath), true); 
+        // Optional<Check> check = f.getTestByName(name); 
         return "{ \"test\": \"Not found\" }"; 
+    
     }
 
     @ApiOperation(
-        value = "IN CONSTRUCTION: Test by name",
-        notes = "return JSON TEST obtained by FOOPS." 
+        value = "Test description by name",
+        notes = "return test description and id." 
         ) 
-    @GetMapping(path = "/test", produces = "application/json")
+    @GetMapping(path = "/test", produces = "text/plainn")
     public String testByNameGET( 
         @ApiParam(value = "Name of test", required = true) 
         @RequestParam String name) {
 
         FOOPS f = null;
         Path ontologyPath = null;
         ontologyPath = Path.of("ontology");
-        f = new FOOPS(String.valueOf(ontologyPath), true); 
-        Optional<Check> check = f.getTestByName(name); 
-        return "{ \"test\": \"" + (check.isPresent() ? check.get().toString() : "Not found") + "\" }"; 
+        Map<String, String> response = new HashMap<>();
+
+        try {
+            if (!Files.exists(ontologyPath)) {
+                logger.error("El archivo ontology no existe en la ubicación especificada: " + ontologyPath.toString());
+                // Proseguir sin cargar ontology
+                f = new FOOPS("default_url_or_empty_string", false); // Asume alguna URL por defecto o deja vacío
+            } else {
+                f = new FOOPS(String.valueOf(ontologyPath), true);
+            }
+        } catch (Exception e) {
+            logger.error("Error cargando la ontología: " + e.getMessage());
+            // Proseguir sin ontology
+            f = new FOOPS("default_url_or_empty_string", false);
+        }
+        Optional<Map<String, String>> testDetails = f.getTestByName(name); 
+
+        if (testDetails.isPresent()) {
+            Map<String, String> details = testDetails.get();
+            String description = details.get("description");
+            String id = details.get("id");
+            String title = details.get("title");
+
+            return "Test: " + name + "\n" +
+                   "Title: " + title + "\n" +
+                   "Description: " + description + "\n" +
+                   "Please send a POST request to obtain a JSON. Example:\n" +
+                   "curl -X POST \"https://foops.linkeddata.es/test/" + name + "\" -H \"accept: application/json; charset=UTF-8\" " +
+                   "-H \"Content-Type: application/json;charset=UTF-8\" -d " +
+                   "{ \"test\": \"" + id + "\" }";
+        } else {
+            return "Description not found about: " + name;
+        }
     }
 
     @ApiOperation(
@@ -165,24 +206,29 @@ public String benchmarkByNamePOST(
         @ApiParam(value = "Name of benchmark", required = true) 
         @RequestBody String body) {
 
+        // FOOPS f = null;
+        // Path ontologyPath = null;
+        // ontologyPath = Path.of("ontology");
+        // f = new FOOPS(String.valueOf(ontologyPath), true); 
+        // Optional<Check> check = f.getBenchmarkByName(name); 
         return "{ \"benchmark\": \"Not found\" }"; 
+
     }
 
     @ApiOperation(
-        value = "IN CONSTRUCTION: Benchmark by name",
-        notes = "return JSON BENCHMARK obtained by FOOPS." 
+        value = "IN CONSTRUCTION: Benchmark description by name",
+        notes = "return benchmark description and id." 
         ) 
     @GetMapping(path = "/benchmark", produces = "application/json") 
     public String benchmarkByNamePost( 
         @ApiParam(value = "Name of benchmark", required = true) 
         @RequestParam String name) {
 
-        FOOPS f = null;
-        Path ontologyPath = null;
-        ontologyPath = Path.of("ontology");
-        f = new FOOPS(String.valueOf(ontologyPath), true); 
-        Optional<Check> check = f.getBenchmarkByName(name); 
-        return "{ \"benchmark\": \"" + (check.isPresent() ? check.get().toString() : "Not found") + "\" }"; 
+        return "Please send a POST request. Example: " +
+        "curl -X POST \"https://foops.linkeddata.es/benchmark\" -H \"accept: application/json;" +
+        "charset=UTF-8\" " +
+        "-H \"Content-Type: application/json;charset=UTF-8\" -d " +
+        "\"{ \"benchmark\": \"https://w3id.org/foops/test/CN1\"}\"";
     }
     /**
      *