Security

application/src/main/java/cz/muni/pa165/service/ApplicationService.java

@@ -8,11 +8,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.core.io.Resource;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClientException;
 
 import java.time.LocalDate;
 import java.util.HashMap;
@@ -26,17 +28,26 @@ import java.util.Optional;
 @Service
 public class ApplicationService {
     private static final Logger log = LoggerFactory.getLogger(ApplicationService.class);
-    private static final String NOTIFICATION_MODULE_URL = "http://localhost:8083";
+    private static final String NOTIFICATION_MODULE_DOCKER = "http://notification:8083";
+    private static final String NOTIFICATION_MODULE_LOCALHOST = "http://localhost:8083";
+    private String NOTIFICATION_MODULE_URL;
     private static final String NOTIFICATION_MODULE_URI_NEW = "/notification/application/new";
     private static final String NOTIFICATION_MODULE_URI_STATUS = "/notification/application/status";
     private static final List<String> NOTIFICATION_RECEIVERS = List.of("formula.team.management@gmail.com");
-
     private final ApplicationRepository applicationRepository;
     private final WebClient webClient;
 
     @Autowired
     public ApplicationService(ApplicationRepository applicationRepository, WebClient.Builder webClientBuilder) {
         this.applicationRepository = applicationRepository;
+
+        //if running in docker, modules cannot communicate through localhost
+        if (System.getenv("DOCKER") != null) {
+            NOTIFICATION_MODULE_URL = NOTIFICATION_MODULE_DOCKER;
+        }
+        else {
+            NOTIFICATION_MODULE_URL = NOTIFICATION_MODULE_LOCALHOST;
+        }
         this.webClient = webClientBuilder.baseUrl(NOTIFICATION_MODULE_URL).build();
     }
 
@@ -53,7 +64,7 @@ public class ApplicationService {
 
         try {
             sendPostRequest(savedApplication, NOTIFICATION_MODULE_URI_NEW, List.of(savedApplication.getEmail()));
-        } catch (RestClientException | IllegalArgumentException e) {
+        } catch (WebClientException  e) {
             log.debug(String.format("The notification module is not reachable on the URL: %s, exception %s", NOTIFICATION_MODULE_URL + NOTIFICATION_MODULE_URI_NEW, e));
         }
 
@@ -80,7 +91,7 @@ public class ApplicationService {
         if (savedApplication.getStatus() != ApplicationStatusEnum.PENDING) {
             try {
                 sendPostRequest(savedApplication, NOTIFICATION_MODULE_URI_STATUS, NOTIFICATION_RECEIVERS);
-            } catch (RestClientException | IllegalArgumentException e) {
+            } catch (WebClientException e) {
                 log.debug(String.format("The notification module is not reachable on the URL: %s, exception %s", NOTIFICATION_MODULE_URL + NOTIFICATION_MODULE_URI_STATUS, e));
             }
         }
@@ -98,10 +109,7 @@ public class ApplicationService {
                 .contentType(MediaType.APPLICATION_JSON)
                 .bodyValue(notification)
                 .retrieve()
-                .bodyToMono(new ParameterizedTypeReference<Map<String, Object>>() {})
-                .doOnError(error -> {
-                    throw new RestClientException("Failed to send POST request", error);
-                })
+                .bodyToMono(Resource.class)
                 .block();
     }
 }