SCRUM-122 예약 내역에 수정이 생기면 알림이 발송 된다

src/main/java/com/wellmeet/config/WebPushConfig.java

@@ -0,0 +1,28 @@
+package com.wellmeet.config;
+
+import java.security.GeneralSecurityException;
+import java.security.Security;
+import lombok.RequiredArgsConstructor;
+import nl.martijndwars.webpush.PushService;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("!test")
+@RequiredArgsConstructor
+public class WebPushConfig {
+
+    private final VapidConfig vapidConfig;
+
+    @Bean
+    public PushService pushService() throws GeneralSecurityException {
+        Security.addProvider(new BouncyCastleProvider());
+        PushService pushService = new PushService();
+        pushService.setPublicKey(vapidConfig.getPublicKey());
+        pushService.setPrivateKey(vapidConfig.getPrivateKey());
+        pushService.setSubject(vapidConfig.getSubject());
+        return pushService;
+    }
+}

src/main/java/com/wellmeet/notification/consumer/NotificationSender.java

@@ -21,8 +21,8 @@ public class NotificationSender {
     public void send(NotificationMessage message, List<NotificationEnabled> enables) {
         NotificationHistory history = new NotificationHistory(message.getRecipient(),
                 message.getPayload().toString());
+        notificationHistoryRepository.save(history);
         for (NotificationEnabled enabled : enables) {
-            notificationHistoryRepository.save(history);
             Sender sender = senders.stream()
                     .filter(low -> low.isEnabled(enabled.getChannel()))
                     .findFirst()

src/main/java/com/wellmeet/notification/consumer/dto/MessageHeader.java

@@ -10,5 +10,4 @@ public class MessageHeader {
 
     private String messageId;
     private LocalDateTime timestamp;
-    private String source;
 }

src/main/java/com/wellmeet/notification/consumer/dto/NotificationType.java

@@ -5,5 +5,8 @@
 @Getter
 public enum NotificationType {
 
-    RESERVATION_CREATED
+    RESERVATION_CREATED,
+    RESERVATION_CONFIRMED,
+    RESERVATION_UPDATED,
+    RESERVATION_CANCELED,
 }

src/main/java/com/wellmeet/notification/webpush/WebPushService.java

@@ -7,8 +7,8 @@
 import com.wellmeet.notification.webpush.dto.SubscribeResponse;
 import com.wellmeet.notification.webpush.dto.TestPushRequest;
 import com.wellmeet.notification.webpush.dto.UnsubscribeRequest;
-import com.wellmeet.notification.webpush.infrastructure.WebPushSender;
 import com.wellmeet.notification.webpush.repository.PushSubscriptionRepository;
+import com.wellmeet.notification.webpush.sender.WebPushSender;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;

src/main/java/com/wellmeet/notification/webpush/infrastructure/WebPushSender.java → src/main/java/com/wellmeet/notification/webpush/sender/WebPushSender.java

@@ -1,7 +1,6 @@
-package com.wellmeet.notification.webpush.infrastructure;
+package com.wellmeet.notification.webpush.sender;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.wellmeet.config.VapidConfig;
 import com.wellmeet.exception.ErrorCode;
 import com.wellmeet.exception.WellMeetNotificationException;
 import com.wellmeet.notification.Sender;
@@ -10,10 +9,8 @@
 import com.wellmeet.notification.webpush.domain.PushSubscription;
 import com.wellmeet.notification.webpush.dto.TestPushRequest;
 import com.wellmeet.notification.webpush.repository.PushSubscriptionRepository;
-import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.security.Security;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,7 +20,6 @@
 import nl.martijndwars.webpush.PushService;
 import nl.martijndwars.webpush.Subscription;
 import nl.martijndwars.webpush.Subscription.Keys;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.jose4j.lang.JoseException;
 import org.springframework.stereotype.Service;
 
@@ -32,22 +28,8 @@
 public class WebPushSender implements Sender {
 
     private final PushSubscriptionRepository pushSubscriptionRepository;
-    private final VapidConfig vapidConfig;
+    private final PushService pushService;
     private final ObjectMapper objectMapper = new ObjectMapper();
-    private PushService pushService;
-
-    @PostConstruct
-    public void init() {
-        Security.addProvider(new BouncyCastleProvider());
-        try {
-            pushService = new PushService();
-            pushService.setPublicKey(vapidConfig.getPublicKey());
-            pushService.setPrivateKey(vapidConfig.getPrivateKey());
-            pushService.setSubject(vapidConfig.getSubject());
-        } catch (Exception e) {
-            throw new WellMeetNotificationException(ErrorCode.INTERNAL_SERVER_ERROR);
-        }
-    }
 
     @Override
     public boolean isEnabled(NotificationChannel channel) {

src/test/java/com/wellmeet/BaseControllerTest.java

@@ -1,5 +1,6 @@
 package com.wellmeet;
 
+import com.wellmeet.config.WebPushTestConfig;
 import com.wellmeet.notification.webpush.repository.PushSubscriptionRepository;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
@@ -11,11 +12,13 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 
 @ExtendWith(DataBaseCleaner.class)
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Import(WebPushTestConfig.class)
 public abstract class BaseControllerTest {
 
     @Autowired

src/test/java/com/wellmeet/BaseServiceTest.java

@@ -1,14 +1,17 @@
 package com.wellmeet;
 
+import com.wellmeet.config.WebPushTestConfig;
 import com.wellmeet.notification.webpush.repository.PushSubscriptionRepository;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 
 @ExtendWith(DataBaseCleaner.class)
 @ActiveProfiles("test")
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE)
+@Import(WebPushTestConfig.class)
 public abstract class BaseServiceTest {
 
     @Autowired

src/test/java/com/wellmeet/WellmeetNotificationApplicationTests.java

@@ -1,11 +1,14 @@
 package com.wellmeet;
 
+import com.wellmeet.config.WebPushTestConfig;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 
 @SpringBootTest
 @ActiveProfiles("test")
+@Import(WebPushTestConfig.class)
 class WellmeetNotificationApplicationTests {
 
     @Test

src/test/java/com/wellmeet/config/WebPushTestConfig.java

@@ -0,0 +1,18 @@
+package com.wellmeet.config;
+
+import static org.mockito.Mockito.mock;
+
+import nl.martijndwars.webpush.PushService;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+
+@TestConfiguration
+public class WebPushTestConfig {
+
+    @Bean
+    @Primary
+    public PushService pushService() {
+        return mock(PushService.class);
+    }
+}