Discovery server added

pom.xml

@@ -154,6 +154,11 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-openfeign</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+		</dependency>
 		<!-- 
 		<dependency>
 		    <groupId>org.jacoco</groupId> 

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

@@ -13,6 +13,8 @@ public class SupervisionSearchParams implements Serializable{
 	private List<String> evidencies;
 	private String searchType;
 	
+	public SupervisionSearchParams() {
+	}
 	
 	public SupervisionSearchParams(List<Integer> centres, List<Integer> titulacions, List<Integer> cursos, 
 								   List<String> procediments, List<String> evidencies, String searchType) {

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

@@ -111,14 +111,6 @@ public class OrganDTO{
         return tambit2;
     }
 
-    public String getNomTCas() {
-        return nomCas2;
-    }
-
-    public String getNomTVal() {
-        return nomVal2;
-    }
-
     public Integer getRuct2() {
         return ruct2;
     }

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

@@ -1,7 +1,9 @@
 package es.uv.saic.dto;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 import es.uv.saic.domain.Acreditacio;
-import es.uv.saic.domain.Usuari;
 import es.uv.saic.domain.UsuarisRol;
 
 public class UsuarisRolDTO {
@@ -9,12 +11,14 @@ public class UsuarisRolDTO {
     private Acreditacio acreditacio;
     private RolDTO rol;
     private UsuariDTO usuari;
+    private String inici;
 
     public UsuarisRolDTO(OrganDTO organ, Acreditacio acreditacio, RolDTO rol, UsuariDTO usuari) {
         this.organ = organ;
         this.acreditacio = acreditacio;
         this.rol = rol;
         this.usuari = usuari;
+        this.inici = "";
     }
 
     public UsuarisRolDTO(UsuarisRol usuarisRol) {
@@ -22,6 +26,7 @@ public class UsuarisRolDTO {
         this.acreditacio = usuarisRol.getOrgan().getAcreditacio();
         this.rol = new RolDTO(usuarisRol.getRol());
         this.usuari = new UsuariDTO(usuarisRol.getUsuari());
+        this.inici = formatDate(usuarisRol.getInici());
     }
 
     public OrganDTO getOrgan() {
@@ -49,5 +54,18 @@ public class UsuarisRolDTO {
         this.usuari = usuari;
     }
 
+    public String getInici() {
+        return inici;
+    }
+
+    public void setInici(String inici) {
+        this.inici = inici;
+    }
     
+    private String formatDate(Date date) {
+        if (date == null)
+            return "";
+        SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
+        return formatter.format(date);
+    }
 }

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

@@ -14,7 +14,7 @@ import es.uv.saic.dto.ImportDTO;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
 import es.uv.saic.dto.TablaDTO;
 
-@FeignClient(value = "data-service", url = "${saic.url.data.domain}/data")
+@FeignClient(name = "data-service")
 public interface DataClient {
 
     @GetMapping("/data/import")

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

@@ -20,7 +20,7 @@ import es.uv.saic.dto.DocumentTmpDTO;
 import es.uv.saic.dto.PdfDTO;
 import fr.opensagres.xdocreport.core.XDocReportException;
 
-@FeignClient(value = "document-service", url = "${saic.url.docs.domain}/docs")
+@FeignClient(name = "docs-service", contextId = "docs-service")
 public interface DocumentClient {
 
     @PostMapping("/document/save")

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

@@ -14,7 +14,7 @@ import es.uv.saic.domain.Plantilla;
 import es.uv.saic.dto.PdfDTO;
 import es.uv.saic.dto.TemplateDataDTO;
 
-@FeignClient(value = "plantilla-controller", url = "${saic.url.docs.domain}/docs")
+@FeignClient(name = "docs-service", contextId = "plantilla-controller")
 public interface PlantillaClient {
 
     @GetMapping("/plantilla")

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

@@ -52,7 +52,6 @@ import es.uv.saic.service.UsuariService;
 import es.uv.saic.service.UsuarisRolService;
 
 @RestController
-@RequestMapping("/core")
 public class AdminController {
 
 	@Autowired

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

@@ -34,7 +34,6 @@ import es.uv.saic.service.ProcesService;
 import es.uv.saic.service.UsuariService;
 
 @RestController
-@RequestMapping("/core")
 public class CalendarController {
     @Autowired
 	private OrganService os;

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

@@ -80,7 +80,6 @@ import es.uv.saic.service.UsuariService;
 import es.uv.saic.service.UsuarisRolService;
 
 @RestController
-@RequestMapping("/core")
 public class DashboardController {
 
 	@Autowired 

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

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 
 @RestController
-@RequestMapping("/core")
 public class EmailController {
     @Autowired
     EmailService es;

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

@@ -3,6 +3,7 @@ package es.uv.saic.web;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -24,12 +25,12 @@ import es.uv.saic.dto.EnquestaDTO;
 import es.uv.saic.dto.IndicadorEnquestaDTO;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
 import es.uv.saic.dto.IndicadorEnquestaValorDTO;
+import es.uv.saic.dto.IndicadorEnquestaValorDTOImp;
 import es.uv.saic.service.IndicadorEnquestaService;
 import es.uv.saic.service.IndicadorEnquestaTmpService;
 import es.uv.saic.service.IndicadorService;
 
 @RestController
-@RequestMapping("/core")
 public class IndicadorController {
     @Autowired
     private IndicadorService is;
@@ -92,10 +93,17 @@ public class IndicadorController {
     /*
      * Endpoint2 para la funcion getAllInds de ies
      */
-    @PostMapping("/allInds")
-    public List<IndicadorEnquestaValorDTO> getAllInds2(@RequestBody IndicadorEnquestaDTO indicadorEnquestaDTO) {
+   @PostMapping("/allInds")
+    public List<IndicadorEnquestaValorDTOImp> getAllInds2(@RequestBody IndicadorEnquestaDTO indicadorEnquestaDTO) {
         return ies.getAllInds(indicadorEnquestaDTO.getIdTitulacio(),
-                indicadorEnquestaDTO.getIdCentre(), indicadorEnquestaDTO.getCurs());
+                indicadorEnquestaDTO.getIdCentre(), indicadorEnquestaDTO.getCurs())
+                .stream()
+                .map(ind -> new IndicadorEnquestaValorDTOImp(
+                    ind.getEnquesta(), ind.getIndicador(), ind.getValor(), ind.getNum(), 
+                    ind.getAmbit(), ind.getTipus(), ind.getMin(), ind.getMax(), 
+                    ind.getCurs(), ind.getCursd(), ind.getMedia()
+                ))
+                .collect(Collectors.toList());
     }
 
     /*

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

@@ -31,7 +31,6 @@ import es.uv.saic.service.UsuarisRolService;
 
 // Controller for the managers administration page 
 @RestController
-@RequestMapping("/core")
 public class ManagersController {
 	
 	@Autowired

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

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 @RestController
-@RequestMapping("/core")
 public class NoticiaController {
     @Autowired
     private NoticiaService ns;

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

@@ -29,7 +29,6 @@ import es.uv.saic.service.ProcesService;
 import es.uv.saic.service.UsuariService;
 
 @RestController
-@RequestMapping("/core")
 public class OrganController {
     @Autowired
     private UsuariController uc;
@@ -199,7 +198,12 @@ public class OrganController {
         HashMap<String, Object> model = new HashMap<>();
 		List<Organ> sup_titulacions;
 		sup_titulacions = this.os.getTitulacionsByCentre(centre);
-		model.put("resp_titulacions", sup_titulacions);
+		
+		List<OrganDTO> titulacionDto = sup_titulacions.stream()
+            .map(organ -> new OrganDTO(organ)) 
+            .collect(Collectors.toList());
+		
+		model.put("resp_titulacions", titulacionDto);
 
 		return model;
 	}

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

@@ -68,7 +68,6 @@ import es.uv.saic.service.UsuariService;
 
 
 @RestController
-@RequestMapping("/core")
 public class ProceduresController {
 
     private final ProcesService procesService;

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

@@ -18,7 +18,6 @@ import es.uv.saic.service.EmailService;
 
 // Controller to handle admin statistics page
 @RestController
-@RequestMapping("/core")
 public class StatsController {
 	
 	@Autowired

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

@@ -5,6 +5,7 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,7 +32,6 @@ import es.uv.saic.service.UsuarisRolService;
 
 // Render the supervision page and handle supervision searches
 @RestController
-@RequestMapping("/core")
 public class SupervisionController {
 	
 	@Autowired
@@ -56,7 +56,7 @@ public class SupervisionController {
 	 * @return The name of the view to render
 	 */
 	@PostMapping("/supervision")
-	public HashMap<String, Object> supervisionForm(@RequestParam String usuari, @RequestParam(required = false) SupervisionSearchParams ssp) {
+	public HashMap<String, Object> supervisionForm(@RequestParam String usuari, @RequestBody Optional<SupervisionSearchParams> ssp) {
 		HashMap<String, Object> model = new HashMap<>();
 
 		if(usuari.equals("procedures") || usuari.equals("evidences"))
@@ -243,8 +243,8 @@ public class SupervisionController {
 	 * @param session The HTTP session
 	 * @return The name of the view to render
 	 */
-	@GetMapping("/supervision/search")
-	public HashMap<String, Object> restoreSearch(@RequestBody String usuari, @RequestParam SupervisionSearchParams ssp) {
+	@PostMapping("/supervision/restore")
+	public HashMap<String, Object> restoreSearch(@RequestBody String usuari, @RequestBody SupervisionSearchParams ssp) {
 		HashMap<String, Object> model = new HashMap<>();
 		Usuari u = us.findByUsername(usuari);
 

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

@@ -28,7 +28,6 @@ import es.uv.saic.service.TascaService;
 
 
 @RestController
-@RequestMapping("/core")
 public class TascaController {
     @Autowired
     TascaService ts;

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

@@ -20,7 +20,6 @@ import es.uv.saic.service.UsuarisRolService;
 
 
 @RestController
-@RequestMapping("/core")
 public class UsuariController {
     @Autowired
     UsuariService us;

src/main/resources/application-local.properties

@@ -1,8 +1,13 @@
-server.port = 8080
+server.port = 0
+spring.application.name = core-service
+eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka
+eureka.instance.prefer-ip-address=false
+eureka.instance.status-page-url-path=/
+
 # Urls
-saic.url.domain = http://127.0.0.1:8080
-saic.url.data.domain = http://127.0.0.1:8081
-saic.url.docs.domain = http://127.0.0.1:8082
+saic.url.domain = http://core-service
+saic.url.data.domain = http://data-service
+saic.url.docs.domain = http://docs-service
 saic.url.public = ${saic.url.domain}/public
 
 # JPA Debug
@@ -42,10 +47,7 @@ saic.data.evdocente = C:\\SAIC\\databases\\ev_docente\\latest\\
 saic.scheduler.expired.enabled=false
 
 # Actuator
-spring.application.name = UV SAIC [LO]
 spring.boot.admin.client.url=http://127.0.0.1:9090
-spring.boot.admin.client.instance.management-base-url=${saic.url.domain}
-spring.boot.admin.client.instance.service-url=${saic.url.domain}
 spring.boot.admin.client.username=admin
 spring.boot.admin.client.password=kkdvk
 management.endpoints.web.exposure.include=*