Mario Martínez Hernández 1 month ago
parent
commit
1d52efbf96

+ 25 - 8
src/main/java/es/uv/saic/service/DataService.java

@@ -51,12 +51,6 @@ import es.uv.saic.domain.Datasource;
 public class DataService {
 	
 	@Autowired
-	private IndicadorEnquestaService ies;
-	
-	@Autowired
-	private EmailService ems;
-	
-	@Autowired
 	private DatasourceService dss;
 
 	@Value("${saic.url.domain}")
@@ -386,13 +380,13 @@ public class DataService {
 			return -1;
 		}
 		else {
-			Integer i = this.ies.consolidateByEnquesta(enquesta);
+			Integer i = consolidateByEnquestaAux(enquesta);
 			deleteByEnquesta(enquesta);
 			return i;
 		}
 	}
 
-	public Integer countByEnquesta(String enquesta) {
+    public Integer countByEnquesta(String enquesta) {
 		return countByEnquestaAux(enquesta);
 	}
 
@@ -777,4 +771,27 @@ public class DataService {
 			e.printStackTrace();
 		}
 	}
+
+	private Integer consolidateByEnquestaAux(String enquesta) {
+		URI uriObj = URI.create(uri + "/consolidateByEnquesta/" + enquesta);
+		try {
+			HttpClient httpClient = HttpClient.newHttpClient();
+			HttpRequest request = HttpRequest.newBuilder()
+					.uri(uriObj)
+					.GET()
+					.build();
+
+			HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
+
+			if (response.statusCode() == HttpURLConnection.HTTP_OK) {
+				return Integer.parseInt(response.body());
+			} else {
+				System.err.println("Failed to find to consolidateByEnquesta. HTTP error code: " + response.statusCode());
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return 0;
+	}
 }

+ 6 - 1
src/main/java/es/uv/saic/web/IndicadorController.java

@@ -258,5 +258,10 @@ public class IndicadorController {
     public List<IndicadorEnquestaTmpDup> checkIntegrity(@PathVariable String enquesta) {
         return iets.checkDuplicates(enquesta);
     }
-        
+
+    @GetMapping("/consolidateByEnquestaAux/{enquesta}")
+    public Integer consolidateByEnquestaAux(@PathVariable String enquesta) {
+        return ies.consolidateByEnquesta(enquesta);
+    }
+    
 }