feat : 알림 구독 Api 구현

src/main/java/in/koreatech/koin/domain/user/controller/UserApi.java

@@ -1,6 +1,5 @@
 package in.koreatech.koin.domain.user.controller;
 
-import static in.koreatech.koin.domain.user.model.UserType.OWNER;
 import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
 
 import org.springframework.http.ResponseEntity;
@@ -13,8 +12,6 @@
 
 import in.koreatech.koin.domain.user.dto.EmailCheckExistsRequest;
 import in.koreatech.koin.domain.user.dto.NicknameCheckExistsRequest;
-import in.koreatech.koin.domain.user.dto.NotificationPermitRequest;
-import in.koreatech.koin.domain.user.dto.NotificationStatusResponse;
 import in.koreatech.koin.domain.user.dto.StudentResponse;
 import in.koreatech.koin.domain.user.dto.StudentUpdateRequest;
 import in.koreatech.koin.domain.user.dto.StudentUpdateResponse;
@@ -142,52 +139,6 @@ ResponseEntity<Void> checkUserEmailExist(
         @Valid EmailCheckExistsRequest request
     );
 
-    @ApiResponses(
-        value = {
-            @ApiResponse(responseCode = "200"),
-            @ApiResponse(responseCode = "400", content = @Content(schema = @Schema(hidden = true))),
-            @ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
-            @ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
-            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
-        }
-    )
-    @Operation(summary = "푸쉬알림 동의 여부 조회")
-    @GetMapping("/user/notification")
-    ResponseEntity<NotificationStatusResponse> checkNotificationStatus(
-        @Auth(permit = {STUDENT, OWNER}) Long memberId
-    );
-
-    @ApiResponses(
-        value = {
-            @ApiResponse(responseCode = "200"),
-            @ApiResponse(responseCode = "400"),
-            @ApiResponse(responseCode = "401"),
-            @ApiResponse(responseCode = "403"),
-            @ApiResponse(responseCode = "404"),
-        }
-    )
-    @Operation(summary = "푸쉬알림 동의")
-    @PostMapping("/user/notification")
-    ResponseEntity<Void> permitNotification(
-        @Auth(permit = {STUDENT, OWNER}) Long memberId,
-        @Valid @RequestBody NotificationPermitRequest request
-    );
-
-    @ApiResponses(
-        value = {
-            @ApiResponse(responseCode = "200"),
-            @ApiResponse(responseCode = "400"),
-            @ApiResponse(responseCode = "401"),
-            @ApiResponse(responseCode = "403"),
-            @ApiResponse(responseCode = "404"),
-        }
-    )
-    @Operation(summary = "푸쉬알림 거절")
-    @DeleteMapping("/user/notification")
-    ResponseEntity<Void> rejectNotification(
-        @Auth(permit = {STUDENT, OWNER}) Long memberId
-    );
-
     @ApiResponses(
         value = {
             @ApiResponse(responseCode = "200"),

src/main/java/in/koreatech/koin/domain/user/controller/UserController.java

@@ -22,14 +22,9 @@
 import in.koreatech.koin.domain.user.dto.UserLoginResponse;
 import in.koreatech.koin.domain.user.dto.UserTokenRefreshRequest;
 import in.koreatech.koin.domain.user.dto.UserTokenRefreshResponse;
-
-import static in.koreatech.koin.domain.user.model.UserType.OWNER;
-import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
 import in.koreatech.koin.domain.user.service.StudentService;
 import in.koreatech.koin.domain.user.service.UserService;
 import in.koreatech.koin.global.auth.Auth;
-import in.koreatech.koin.domain.user.dto.NotificationPermitRequest;
-import in.koreatech.koin.domain.user.dto.NotificationStatusResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
@@ -105,28 +100,4 @@ public ResponseEntity<Void> checkDuplicationOfNickname(
         userService.checkUserNickname(request);
         return ResponseEntity.ok().build();
     }
-
-    @GetMapping("/user/notification")
-    public ResponseEntity<NotificationStatusResponse> checkNotificationStatus(
-        @Auth(permit = {STUDENT, OWNER}) Long memberId
-    ) {
-        return ResponseEntity.ok(userService.checkNotification(memberId));
-    }
-
-    @PostMapping("/user/notification")
-    public ResponseEntity<Void> permitNotification(
-        @Auth(permit = {STUDENT, OWNER}) Long memberId,
-        @Valid @RequestBody NotificationPermitRequest request
-    ) {
-        userService.permitNotification(memberId, request.deviceToken());
-        return ResponseEntity.ok().build();
-    }
-
-    @DeleteMapping("/user/notification")
-    public ResponseEntity<Void> rejectNotification(
-        @Auth(permit = {STUDENT, OWNER}) Long memberId
-    ) {
-        userService.rejectNotification(memberId);
-        return ResponseEntity.ok().build();
-    }
 }

src/main/java/in/koreatech/koin/domain/user/service/UserService.java

@@ -10,7 +10,6 @@
 
 import in.koreatech.koin.domain.user.dto.EmailCheckExistsRequest;
 import in.koreatech.koin.domain.user.dto.NicknameCheckExistsRequest;
-import in.koreatech.koin.domain.user.dto.NotificationStatusResponse;
 import in.koreatech.koin.domain.user.dto.UserLoginRequest;
 import in.koreatech.koin.domain.user.dto.UserLoginResponse;
 import in.koreatech.koin.domain.user.dto.UserTokenRefreshRequest;
@@ -93,21 +92,4 @@ public void checkUserNickname(NicknameCheckExistsRequest request) {
             throw DuplicationEmailException.withDetail("nickname: " + request.nickname());
         });
     }
-
-    public NotificationStatusResponse checkNotification(Long userId) {
-        User user = userRepository.getById(userId);
-        return new NotificationStatusResponse(user.getDeviceToken() != null);
-    }
-
-    @Transactional
-    public void permitNotification(Long userId, String deviceToken) {
-        User user = userRepository.getById(userId);
-        user.permitNotification(deviceToken);
-    }
-
-    @Transactional
-    public void rejectNotification(Long userId) {
-        User user = userRepository.getById(userId);
-        user.rejectNotification();
-    }
 }

src/main/java/in/koreatech/koin/global/domain/notification/controller/NotificationApi.java

@@ -0,0 +1,107 @@
+package in.koreatech.koin.global.domain.notification.controller;
+
+import static in.koreatech.koin.domain.user.model.UserType.COOP;
+import static in.koreatech.koin.domain.user.model.UserType.OWNER;
+import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import in.koreatech.koin.global.auth.Auth;
+import in.koreatech.koin.global.domain.notification.model.NotificationSubscribeType;
+import in.koreatech.koin.global.domain.notification.dto.NotificationPermitRequest;
+import in.koreatech.koin.global.domain.notification.dto.NotificationStatusResponse;
+import in.koreatech.koin.global.domain.notification.dto.NotificationSubscribePermitRequest;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+
+@Tag(name = "(Normal) Notification: 알림", description = "알림 관련 API")
+public interface NotificationApi {
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "200"),
+            @ApiResponse(responseCode = "400", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "401", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "403", content = @Content(schema = @Schema(hidden = true))),
+            @ApiResponse(responseCode = "404", content = @Content(schema = @Schema(hidden = true))),
+        }
+    )
+    @Operation(summary = "푸쉬알림 동의 여부 조회")
+    @GetMapping("/notification")
+    ResponseEntity<NotificationStatusResponse> checkNotificationStatus(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId
+    );
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "201"),
+            @ApiResponse(responseCode = "400"),
+            @ApiResponse(responseCode = "401"),
+            @ApiResponse(responseCode = "403"),
+            @ApiResponse(responseCode = "404"),
+        }
+    )
+    @Operation(summary = "푸쉬알림 동의")
+    @PostMapping("/notification")
+    ResponseEntity<Void> permitNotification(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId,
+        @Valid @RequestBody NotificationPermitRequest request
+    );
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "201"),
+            @ApiResponse(responseCode = "400"),
+            @ApiResponse(responseCode = "401"),
+            @ApiResponse(responseCode = "403"),
+            @ApiResponse(responseCode = "404"),
+        }
+    )
+    @Operation(summary = "특정 푸쉬알림 구독")
+    @PostMapping("/notification/subscribe")
+    ResponseEntity<Void> permitNotificationSubscribe(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId,
+        @Valid @RequestBody NotificationSubscribePermitRequest request
+    );
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "204"),
+            @ApiResponse(responseCode = "400"),
+            @ApiResponse(responseCode = "401"),
+            @ApiResponse(responseCode = "403"),
+            @ApiResponse(responseCode = "404"),
+        }
+    )
+    @Operation(summary = "푸쉬알림 거절")
+    @DeleteMapping("/notification")
+    ResponseEntity<Void> rejectNotification(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId
+    );
+
+    @ApiResponses(
+        value = {
+            @ApiResponse(responseCode = "204"),
+            @ApiResponse(responseCode = "400"),
+            @ApiResponse(responseCode = "401"),
+            @ApiResponse(responseCode = "403"),
+            @ApiResponse(responseCode = "404"),
+        }
+    )
+    @Operation(summary = "특정 푸쉬알림 구독 취소")
+    @DeleteMapping("/notification/subscribe")
+    ResponseEntity<Void> rejectNotificationSubscribe(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId,
+        @Valid @ModelAttribute("type") NotificationSubscribeType notificationSubscribeType
+    );
+}

src/main/java/in/koreatech/koin/global/domain/notification/controller/NotificationController.java

@@ -0,0 +1,72 @@
+package in.koreatech.koin.global.domain.notification.controller;
+
+import static in.koreatech.koin.domain.user.model.UserType.COOP;
+import static in.koreatech.koin.domain.user.model.UserType.OWNER;
+import static in.koreatech.koin.domain.user.model.UserType.STUDENT;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import in.koreatech.koin.global.auth.Auth;
+import in.koreatech.koin.global.domain.notification.service.NotificationService;
+import in.koreatech.koin.global.domain.notification.model.NotificationSubscribeType;
+import in.koreatech.koin.global.domain.notification.dto.NotificationPermitRequest;
+import in.koreatech.koin.global.domain.notification.dto.NotificationStatusResponse;
+import in.koreatech.koin.global.domain.notification.dto.NotificationSubscribePermitRequest;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+public class NotificationController implements NotificationApi {
+
+    private final NotificationService notificationService;
+
+    @GetMapping("/notification")
+    public ResponseEntity<NotificationStatusResponse> checkNotificationStatus(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId
+    ) {
+        return ResponseEntity.ok(notificationService.checkNotification(userId));
+    }
+
+    @PostMapping("/notification")
+    public ResponseEntity<Void> permitNotification(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId,
+        @Valid @RequestBody NotificationPermitRequest request
+    ) {
+        notificationService.permitNotification(userId, request.deviceToken());
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
+
+    @PostMapping("/notification/subscribe")
+    public ResponseEntity<Void> permitNotificationSubscribe(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId,
+        @Valid @RequestBody NotificationSubscribePermitRequest subscribePermitRequest
+    ) {
+        notificationService.permitNotificationSubscribe(userId, subscribePermitRequest);
+        return ResponseEntity.status(HttpStatus.CREATED).build();
+    }
+
+    @DeleteMapping("/notification")
+    public ResponseEntity<Void> rejectNotification(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId
+    ) {
+        notificationService.rejectNotification(userId);
+        return ResponseEntity.noContent().build();
+    }
+
+    @DeleteMapping("/notification/subscribe")
+    public ResponseEntity<Void> rejectNotificationSubscribe(
+        @Auth(permit = {STUDENT, OWNER, COOP}) Long userId,
+        @Valid @ModelAttribute("type") NotificationSubscribeType notificationSubscribeType
+    ) {
+        notificationService.rejectNotificationByType(userId, notificationSubscribeType);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/in/koreatech/koin/global/domain/notification/dto/NotificationPermitRequest.java

@@ -0,0 +1,16 @@
+package in.koreatech.koin.global.domain.notification.dto;
+
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+
+
+@JsonNaming(value = PropertyNamingStrategies.SnakeCaseStrategy.class)
+public record NotificationPermitRequest(
+    @Schema(description = "FCM 디바이스 토큰")
+    @NotBlank String deviceToken
+) {
+
+}