fix: 게시글 알림 구독이 꺼져있어야할 경우에도 계속 켜져있다고 응답하는 이슈

khu-dev · Jan 13, 2022 · 15effda · 15effda
1 parent cff0b0c
commit 15effda
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/com/khumu/alimi/controller/NotificationController.java b/src/main/java/com/khumu/alimi/controller/NotificationController.java
@@ -108,7 +108,7 @@ public DefaultResponse<Object> subscribeResource(
             @AuthenticationPrincipal SimpleKhumuUserDto user,
             @PathVariable String username,
             @PathVariable ResourceKind resourceKind,
-            @PathVariable Long resourceId) throws Exception {
+            @PathVariable Long resourceId) {
         ResourceNotificationSubscriptionDto subscriptionDto = notificationService.getSubscription(
                 user,
                 ResourceNotificationSubscription.builder()

diff --git a/src/main/java/com/khumu/alimi/data/dto/AnnouncementDto.java b/src/main/java/com/khumu/alimi/data/dto/AnnouncementDto.java
@@ -16,9 +16,10 @@
     "sub_link": "http://ce.khu.ac.kr/index.php?hCode=BOARD&page=view&idx=2330&bo_idx=1",
     "date": "2021-08-06 11:15:38",
     "author": {
-    "id": 1,
-    "author_name": "컴퓨터공학과",
-    "followed": false
+        "id": 1,
+        "author_name": "컴퓨터공학과",
+        "followed": false
+    }
 }
  */
 @AllArgsConstructor

diff --git a/src/main/java/com/khumu/alimi/service/notification/NotificationService.java b/src/main/java/com/khumu/alimi/service/notification/NotificationService.java
@@ -146,7 +146,13 @@ public void unsubscribe(SimpleKhumuUserDto requestUser, ResourceNotificationSubs
     // 사실상 isActivated을 조회하기 위함.
     public ResourceNotificationSubscriptionDto getSubscription(SimpleKhumuUserDto requestUser, ResourceNotificationSubscription subscription) {
         // 우선 인증 패스했다고 가정
-        subscription = resourceNotificationSubscriptionRepository.getOrCreate(subscription);
+        List<ResourceNotificationSubscription> subscriptions = resourceNotificationSubscriptionRepository.findAllBySubscriberAndResourceKindAndResourceId(subscription.getSubscriber(), subscription.getResourceKind(), subscription.getResourceId());
+        if (subscriptions.isEmpty()){
+            subscription.setIsActivated(false);
+            return notificationMapper.toDto(subscription);
+        }
+
+        subscription = subscriptions.get(subscriptions.size() - 1);
         return notificationMapper.toDto(subscription);
     }