ResponseEntity out

src/main/java/es/uv/saic/feign/DocumentClient.java

@@ -5,7 +5,6 @@ import java.io.IOException;
 import java.math.BigInteger;
 
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,7 +19,6 @@ import es.uv.saic.dto.CategoriaDTO;
 import es.uv.saic.dto.DocumentTmpDTO;
 import es.uv.saic.dto.PdfDTO;
 import fr.opensagres.xdocreport.core.XDocReportException;
-import jakarta.servlet.http.HttpServletResponse;
 
 @FeignClient(value = "document-service", url = "${saic.url.docs.domain}/docs")
 public interface DocumentClient {

src/main/java/es/uv/saic/feign/PlantillaClient.java

@@ -1,5 +1,6 @@
 package es.uv.saic.feign;
 
+import java.io.IOException;
 import java.util.List;
 
 import org.springframework.cloud.openfeign.FeignClient;
@@ -32,7 +33,7 @@ public interface PlantillaClient {
     String delete(@RequestBody Plantilla plantilla);
 
     @GetMapping("/plantilla/used/{id}")
-    Boolean isUsed(@PathVariable("id") Integer id);
+    boolean isUsed(@PathVariable("id") Integer id);
 
     @PostMapping("/addTemplateData")
     String addTemplateData(@RequestBody TemplateDataDTO td);
@@ -41,5 +42,5 @@ public interface PlantillaClient {
     String addTemplateData2(@RequestBody TemplateDataDTO td);
 
     @PostMapping("/savePDF")
-    String savePDF(@RequestBody PdfDTO pdf);
+    public String savePDF(@RequestBody PdfDTO pdf) throws IOException, InterruptedException;
 }

src/main/java/es/uv/saic/web/EmailController.java

@@ -9,6 +9,7 @@ import jakarta.mail.MessagingException;
 
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 
 @RestController

src/main/java/es/uv/saic/web/IndicadorController.java

@@ -1,21 +1,22 @@
 package es.uv.saic.web;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
 import java.util.List;
 
+import javax.xml.parsers.ParserConfigurationException;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.xml.sax.SAXException;
 
-import com.fasterxml.jackson.databind.JsonMappingException;
-
-import es.uv.saic.domain.Organ;
-import es.uv.saic.service.IndicadorService;
 import es.uv.saic.domain.Indicador;
 import es.uv.saic.domain.IndicadorEnquesta;
 import es.uv.saic.domain.IndicadorEnquestaTmp;
@@ -25,6 +26,7 @@ import es.uv.saic.dto.IndicadorEnquestaTmpDup;
 import es.uv.saic.dto.IndicadorEnquestaValorDTO;
 import es.uv.saic.service.IndicadorEnquestaService;
 import es.uv.saic.service.IndicadorEnquestaTmpService;
+import es.uv.saic.service.IndicadorService;
 
 @RestController
 @RequestMapping("/core")
@@ -88,36 +90,12 @@ public class IndicadorController {
     }
 
     /*
-     * Endpoint1 para la funcion getAllInds de ies
-     */
-    @GetMapping("/allInds/{ruct}/{curs}")
-    public ResponseEntity<?> getAllInds(@PathVariable Integer ruct, @PathVariable Integer curs) {
-        try {
-            
-            Organ organ = os.findByRuct(ruct);
-            List<IndicadorEnquesta> list = ies.getAllInds(organ, curs);
-
-            return ResponseEntity.ok(list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener los indicadores1: " + e.getMessage());
-        }
-    }
-
-    /*
      * Endpoint2 para la funcion getAllInds de ies
      */
-    @PostMapping("/allInds2")
-    public ResponseEntity<?> getAllInds2(@RequestBody IndicadorEnquestaDTO indicadorEnquestaDTO) {
-        try {
-            List<IndicadorEnquestaValorDTO> list = ies.getAllInds(indicadorEnquestaDTO.getIdTitulacio(),
+    @PostMapping("/allInds")
+    public List<IndicadorEnquestaValorDTO> getAllInds2(@RequestBody IndicadorEnquestaDTO indicadorEnquestaDTO) {
+        return ies.getAllInds(indicadorEnquestaDTO.getIdTitulacio(),
                 indicadorEnquestaDTO.getIdCentre(), indicadorEnquestaDTO.getCurs());
-
-            return ResponseEntity.ok(list);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener los indicadores2: " + e.getMessage());
-        }
     }
 
     /*
@@ -149,18 +127,10 @@ public class IndicadorController {
      * Endpoint para la funcion getFromTitulacion de ies
      */
     @GetMapping("/getFromTitulacio/{idTitulacio}/{curs}")
-    public ResponseEntity<?> getFromTitulacion(@PathVariable Integer idTitulacio, @PathVariable Integer curs) {
-        try {
-            List<Indicador> list = is.getFromTitulacion(idTitulacio, curs);
-
-            return ResponseEntity.ok(list);
-        } catch (JsonMappingException e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al mapear el JSON: " + e.getMessage());
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener los indicadores: " + e.getMessage());
-        }
+    public List<Indicador> getFromTitulacion(@PathVariable Integer idTitulacio, @PathVariable Integer curs) 
+        throws ParserConfigurationException, MalformedURLException, IOException, SAXException  {
+        
+        return is.getFromTitulacion(idTitulacio, curs);
     }
 
     /*

src/main/java/es/uv/saic/web/ManagersController.java

@@ -12,11 +12,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.mysql.cj.protocol.x.OkBuilder;
-
 import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Rol;
 import es.uv.saic.domain.Usuari;

src/main/java/es/uv/saic/web/NoticiaController.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 import es.uv.saic.domain.Noticia;
 import es.uv.saic.service.NoticiaService;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 @RestController
 @RequestMapping("/core")

src/main/java/es/uv/saic/web/OrganController.java

@@ -8,11 +8,11 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -88,20 +88,10 @@ public class OrganController {
      * Endpoint para getTitulacionsByTypeCentre
      */
     @GetMapping("/getTitulacionsByTypeCentre/{lugar}/{type}")
-    public ResponseEntity<?> getTitulacionsByTypeCentre(@PathVariable Integer lugar, @PathVariable Integer type) {
-        try {
-            List<Organ> organList = os.getTitulacionsByTypeCentre(lugar, type);
-            List<OrganTransferDTO> organDTOList = new ArrayList<>();
-            
-            for(Organ org: organList) {
-                organDTOList.add(new OrganTransferDTO(org));
-            }
-
-            return ResponseEntity.ok(organDTOList);
-        } catch(Exception e) {
-            return ResponseEntity.badRequest().body("Error al obtener los organos" +
-                " por lugar y ambit: " + e.getMessage());
-        }
+    public List<OrganTransferDTO> getTitulacionsByTypeCentre(@PathVariable Integer lugar, @PathVariable Integer type) {
+        return os.getTitulacionsByTypeCentre(lugar, type).stream()
+			.map(OrganTransferDTO::new)
+			.collect(Collectors.toList());
     }
 
     @GetMapping("/existsOrg/{tlugar}/{idTitulacio}")
@@ -110,21 +100,10 @@ public class OrganController {
     }
 
     @GetMapping("/getTitulacionsByCentreTambit/{centre}/{tambit}")
-    public ResponseEntity<?> getTitulacionsByCentreTambit(@PathVariable Integer centre, @PathVariable String tambit) {
-        try {
-            List<Organ> organList = os.findActiveTitulacionsByCentreTambit(centre, tambit);
-            List<OrganTransferDTO> organDTOList = new ArrayList<>();
-
-            for(Organ org: organList) {
-				System.out.println(org.getNomCas());
-                organDTOList.add(new OrganTransferDTO(org));
-            }
-
-            return ResponseEntity.ok(organDTOList);
-        } catch(Exception e) {
-            return ResponseEntity.badRequest().body("Error al obtener los organos" +
-                " por lugar y ambit: " + e.getMessage());
-        }
+    public List<OrganTransferDTO> getTitulacionsByCentreTambit(@PathVariable Integer centre, @PathVariable String tambit) {
+        return os.findActiveTitulacionsByCentreTambit(centre, tambit).stream()
+			.map(OrganTransferDTO::new)
+			.collect(Collectors.toList());
     }
 
     @GetMapping("/getTitulacions/supervisor")
@@ -152,35 +131,17 @@ public class OrganController {
     }
 
     @GetMapping("/getCentres")
-    public ResponseEntity<?> getCentres() {
-        try {
-            List<Organ> organList = os.getCentres();
-            List<OrganDTO> organDTOList = new ArrayList<>();
-            
-            for(Organ org: organList) {
-                organDTOList.add(new OrganDTO(org));
-            }
-
-            return ResponseEntity.ok(organDTOList);
-        } catch(Exception e) {
-            return ResponseEntity.badRequest().body("Error al obtener los centros: " + e.getMessage());
-        }
+    public List<OrganDTO> getCentres() {
+        return os.getActiveCentres().stream()
+			.map(OrganDTO::new)
+			.collect(Collectors.toList());
     }
 
     @GetMapping("/getActiveCentres")
-    public ResponseEntity<?> getActiveCentres() {
-        try {
-            List<Organ> organList = os.getActiveCentres();
-            List<OrganDTO> organDTOList = new ArrayList<>();
-            
-            for(Organ org: organList) {
-                organDTOList.add(new OrganDTO(org));
-            }
-
-            return ResponseEntity.ok(organDTOList);
-        } catch(Exception e) {
-            return ResponseEntity.badRequest().body("Error al obtener los centros: " + e.getMessage());
-        }
+    public List<OrganDTO> getActiveCentres() {
+        return os.getActiveCentres().stream()
+			.map(OrganDTO::new)
+			.collect(Collectors.toList());
     }
 
     // Funciones ajax
@@ -435,4 +396,9 @@ public class OrganController {
 		model.put("sup_centers", centres);
         return model;
 	}
+
+	@PostMapping("/getEquivalents")
+	public List<Integer> getEquivalents(@RequestParam Integer lugar, @RequestParam String tlugar) {
+		return os.getEquivalents(lugar, tlugar);
+	}
 }

src/main/java/es/uv/saic/web/ProceduresController.java

@@ -1,11 +1,12 @@
 package es.uv.saic.web;
 
+import static java.util.Comparator.comparing;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
@@ -20,27 +21,18 @@ import java.util.Map;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import static java.util.Comparator.comparing;
-
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
 
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import es.uv.saic.domain.DummyDataTransfer;
@@ -63,7 +55,16 @@ import es.uv.saic.dto.RolDTO;
 import es.uv.saic.dto.TascaDTO;
 import es.uv.saic.dto.TemplateDataDTO;
 import es.uv.saic.feign.PlantillaClient;
-import es.uv.saic.service.*;
+import es.uv.saic.service.EvidenciaIndicadorEnquestaService;
+import es.uv.saic.service.InstanciaService;
+import es.uv.saic.service.InstanciaTascaService;
+import es.uv.saic.service.InstanciaTascaVerService;
+import es.uv.saic.service.OrganService;
+import es.uv.saic.service.ProcesService;
+import es.uv.saic.service.RolService;
+import es.uv.saic.service.TascaService;
+import es.uv.saic.service.TipusService;
+import es.uv.saic.service.UsuariService;
 
 
 @RestController
@@ -552,32 +553,15 @@ public class ProceduresController {
 	}
 
     @PostMapping("/proces/{id}")
-    public ResponseEntity<?> findById(@PathVariable Integer id) {
-        try {
-            Proces proces = ps.findByID(id);
-            ProcesDTO procesDTO = new ProcesDTO(proces);
-
-            return (procesDTO != null) ? ResponseEntity.ok(procesDTO) : ResponseEntity.badRequest().body("El proces con id " + id + " esta vacio");
-        } catch (Exception e) {
-             e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener el proces por el id:" +  e.getMessage());
-        }
+    public ProcesDTO findById(@PathVariable Integer id) {
+    	return new ProcesDTO(ps.findByID(id));
     }
     
     @GetMapping("/proces/getAll")
-    public ResponseEntity<?> getAll() {
-        try {
-            List<Proces> proces = ps.getAll();
-            List<ProcesDTO> procesDTOList = new ArrayList<>();
-            
-            for(Proces pro: proces) {
-                procesDTOList.add(new ProcesDTO(pro));
-            }
-
-            return ResponseEntity.ok(procesDTOList);
-        } catch(Exception e) {
-            return ResponseEntity.badRequest().body("Error al obtener los centros");
-        }
+    public List<ProcesDTO> getAll() {
+        return ps.getAll().stream()
+			.map(ProcesDTO::new)
+			.toList();
     }
     
     @PostMapping("/ajax/search/years")

src/main/java/es/uv/saic/web/StatsController.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.session.SessionInformation;
 import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import es.uv.saic.domain.Email;

src/main/java/es/uv/saic/web/SupervisionController.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 

src/main/java/es/uv/saic/web/TascaController.java

@@ -6,9 +6,17 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import es.uv.saic.domain.DummyDataTransfer;
 import es.uv.saic.domain.InstanciaTasca;
-import es.uv.saic.domain.Tasca;
 import es.uv.saic.dto.EvidenciaBuscadorDTO;
 import es.uv.saic.dto.InstanciaTascaDTO;
 import es.uv.saic.dto.NomProcesOrganDTO;
@@ -18,17 +26,6 @@ import es.uv.saic.dto.TascaInformeTransferDTO;
 import es.uv.saic.service.InstanciaTascaService;
 import es.uv.saic.service.TascaService;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.core.Authentication;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
 
 @RestController
 @RequestMapping("/core")
@@ -40,56 +37,19 @@ public class TascaController {
     InstanciaTascaService its;
 
     @GetMapping("/instanciatasca/{id}")
-    public ResponseEntity<?> findInstanciaTascaById(@PathVariable("id") BigInteger id) {
-        try {
-            InstanciaTascaDTO instanciatasca = its.findByIdDTO(id);
-
-            return (instanciatasca != null) ? 
-            ResponseEntity.ok(instanciatasca) : ResponseEntity.badRequest().body("La instancia esta vacia");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener la instancia por el id:" +  e.getMessage());
-        }
-    }
-
-    @GetMapping("/instanciatasca2/{id}")
-    public ResponseEntity<?> findInstanciaTascaById2(@PathVariable("id") BigInteger id) {
-        try {
-            InstanciaTasca instanciatasca = its.findById(id);
-            InstanciaTascaDTO instanciaTascaDTO = new InstanciaTascaDTO(instanciatasca);
-
-            return (instanciaTascaDTO != null) ? 
-            ResponseEntity.ok(instanciaTascaDTO) : ResponseEntity.badRequest().body("La instancia esta vacia");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener la instancia por el id:" +  e.getMessage());
-        }
+    public InstanciaTascaDTO findInstanciaTascaById(@PathVariable("id") BigInteger id) {
+        return its.findByIdDTO(id);
     }
 
     @PostMapping("/getLastByProcName")
-    public ResponseEntity<?> getLastByProcName(@RequestBody ProcesDTO tascaDTO) {
-        try {
-            TascaInformeTransferDTO tit = its.getLastByProcName(tascaDTO.getNomProces(),
-                tascaDTO.getLugar(), tascaDTO.getLugar2(), tascaDTO.getTambit());
-
-            return ResponseEntity.ok(tit);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener la última tarea a partir del procedimiento: " + e.getMessage());
-        }
+    public TascaInformeTransferDTO getLastByProcName(@RequestBody ProcesDTO tascaDTO) {
+        return its.getLastByProcName(tascaDTO.getNomProces(),
+            tascaDTO.getLugar(), tascaDTO.getLugar2(), tascaDTO.getTambit());
     }
     
     @GetMapping("/getByProcesTascap/{idProces}/{idTascap}")
-    public ResponseEntity<?> getByProcesTascap(@PathVariable Integer idProces, @PathVariable Integer idTascap) {
-        try {
-            Tasca tasca = ts.getByProcesTascap(idProces, idTascap);
-            TascaDTO tascaDTO = new TascaDTO(tasca);
-
-            return ResponseEntity.ok(tascaDTO);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener la tasca: " + e.getMessage());
-        }
+    public TascaDTO getByProcesTascap(@PathVariable Integer idProces, @PathVariable Integer idTascap) {
+        return new TascaDTO(ts.getByProcesTascap(idProces, idTascap));
     }
     
     @PostMapping("/getReportFromNomProcesOrgan")

src/main/java/es/uv/saic/web/UsuariController.java

@@ -1,13 +1,14 @@
 package es.uv.saic.web;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import es.uv.saic.domain.Rol;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.domain.UsuarisRol;
 import es.uv.saic.dto.RolDTO;
@@ -16,10 +17,6 @@ import es.uv.saic.service.RolService;
 import es.uv.saic.service.UsuariService;
 import es.uv.saic.service.UsuarisRolService;
 
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 
 
 @RestController
@@ -54,19 +51,8 @@ public class UsuariController {
 	}
 
     @GetMapping("/find/allRols")
-    public ResponseEntity<?> findAllRols() {
-        try {
-            List<Rol> rolList = rs.findAll();
-            List<RolDTO> rolDTOList = new ArrayList<>();
-
-            for(Rol rol: rolList) {
-                rolDTOList.add(new RolDTO(rol));
-            }
-
-            return ResponseEntity.ok(rolDTOList);
-        } catch (Exception e) {
-             return ResponseEntity.badRequest().body("Error al obtener los roles: " +  e.getMessage());
-        }
+    public List<RolDTO> findAllRols() {
+        return rs.findAll().stream().map(RolDTO::new).toList();
     }
 
     @GetMapping("/find/allUsers")