Dev enhancement branch

RDF_Back/pom.xml → Backend/pom.xml

@@ -9,9 +9,9 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.uspn</groupId>
-    <artifactId>RDF_Back</artifactId>
+    <artifactId>Backend</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>RDF_Back</name>
+    <name>Backend</name>
     <description>RDF_Back</description>
     <url/>
     <licenses>
@@ -28,6 +28,9 @@
     </scm>
     <properties>
         <java.version>17</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
     </properties>
     <dependencies>
         <dependency>

Backend/src/main/java/fr/cnrs/lacito/fieldarchive/RdfBackApplication.java

@@ -0,0 +1,38 @@
+package fr.cnrs.lacito.fieldarchive;
+
+import fr.cnrs.lacito.fieldarchive.example.Example;
+import org.eclipse.rdf4j.spring.RDF4JConfig;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+
+@SpringBootApplication
+@Import(RDF4JConfig.class)
+public class RdfBackApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(RdfBackApplication.class, args);
+        String dataPath = System.getenv("FIELD_ARCHIVE_DATA");
+
+        if (dataPath == null) {
+            throw new IllegalStateException("FIELD_ARCHIVE_DATA is not defined");
+        }
+
+        Path projectsPath = Paths.get(dataPath, "projects");
+
+        try {
+            Files.createDirectories(projectsPath);
+        } catch (IOException e) {
+            throw new IllegalStateException("Cannot create projects directory : " + projectsPath, e);
+        }
+
+        System.out.println("Projects directory: " + projectsPath);
+    }
+
+}

RDF_Back/src/main/java/com/uspn/rdf_back/config/Rdf4jConfig.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/config/Rdf4jConfig.java

@@ -1,4 +1,4 @@
-package com.uspn.rdf_back.config;
+package fr.cnrs.lacito.fieldarchive.config;
 
 import org.eclipse.rdf4j.repository.Repository;
 import org.eclipse.rdf4j.repository.sail.SailRepository;

RDF_Back/src/main/java/com/uspn/rdf_back/config/WebConfig.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/config/WebConfig.java

@@ -1,4 +1,4 @@
-package com.uspn.rdf_back.config;
+package fr.cnrs.lacito.fieldarchive.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;

RDF_Back/src/main/java/com/uspn/rdf_back/controllers/DataSourceController.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/controllers/DataSourceController.java

@@ -1,10 +1,10 @@
-package com.uspn.rdf_back.controllers;
+package fr.cnrs.lacito.fieldarchive.controllers;
 
-import com.uspn.rdf_back.dtos.CreateInternalDataSourceRequest;
-import com.uspn.rdf_back.dtos.CreateExternalDataSourceRequest;
-import com.uspn.rdf_back.dtos.DataSourceDto;
-import com.uspn.rdf_back.dtos.UpdateDataSourceRequest;
-import com.uspn.rdf_back.services.DataSourceService;
+import fr.cnrs.lacito.fieldarchive.dtos.CreateInternalDataSourceRequest;
+import fr.cnrs.lacito.fieldarchive.dtos.CreateExternalDataSourceRequest;
+import fr.cnrs.lacito.fieldarchive.dtos.DataSourceDto;
+import fr.cnrs.lacito.fieldarchive.dtos.UpdateDataSourceRequest;
+import fr.cnrs.lacito.fieldarchive.services.DataSourceService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

RDF_Back/src/main/java/com/uspn/rdf_back/controllers/OntologyController.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/controllers/OntologyController.java

@@ -1,13 +1,14 @@
-package com.uspn.rdf_back.controllers;
+package fr.cnrs.lacito.fieldarchive.controllers;
 
-import com.uspn.rdf_back.dtos.OntologyLabelDto;
-import com.uspn.rdf_back.dtos.SaveOntologyLabelRequest;
-import com.uspn.rdf_back.services.OntologyService;
+import fr.cnrs.lacito.fieldarchive.dtos.OntologyLabelDto;
+import fr.cnrs.lacito.fieldarchive.dtos.SaveOntologyLabelRequest;
+import fr.cnrs.lacito.fieldarchive.services.OntologyService;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
+import java.util.Map;
 
-import com.uspn.rdf_back.dtos.OntologyClassDto;
-import com.uspn.rdf_back.services.BuiltinOntologyService;
+import fr.cnrs.lacito.fieldarchive.dtos.OntologyClassDto;
+import fr.cnrs.lacito.fieldarchive.services.BuiltinOntologyService;
 
 @RestController
 @RequestMapping("/ontology")
@@ -26,7 +27,7 @@ public OntologyController(OntologyService ontologyService,
     // TYPES RDF
     // =============================
     @GetMapping("/types")
-    public List<String> getTypes() {
+    public Map<String, Object> getTypes() {
         return ontologyService.getAllTypes();
     }
 

Backend/src/main/java/fr/cnrs/lacito/fieldarchive/controllers/ProjectController.java

@@ -0,0 +1,186 @@
+package fr.cnrs.lacito.fieldarchive.controllers;
+
+import fr.cnrs.lacito.fieldarchive.dtos.*;
+import fr.cnrs.lacito.fieldarchive.dtos.*;
+import fr.cnrs.lacito.fieldarchive.exceptions.ImportException;
+import fr.cnrs.lacito.fieldarchive.services.FileExportService;
+import fr.cnrs.lacito.fieldarchive.services.FileImportService;
+import fr.cnrs.lacito.fieldarchive.services.ProjectService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/projects")
+public class ProjectController {
+
+    private final ProjectService projectService;
+    private final FileImportService fileImportService;
+    private final FileExportService fileExportService;
+
+    public ProjectController(ProjectService projectService, FileImportService fileImportService, FileExportService fileExportService) {
+        this.projectService = projectService;
+        this.fileImportService = fileImportService;
+        this.fileExportService = fileExportService;
+    }
+
+    @PostMapping(value = "/import-backup", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<Map<String, Object>> importBackup(@RequestParam("file") MultipartFile file) {
+        try (InputStream is = file.getInputStream()) {
+            ImportResult result = fileImportService.importBackup(is);
+            Map<String, Object> body = new HashMap<>();
+            body.put("status", "ok");
+            body.put("message", "Project is successfully restored !");
+            body.put("project", result.message);
+            return ResponseEntity.ok(body);
+
+        } catch (ImportException e) {
+            return ResponseEntity.badRequest().body(Map.of("status", "error", "message", e.getMessage()));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.badRequest().body(Map.of("status", "error", "message", e.getMessage()));
+        } catch (IOException e) {
+            return ResponseEntity.internalServerError().body(Map.of("status", "error", "message", "Error while reading file."));
+        }
+    }
+
+    @GetMapping(value = "/export/backup", produces = "application/zip")
+    public void exportBackup(HttpServletResponse response) throws IOException {
+        response.setContentType("application/zip");
+        response.setHeader("Content-Disposition", "attachment; filename=\"project-backup.zip\"");
+        fileExportService.exportBackup(response.getOutputStream());
+    }
+
+    @GetMapping(value = "/export/internal", produces = "text/turtle")
+    public void exportInternal(HttpServletResponse response) throws IOException {
+        response.setContentType("text/turtle");
+        response.setHeader("Content-Disposition", "attachment; filename=\"internal-data.ttl\"");
+        fileExportService.exportInternalDataSource(response.getOutputStream());
+    }
+
+    @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<Map<String, Object>> importExternalTurtle(
+            @RequestParam("file") MultipartFile file) {
+
+        try (InputStream is = file.getInputStream()) {
+            String baseURI = projectService.readCurrentProject().prefix;
+            ImportResult result = fileImportService.importTurtle(is, baseURI);
+            Map<String, Object> body = new HashMap<>();
+            body.put("status", "ok");
+            body.put("message", "Internal DataSource was successfully updated !");
+            body.put("project", result.message);
+            return ResponseEntity.ok(body);
+        } catch (ImportException e) {
+            return ResponseEntity.badRequest().body(Map.of("status", "error", "message", e.getMessage()));
+        } catch (IOException e) {
+            return ResponseEntity.internalServerError().build();
+        }
+    }
+
+    @PostMapping("/open")
+    public Map<String, Object> open(@RequestBody CreateProjectRequest req) {
+        ProjectDto dto = projectService.openProject(req.getName(), req.isPersistent(), req.getDescription(), req.getPrefix());
+        return Map.of(
+                "status", "ok",
+                "project", dto.name
+        );
+    }
+
+    @PostMapping("/create")
+    public Map<String, Object> create(@RequestBody CreateProjectRequest req) {
+        ProjectDto dto = projectService.createProject(req.getName(), req.isPersistent(), req.getDescription(), req.getPrefix());
+        return Map.of(
+                "status", "ok",
+                "project", dto.name
+        );
+    }
+
+    @GetMapping("/current")
+    public ProjectDto current() {
+        return projectService.readCurrentProject();
+    }
+
+    @DeleteMapping("/{projectName}")
+    public ResponseEntity<String> deleteProject(@PathVariable String projectName) {
+        try {
+            projectService.deleteProject(projectName);
+            return ResponseEntity.ok("Project deleted successfully");
+
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity
+                    .badRequest()
+                    .body(e.getMessage());
+
+        } catch (FileNotFoundException e) {
+            return ResponseEntity
+                    .status(HttpStatus.NOT_FOUND)
+                    .body(e.getMessage());
+
+        } catch (IOException e) {
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body("Error deleting project");
+        }
+    }
+
+    @PostMapping("/close")
+    public Map<String, Object> close() {
+        projectService.closeProject();
+        return Map.of("status", "ok");
+    }
+
+    @PutMapping("/{oldProjectName}")
+    public ResponseEntity<?> updateProject(
+            @PathVariable String oldProjectName,
+            @RequestBody UpdateProjectObject newProject) {
+
+        try {
+
+            System.out.println("New Description is "+ newProject.description);
+            projectService.updateProject(
+                    oldProjectName,
+                    newProject.name,
+                    newProject.description
+            );
+
+            return ResponseEntity.ok(
+                    new ApiResponse<>(true, "Project updated successfully", null)
+            );
+
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity
+                    .badRequest()
+                    .body(new ApiError(e.getMessage(), "VALIDATION_ERROR"));
+
+        } catch (IOException e) {
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(new ApiError("Internal error while updating project", "IO_ERROR"));
+
+        } catch (Exception e) {
+            return ResponseEntity
+                    .status(HttpStatus.INTERNAL_SERVER_ERROR)
+                    .body(new ApiError("Unexpected error", "UNKNOWN_ERROR"));
+        }
+    }
+    // Liste simple
+//    @GetMapping("/list")
+//    public List<String> listProjects() {
+//        return projectService.listProjects();
+//    }
+
+    // Liste détaillée
+    @GetMapping("/list/details")
+    public List<Map<String, Object>> listProjectsDetailed() {
+        return projectService.listProjectsDetailed();
+    }
+
+}

RDF_Back/src/main/java/com/uspn/rdf_back/controllers/RdfEntityController.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/controllers/RdfEntityController.java

@@ -1,7 +1,11 @@
-package com.uspn.rdf_back.controllers;
+package fr.cnrs.lacito.fieldarchive.controllers;
 
-import com.uspn.rdf_back.dtos.*;
-import com.uspn.rdf_back.services.RdfEntityService;
+import fr.cnrs.lacito.fieldarchive.dtos.*;
+import fr.cnrs.lacito.fieldarchive.dtos.CreateRdfEntityRequest;
+import fr.cnrs.lacito.fieldarchive.dtos.RdfEntityDto;
+import fr.cnrs.lacito.fieldarchive.dtos.RdfEntitySummaryDto;
+import fr.cnrs.lacito.fieldarchive.dtos.UpdateRdfEntityRequest;
+import fr.cnrs.lacito.fieldarchive.services.RdfEntityService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

RDF_Back/src/main/java/com/uspn/rdf_back/controllers/SparqlController.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/controllers/SparqlController.java

@@ -1,6 +1,6 @@
-package com.uspn.rdf_back.controllers;
+package fr.cnrs.lacito.fieldarchive.controllers;
 
-import com.uspn.rdf_back.services.SparqlService;
+import fr.cnrs.lacito.fieldarchive.services.SparqlService;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -18,7 +18,9 @@ public SparqlController(SparqlService service) {
 
     @PostMapping("/select")
     public List<Map<String, String>> select(@RequestBody Map<String, String> body) {
-        return service.select(body.get("query"));
+        String query = body.get("query");
+//        System.out.println("SPARQL QUERY:\n" + query);
+        return service.select(query);
     }
 
     @PostMapping("/update")

RDF_Back/src/main/java/com/uspn/rdf_back/core/ProjectContext.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/core/ProjectContext.java

@@ -1,4 +1,4 @@
-package com.uspn.rdf_back.core;
+package fr.cnrs.lacito.fieldarchive.core;
 
 import org.eclipse.rdf4j.repository.Repository;
 

RDF_Back/src/main/java/com/uspn/rdf_back/core/RdfContexts.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/core/RdfContexts.java

@@ -1,14 +1,10 @@
-package com.uspn.rdf_back.core;
+package fr.cnrs.lacito.fieldarchive.core;
 //un contexte = un graphe nommé
 public final class RdfContexts {
     private RdfContexts() {}
 
     // Contexte où on stocke les METADONNEES des sources (en RDF)
     // graphe nommé pour les métadonnées (projet, sources de données, etc.)
-    public static final String CTX_META = RdfNamespaces.APP + "context/metadata";
-
-    // Contexte éditable interne (source interne)
-    public static final String CTX_INTERNAL = RdfNamespaces.APP + "context/internal";
-
-    public static final String CTX_ONTO_RICO = RdfNamespaces.APP + "context/ontology/rico";
+    public static final String CTX_META = RdfNamespaces.APP + "/context/metadata";
+    public static final String CTX_ONTO_RICO = RdfNamespaces.APP + "/context/ontology/rico";
 }

RDF_Back/src/main/java/com/uspn/rdf_back/core/RdfNamespaces.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/core/RdfNamespaces.java

@@ -1,11 +1,10 @@
-package com.uspn.rdf_back.core;
+package fr.cnrs.lacito.fieldarchive.core;
 
 public final class RdfNamespaces {
     private RdfNamespaces() {}
 
     // Namespace interne de l'application
-    public static final String APP = "http://uspn.fr/app#";
-    //public static final String APP = "http://example.org/app#";
+    public static final String APP = "http://cnrs.lacito/app#";
     // RIC-O
     public static final String RICO = "https://www.ica.org/standards/RiC/ontology#";
 

RDF_Back/src/main/java/com/uspn/rdf_back/dtos/ApiError.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/dtos/ApiError.java

@@ -1,4 +1,4 @@
-package com.uspn.rdf_back.dtos;
+package fr.cnrs.lacito.fieldarchive.dtos;
 
 public record ApiError(
         String message,

RDF_Back/src/main/java/com/uspn/rdf_back/dtos/ApiResponse.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/dtos/ApiResponse.java

@@ -1,4 +1,4 @@
-package com.uspn.rdf_back.dtos;
+package fr.cnrs.lacito.fieldarchive.dtos;
 
 public record ApiResponse<T>(
         boolean success,

RDF_Back/src/main/java/com/uspn/rdf_back/dtos/CreateDataSourceRequest.java → Backend/src/main/java/fr/cnrs/lacito/fieldarchive/dtos/CreateDataSourceRequest.java

@@ -1,4 +1,4 @@
-package com.uspn.rdf_back.dtos;
+package fr.cnrs.lacito.fieldarchive.dtos;
 
 
 import lombok.Getter;