Fixed feing request and deleted download controller

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

@@ -1,175 +0,0 @@
-package es.uv.saic.web;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.FileSystemResource;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import es.uv.saic.dto.PdfDTO;
-import es.uv.saic.feign.DocumentClient;
-import fr.opensagres.xdocreport.core.XDocReportException;
-import jakarta.servlet.http.HttpServletResponse;
-
-@Controller
-public class DownloadController {
-
-	@Autowired
-	private DocumentClient dc;
-	/*
-	 * Download a file associated with a task instance
-	 * @param model
-	 * @param idInstanciaTasca The ID of the task instance
-	 * @param response HttpServletResponse
-	 * @return A FileSystemResource representing the file to download
-	 */
-	@GetMapping(value="/download/{fileName}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-	@ResponseBody
-	public FileSystemResource download(Model model, @PathVariable("fileName") BigInteger idInstanciaTasca) throws IOException {	
-		// Convert byte[] to FileSystemResource
-		ResponseEntity<byte[]> response = dc.download(idInstanciaTasca);
-		byte[] data = response.getBody();
-		String fileName = response.getHeaders().getFirst("Content-Disposition").split("filename=")[1].replace("\"", "");
-
-		Path tempFile = Files.createTempFile( "download-", "-" + fileName);
-		Files.write(tempFile, data);
-		tempFile.toFile().deleteOnExit();
-
-		return new FileSystemResource(tempFile.toFile());
-	}					
-
-	/*
-	 * Download a document by its ID
-	 * @param model
-	 * @param idDocument The ID of the document to download
-	 * @param response HttpServletResponse
-	 * @return A FileSystemResource representing the document to download
-	 */
-	@GetMapping(value="/download/document/{id}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-	@ResponseBody
-	public FileSystemResource downloadDocument(Model model, @PathVariable("id") Integer idDocument) throws IOException {		
-		ResponseEntity<byte[]> response = dc.downloadDocument(idDocument);
-		byte[] data = response.getBody();
-		String fileName = response.getHeaders().getFirst("Content-Disposition").split("filename=")[1].replace("\"", "");
-
-		Path tempFile = Files.createTempFile( "download-", "-" + fileName);
-		Files.write(tempFile, data);
-		tempFile.toFile().deleteOnExit();
-
-		return new FileSystemResource(tempFile.toFile());
-	}
-
-	/*
-	 * Download the latest report for a given process and degree
-	 * @param model
-	 * @param idTitulacio The ID of the degree
-	 * @param nomProces The name of the process
-	 * @param response HttpServletResponse
-	 * @return A FileSystemResource representing the report to download
-	 */
-	@GetMapping(value="/download/report/{t}/{p}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-	@ResponseBody 
-	public FileSystemResource downloadReport(Model model, @PathVariable("t") Integer idTitulacio, @PathVariable("p") String nomProces) throws IOException, XDocReportException {
-		ResponseEntity<byte[]> response = dc.downloadReport(idTitulacio, nomProces);
-		byte[] data = response.getBody();
-		String fileName = response.getHeaders().getFirst("Content-Disposition").split("filename=")[1].replace("\"", "");
-
-		Path tempFile = Files.createTempFile( "download-", "-" + fileName);
-		Files.write(tempFile, data);
-		tempFile.toFile().deleteOnExit();
-
-		return new FileSystemResource(tempFile.toFile());
-	}
-
-
-	/*
-	 * Download a populated template for a given task instance
-	 * @param model
-	 * @param idTascai The ID of the task instance
-	 * @param response HttpServletResponse
-	 * @return A byte array representing the populated template to download
-	 */
-	@GetMapping(value="/download/template/{id}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-	@ResponseBody 
-	public byte[] downloadTemplate(Model model, @PathVariable("id") BigInteger idTascai) throws IOException, XDocReportException {
-		return dc.downloadTemplate(idTascai);
-	}
-
-	/*
-	 * Test endpoint to generate a populated template for a given task (id of task)
-	 * @param model
-	 * @param idTitulacio The ID of the degree
-	 * @param idCentre The ID of the center
-	 * @param idTascap The ID of the task
-	 * @param idProces The ID of the process
-	 * @param response HttpServletResponse
-	 * @return A byte array representing the populated template
-	 */
-	@GetMapping(value="/test/template/{titulacio}/{centre}/{idProces}/{idTascap}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-	@ResponseBody
-	public byte[] testTemplate(Model model, @PathVariable("titulacio") Integer idTitulacio, @PathVariable("centre") Integer idCentre,
-			@PathVariable("idTascap") Integer idTascap, @PathVariable("idProces") Integer idProces) 
-					throws IOException, XDocReportException {
-		return dc.testTemplate(idTitulacio, idCentre, idProces, idTascap);
-	}
-
-	/*
-	 * Test endpoint to generate a populated template for a given degree and evidence (Type of task)
-	 * @param model
-	 * @param idTitulacio The ID of the degree
-	 * @param idCentre The ID of the center
-	 * @param evidencia The name of the evidence
-	 * @param curs The academic year
-	 * @param tipusTasca The type of task
-	 * @param response HttpServletResponse
-	 * @return A byte array representing the populated template
-	 */
-	@GetMapping(value="/test/template2/{titulacio}/{centre}/{evidencia}/{curs}/{tipusTasca}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
-	@ResponseBody
-	public byte[] testTemplate(Model model, @PathVariable("titulacio") Integer idTitulacio, @PathVariable("centre") Integer idCentre,
-			@PathVariable("evidencia") String evidencia, @PathVariable("curs") Integer curs, @PathVariable("tipusTasca") Integer tipusTasca) throws IOException, XDocReportException {
-		return dc.testTemplate(idTitulacio, idCentre, evidencia, curs, tipusTasca);
-	}
-	
-	/*
-	 * Generate a PDF from the content of a task instance (unused)
-	 * @param model
-	 * @param idTascai The ID of the task instance
-	 * @param response HttpServletResponse
-	 * @return A byte array representing the generated PDF
-	 */
-	@GetMapping(value="/pdf/download/{idTascai}")
-	@ResponseBody
-	public byte[] downloadTemplatePdf(Model model, @PathVariable("idTascai") BigInteger idTascai) throws IOException, InterruptedException {
-		return dc.downloadTemplatePdf(idTascai);
-	}
-
-	/*
-	 * Generate a PDF preview from provided content
-	 * @param model
-	 * @param content The content to convert to PDF
-	 * @param idtascai Optional ID of the task instance for context
-	 * @param response HttpServletResponse
-	 */
-	@PostMapping(value="/pdf/preview")
-	@ResponseBody
-	public byte[] downloadTemplatePdf(Model model,
-			@RequestParam("content") String content, @RequestParam("idtascai") Optional<BigInteger> idtascai) throws IOException, InterruptedException {
-		PdfDTO pdf = new PdfDTO(content, idtascai);
-		return dc.downloadTemplatePdf(pdf);
-	}
-}

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

@@ -78,7 +78,7 @@ public class TascaController {
         }
     }
     
-    @PostMapping("/getByProcesTascap/{idProces}/{idTascap}")
+    @GetMapping("/getByProcesTascap/{idProces}/{idTascap}")
     public ResponseEntity<?> getByProcesTascap(@PathVariable Integer idProces, @PathVariable Integer idTascap) {
         try {
             Tasca tasca = ts.getByProcesTascap(idProces, idTascap);
@@ -91,17 +91,10 @@ public class TascaController {
         }
     }
     
-    @GetMapping("/getReportFromNomProcesOrgan")
-    public ResponseEntity<?> getReportFromNomProcesOrgan(@RequestBody NomProcesOrganDTO nomProcesOrganDTO) {
-        try {
-            InstanciaTasca itasca = its.getReportFromNomProcesOrgan(nomProcesOrganDTO.getNomProces(), nomProcesOrganDTO.getTlugar(), nomProcesOrganDTO.getLugar(), nomProcesOrganDTO.getCentre(), nomProcesOrganDTO.getTitulacio());
-            InstanciaTascaDTO itDto = new InstanciaTascaDTO(itasca);
-
-            return ResponseEntity.ok(itDto);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ResponseEntity.badRequest().body("Error al obtener la instancia tasca: " + e.getMessage());
-        }
+    @PostMapping("/getReportFromNomProcesOrgan")
+    InstanciaTascaDTO getReportFromNomProcesOrgan(@RequestBody NomProcesOrganDTO nomProcesOrgan) {
+            InstanciaTasca itasca = its.getReportFromNomProcesOrgan(nomProcesOrgan.getNomProces(), nomProcesOrgan.getTlugar(), nomProcesOrgan.getLugar(), nomProcesOrgan.getCentre(), nomProcesOrgan.getTitulacio());
+            return new InstanciaTascaDTO(itasca);
     }
 
     // POST para buscar pas evidencias a partir del año, centro y titulación