#64 - Add error handling in monitoring service

- add country TR - add try-catch-block in monitorBeaconResource function - add ERROR in HttpStatusCategory
ejp-rd-vp · Oct 10, 2024 · 3c150c3 · 3c150c3
1 parent 3cc6736
commit 3c150c3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/...ava/org/ejprarediseases/vpdpbackend/resource_monitoring/v1/ResourceMonitoringService.java b/...ava/org/ejprarediseases/vpdpbackend/resource_monitoring/v1/ResourceMonitoringService.java
@@ -80,17 +80,21 @@ void monitorBeaconResource(Resource resource) {
         long startTime = System.currentTimeMillis();
         Monitor monitor = new Monitor();
         monitor.setResourceId(resource.getId());
-        WebClient client = WebClient.create();
-        Mono<String> response = client.post()
-                .uri( resource.getResourceAddress())
-                .bodyValue(defaultRequestBody)
-                .accept(MediaType.APPLICATION_JSON)
-                .header("auth-key", authKey)
-                .exchangeToMono(rs -> {
-                    monitor.setResponseStatusCode(rs.statusCode().value());
-                    return rs.bodyToMono(String.class);
-                });
-        monitor.setResponseBody(response.block());
+        try{
+            WebClient client = WebClient.create();
+            Mono<String> response = client.post()
+                    .uri( resource.getResourceAddress())
+                    .bodyValue(defaultRequestBody)
+                    .accept(MediaType.APPLICATION_JSON)
+                    .header("auth-key", authKey)
+                    .exchangeToMono(rs -> {
+                        monitor.setResponseStatusCode(rs.statusCode().value());
+                        return rs.bodyToMono(String.class);
+                    });
+            monitor.setResponseBody(response.block());
+        }catch (Exception exception){
+            System.out.println("Error monitorBeaconResource " + resource.getResourceName());
+        }
         long endTime = System.currentTimeMillis();
         monitor.setResponseTime(endTime - startTime);
         repository.save(monitor);
@@ -218,6 +222,7 @@ private static HttpStatusCategory monitorToHttpStatusCategory(Monitor monitor) {
         int statusCodeCategoryIndicator =
                 Integer.parseInt(String.valueOf(monitor.getResponseStatusCode()).substring(0, 1));
         return switch (statusCodeCategoryIndicator) {
+            case 0 -> ERROR;
             case 1 -> INFORMATIONAL_RESPONSE;
             case 2 -> SUCCESSFUL_RESPONSE;
             case 3 -> REDIRECTION_RESPONSE;

diff --git a/...rg/ejprarediseases/vpdpbackend/resource_monitoring/v1/model/enums/HttpStatusCategory.java b/...rg/ejprarediseases/vpdpbackend/resource_monitoring/v1/model/enums/HttpStatusCategory.java
@@ -5,5 +5,6 @@ public enum HttpStatusCategory {
     SUCCESSFUL_RESPONSE,
     REDIRECTION_RESPONSE,
     CLIENT_ERROR_RESPONSE,
-    SERVER_ERROR_RESPONSE;
+    SERVER_ERROR_RESPONSE,
+    ERROR;
 }
diff --git a/src/main/java/org/ejprarediseases/vpdpbackend/search/v1/model/beacon/enums/Country.java b/src/main/java/org/ejprarediseases/vpdpbackend/search/v1/model/beacon/enums/Country.java
@@ -29,5 +29,6 @@ public enum Country {
     SK,
     SI,
     ES,
-    SE;
+    SE,
+    TR;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,6 @@ public enum Country { @@
         SK,
         SI,
         ES,
-        SE;
+        SE,
+        TR;
     }