Solving problems

src/main/java/es/uv/saic/domain/OrganRepository.java

@@ -7,6 +7,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
 import es.uv.saic.dto.OrganDTO;
+import es.uv.saic.dto.OrganRepositoryDTO;
 
 @Repository
 public interface OrganRepository extends JpaRepository<Organ, OrganPK> {
@@ -91,6 +92,6 @@ public interface OrganRepository extends JpaRepository<Organ, OrganPK> {
 				"o2.nom_cas AS nomCas2, o2.nom_val AS nomVal2, " +
 				"o2.ruct AS ruct2 " + 
 				"FROM organs AS o1 JOIN organs AS o2 on o1.tlugar2 = o2.tlugar AND o1.lugar2 = o2.lugar WHERE o1.actiu = true;"), nativeQuery=true)
-	public List<OrganDTO> findAllTitulacionsWithCentre();
+	public List<OrganRepositoryDTO> findAllTitulacionsWithCentre();
 	
 }

src/main/java/es/uv/saic/dto/OrganDTO.java

@@ -47,6 +47,20 @@ public class OrganDTO{
         this.ruct2 = organ.getOrgan().getRuct();
     }
 
+    public OrganDTO(OrganRepositoryDTO organ) {
+        this.lugar = Integer.parseInt(organ.getLugar());
+        this.tlugar = organ.getTlugar();
+        this.lugar2 = Integer.parseInt(organ.getLugar());
+        this.tlugar2 =  organ.getTlugar();  
+        this.nomCas = organ.getNomCas();
+        this.nomVal = organ.getNomVal();
+        this.ruct = organ.getRuct();
+        this.tambit = organ.getTambit();
+        this.nomCas2 = organ.getNomCas2();
+        this.nomVal2 = organ.getNomVal2();
+        this.ruct2 = organ.getRuct2();
+    }
+
     public Integer getLugar() {
         return lugar;
     }

src/main/java/es/uv/saic/dto/OrganRepositoryDTO.java

@@ -0,0 +1,15 @@
+package es.uv.saic.dto;
+
+public interface OrganRepositoryDTO {
+    String getLugar();
+    String getTlugar();
+    String getLugar2();
+    String getTlugar2();
+    String getNomCas();
+    String getNomVal();
+    Integer getRuct();
+    String getTambit();
+    String getNomCas2();
+    String getNomVal2();
+    Integer getRuct2();
+} 

src/main/java/es/uv/saic/dto/TemplateDataDTO.java

@@ -6,6 +6,9 @@ public class TemplateDataDTO {
     private Integer idCentre;
     private Integer curs;
     private String template;
+
+    public TemplateDataDTO() {
+}
     
     public TemplateDataDTO(InstanciaTascaDTO instanciaTasca, String template) {
         this.instanciaTasca = instanciaTasca;

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

@@ -17,7 +17,7 @@ import es.uv.saic.dto.TablaDTO;
 @FeignClient(value = "data-service", url = "${saic.url.data.domain}")
 public interface DataClient {
 
-    @PostMapping("/data/import")
+    @GetMapping("/data/import")
     public List<Datasource> renderImport();
 
     @PostMapping("/data/import")

src/main/java/es/uv/saic/service/OrganService.java

@@ -2,6 +2,8 @@ package es.uv.saic.service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -107,7 +109,9 @@ public class OrganService {
 	}
 
 	public List<OrganDTO> findAllTitulacionsWithCentre() {
-		return this.organRepository.findAllTitulacionsWithCentre();
+
+		return this.organRepository.findAllTitulacionsWithCentre()
+		.stream().map(OrganDTO::new).collect(Collectors.toList());
 	}
 	
 	

src/main/java/es/uv/saic/service/ParserService.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import es.uv.saic.domain.IndicadorEnquesta;
 
+//Este servicio no hay que adaptarlo
 @Service
 public class ParserService {
 	

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

@@ -7,6 +7,7 @@ import java.util.List;
 
 import jakarta.mail.MessagingException;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.security.core.Authentication;
@@ -32,8 +33,10 @@ import es.uv.saic.feign.DataClient;
 @Controller
 public class DataController {
 
+	@Autowired
 	private CoreClient cc;
 	
+	@Autowired
 	private DataClient dc;
 	
 	// GET que carga la interfaz relacionada con toda la importación de datos

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

@@ -43,7 +43,6 @@ public class DownloadController {
 		// 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);

src/main/resources/application-local.properties

@@ -24,17 +24,19 @@ spring.datasource.url=jdbc:postgresql://saicd.uv.es:5432/saic_v2
 spring.datasource.password=docent1ia2.l6
 
 # Files and log config
-saic.data.filePath=/home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/files/
-saic.data.tmpPath=/home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/tmp/
-saic.data.docsPath=/home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/documents/
-saic.data.templates.filePath = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/templates/
-saic.data.templates.logoPath = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/templates/logos/
-saic.data.templates.fileNotFound = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/utils/filenotfound.pdf
-saic.data.master = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/databases/MasterOficial/
-saic.data.doctorado = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/databases/doctorat/
-saic.data.evdocente = /home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/databases/ev_docente/latest/
-logging.file.path=/home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/logs
-logging.file.name=/home/dagarcos/DATA_SYNC/UV_APPS/SAIC/DATA/saic-data/logsd/saic.log
+saic.data.filePath=C:\\SAIC\\files\\
+saic.data.tmpPath=C:\\SAIC\\tmp\\
+saic.data.docsPath=C:\\SAIC\\documents\\
+saic.data.templates.filePath = C:\\SAIC\\templates\\
+saic.data.templates.logoPath = C:\\SAIC\\templates\\logos\\
+saic.data.templates.fileNotFound = C:\\SAIC\\utils\\filenotfound.pdf
+logging.file.path=C:\\SAIC\\logs\\
+logging.file.name=C:\\SAIC\\logs\\saic.log
+
+#BORRAR
+saic.data.master = C:\\SAIC\\databases\\MasterOficial\\
+saic.data.doctorado = C:\\SAIC\\databases\\doctorat\\
+saic.data.evdocente = C:\\SAIC\\databases\\ev_docente\\latest\\
 
 # Scheduler
 saic.scheduler.expired.enabled=false

src/main/resources/application.properties

@@ -48,7 +48,7 @@ server.tomcat.remoteip.port-header=X-Forwarded-Port
 server.tomcat.use-relative-redirects=true
 server.tomcat.remoteip.internal-proxies=.*
 
-# UQ server connection parameters
+# UQ server connection parameters(Eventualmente será eliminado)
 saic.uqserver.host = uqserver.uv.es
 saic.uqserver.dbname.grau = MDB_grau
 saic.uqserver.dbname.master = MDB_master