Merge branch 'mappings' of UV-APPS/UV_SAIC_SHARED into master

.gitignore

@@ -0,0 +1,2 @@
+
+/target

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

@@ -23,22 +23,22 @@ import fr.opensagres.xdocreport.core.XDocReportException;
 @FeignClient(name = "saic-docs-service")
 public interface DocumentClient {
 
-    @PostMapping("/documents/save")
+    @PostMapping("/document/save")
     public Document save(@RequestBody Document doc);
 
-    @PostMapping("/documents/categoria/organ")
+    @PostMapping("/document/categoria/organ")
     public Document findByCategoriaOrgan(@RequestBody CategoriaDTO categoria);
 
-    @GetMapping("/documents/{idDocument}")
+    @GetMapping("/document/{idDocument}")
     public Document findByID(@PathVariable("idDocument") Integer idDocument);
 
-    @PostMapping("/documents/upload")
+    @PostMapping("/document/upload")
     public String upload(@RequestBody DocumentTmpDTO documentTmpDTO);
 
-    @PostMapping("/documents/archive")
+    @PostMapping("/document/archive")
     public Document archive(@RequestBody Document doc);
 
-    @PostMapping("/documents/archive/organ")
+    @PostMapping("/document/archive/organ")
     public void archiveByOrgan(@RequestBody ArchiveOrganDTO organ);
 
     @GetMapping("/download/{fileName}")
@@ -57,23 +57,23 @@ public interface DocumentClient {
 	@ResponseBody 
 	public ResponseEntity<byte[]> downloadTemplate(@PathVariable("id") BigInteger idTascai);
 
-    @GetMapping(value="/test/template/{titulacio}/{centre}/{idProces}/{idTascap}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    @GetMapping(value="/download/test/template/{titulacio}/{centre}/{idProces}/{idTascap}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
 	@ResponseBody
 	public byte[] testTemplate(@PathVariable("titulacio") Integer idTitulacio, @PathVariable("centre") Integer idCentre,
 		@PathVariable("idTascap") Integer idTascap, @PathVariable("idProces") Integer idProces) 
 		throws IOException, XDocReportException;
 
-    @GetMapping(value="/test/template2/{titulacio}/{centre}/{evidencia}/{curs}/{tipusTasca}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    @GetMapping(value="/download/test/template2/{titulacio}/{centre}/{evidencia}/{curs}/{tipusTasca}", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
 	@ResponseBody
 	public ResponseEntity<byte[]> testTemplate(@PathVariable("titulacio") Integer idTitulacio, @PathVariable("centre") Integer idCentre,
 			@PathVariable("evidencia") String evidencia, @PathVariable("curs") Integer curs,
             @PathVariable("tipusTasca") Integer tipusTasca);
 
-    @GetMapping(value="/pdf/{idTascai}")
+    @GetMapping(value="/download/pdf/{idTascai}")
 	@ResponseBody
 	public byte[] downloadTemplatePdf(@PathVariable("idTascai") BigInteger idTascai);
 
-    @PostMapping(value="/pdf/preview")
+    @PostMapping(value="/download/pdf/preview")
 	@ResponseBody
 	public byte[] downloadTemplatePdf(@RequestBody PdfDTO pdf);
 

src/main/java/es/uv/saic/shared/feign/IndicadorClient.java

@@ -76,7 +76,7 @@ public interface IndicadorClient {
     @PostMapping("/indicadorEnquesta/download/templatedata")
     public HashMap<String, String> getTemplateData(@RequestParam Integer idTitulacio, @RequestParam Integer idCentre, @RequestParam Integer curs);
 
-    @PostMapping("/templatedata/array")
+    @PostMapping("/indicadorEnquesta/templatedata/array")
     public HashMap<String, String> getTemplateDataArray(@RequestParam Integer idTitulacio, @RequestParam Integer idCentre, @RequestParam Integer curs);
 
     @GetMapping("/indicadorEnquesta/{ruct}/{curs}")

src/main/java/es/uv/saic/shared/feign/OrganClient.java

@@ -78,13 +78,13 @@ public interface OrganClient {
     @PostMapping("/organ/equivalents")
 	public List<Integer> getEquivalents(@RequestParam Integer lugar, @RequestParam String tlugar);
 
-    @PostMapping("/organs/new/centre")
+    @PostMapping("/organ/new/centre")
     public void createNewCentre(@RequestParam("codiCentro") Integer codigo,
             @RequestParam("nomCasCentro") String nomCas,
             @RequestParam("nomValCentro") String nomVal,
             @RequestParam("ructCentro") Integer ruct);
 
-    @PostMapping("/organs/new/titulacion")
+    @PostMapping("/organ/new/titulacion")
     public void createNewTitulacion(@RequestParam("codiTit") Integer codigo,
             @RequestParam("centre") Integer idCentro,
             @RequestParam("nomCasTit") String nomCas,
@@ -92,14 +92,14 @@ public interface OrganClient {
             @RequestParam("ructTit") Integer ruct,
             @RequestParam("tambit") String ambit);
     
-    @PostMapping("organs/update/centre")
+    @PostMapping("organ/update/centre")
 	public void updateCentre(@RequestParam("lugar") Integer lugar,
 			@RequestParam("tlugar") String tlugar,
 			@RequestParam("nomCasTit") String nomCas,
 			@RequestParam("nomValTit") String nomVal,
 			@RequestParam("ructTit") Integer ruct);
 
-    @PostMapping("organs/update/titulacion")
+    @PostMapping("organ/update/titulacion")
 	public void updateTitulacion(@RequestParam("lugar") Integer lugar,
 			@RequestParam("tlugar") String tlugar,
 			@RequestParam("nomCasTit") String nomCas,

src/main/java/es/uv/saic/shared/feign/UsuariClient.java

@@ -13,18 +13,18 @@ import es.uv.saic.shared.dto.UsuariDTO;
 
 @FeignClient(name = "saic-core-service", contextId = "usuari-controller")
 public interface UsuariClient {
-    @PostMapping("/grantedUser")
+    @PostMapping("/user/granted")
     public boolean isGrantedUser(@RequestBody Usuari usuari);
 
-    @PostMapping("/grantedSupervisor")
+    @PostMapping("/user/supervisor")
     public boolean isGrantedSupervisor(@RequestBody Usuari usuari);
 
-    @GetMapping("/find/allRols")
+    @GetMapping("/user/rols")
     public List<RolDTO> findAllRols();
 
-    @GetMapping("/find/assignables")
+    @GetMapping("/user/assignables")
     public List<RolDTO> findAssignables();
 
-    @GetMapping("/find/allUsers")
+    @GetMapping("/user")
     public List<UsuariDTO> findAllUsers();
 }