Merge branch 'dev'

khu-dev · Dec 30, 2021 · a491e41 · a491e41
2 parents 7d21669 + cff0b0c
commit a491e41
Show file tree

Hide file tree

Showing 17 changed files with 192 additions and 48 deletions.
diff --git a/src/main/java/com/khumu/alimi/controller/NotificationController.java b/src/main/java/com/khumu/alimi/controller/NotificationController.java
@@ -4,7 +4,7 @@
 import com.khumu.alimi.data.ResourceKind;
 import com.khumu.alimi.data.dto.*;
 import com.khumu.alimi.data.entity.ResourceNotificationSubscription;
-import com.khumu.alimi.service.NotifyAnnouncementCrawledService;
+import com.khumu.alimi.service.AnnouncementService;
 import com.khumu.alimi.service.notification.NotificationService;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
@@ -23,7 +23,7 @@
 @RestController
 public class NotificationController {
     private final NotificationService notificationService;
-    private final NotifyAnnouncementCrawledService announcementEventService;
+    private final AnnouncementService announcementEventService;
 
     @RequestMapping(value="/ping", method=RequestMethod.GET)
     public String ping() {

diff --git a/src/main/java/com/khumu/alimi/data/ResourceKind.java b/src/main/java/com/khumu/alimi/data/ResourceKind.java
@@ -1,5 +1,5 @@
 package com.khumu.alimi.data;
 
 public enum ResourceKind {
-    comment, article, announcement, study_article, haksa_schedule
+    user, comment, article, announcement, study_article, haksa_schedule
 }
diff --git a/src/main/java/com/khumu/alimi/data/dto/KhumuUserDto.java b/src/main/java/com/khumu/alimi/data/dto/KhumuUserDto.java
@@ -0,0 +1,41 @@
+package com.khumu.alimi.data.dto;
+
+import lombok.*;
+
+/**
+ * 이벤트 메시지로 전달받는 유저 정보. 이 중 필요한 필드만 사용한다.
+ {
+    "last_login": null,
+    "is_active": true,
+    "date_joined": "2021-12-03T03:27:35.493",
+    "username": "jinsu.dev",
+    "kind": "guest",
+    "nickname": "\\uac1c\\ubc1c\\ud558\\ub294 \\ud638\\ub791\\uc774",
+    "student_number": "2000123123",
+    "department": "\\ud559\\uacfc \\ubbf8\\uc124\\uc815",
+    "created_at": "2021-12-03T03:27:35.493",
+    "status": "deleted",
+    "is_superuser": false,
+    "profile_image": null,
+    "info21_authenticated_at": null,
+    "groups": [],
+    "user_permissions": []
+ }
+ */
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+@Builder
+public class KhumuUserDto {
+    private String username;
+
+    @Override
+    public String toString() {
+        return "KhumuUserDto{" +
+                "username='" + username + '\'' +
+                '}';
+    }
+}
+
+
diff --git a/src/main/java/com/khumu/alimi/data/dto/NewAnnouncementCrawledDto.java b/src/main/java/com/khumu/alimi/data/dto/NewAnnouncementCrawledDto.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
+        }
     },
     "followers": [
         "jinsu", "bo314"

diff --git a/src/main/java/com/khumu/alimi/data/entity/PushDevice.java b/src/main/java/com/khumu/alimi/data/entity/PushDevice.java
@@ -15,4 +15,9 @@ public class PushDevice {
     @Id
     String deviceToken;
     String user;
+
+    // 해당 기기에서 유저 정보를 삭제합니다.
+    public void deleteUserInfo() {
+        user = null;
+    }
 }
diff --git a/src/main/java/com/khumu/alimi/external/listener/SqsMessageListener.java b/src/main/java/com/khumu/alimi/external/listener/SqsMessageListener.java
@@ -6,10 +6,7 @@
 import com.khumu.alimi.data.dto.*;
 import com.khumu.alimi.data.resource.ArticleResource;
 import com.khumu.alimi.external.slack.SlackNotifier;
-import com.khumu.alimi.service.NotifyAnnouncementCrawledService;
-import com.khumu.alimi.service.notification.ArticleEventService;
-import com.khumu.alimi.service.notification.CommentEventService;
-import com.khumu.alimi.service.notification.HaksaScheduleEventService;
+import com.khumu.alimi.service.*;
 import io.awspring.cloud.messaging.listener.annotation.SqsListener;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,9 +16,10 @@
 @Slf4j
 @RequiredArgsConstructor
 public class SqsMessageListener {
-    final NotifyAnnouncementCrawledService announcementEventService;
-    final ArticleEventService articleEventMessageService;
-    final CommentEventService commentEventMessageService;
+    final AnnouncementService announcementEventService;
+    final ArticleService articleEventMessageService;
+    final CommentService commentEventMessageService;
+    final DeleteUserService deleteUserService;
     final HaksaScheduleEventService haksaScheduleEventService;
     final ObjectMapper objectMapper;
     final SlackNotifier slackNotifier;
@@ -38,25 +36,42 @@ public void receiveMessage(SqsMessageBodyDto body) {
             // body.getMessage()는 각각의 리소스들의 Dto를 Json 문자열로 나타낸 것이다.
             // 예를 들어 CommentDto의 Json 문자열 버젼.
             switch (resourceKind){
+                case user: {
+                    KhumuUserDto khumuUserDto = objectMapper.readValue(body.getMessage(), KhumuUserDto.class);
+                    switch (eventMessageDto.getEventKind()) {
+                        case delete:
+                            deleteUserService.delete(khumuUserDto);
+                            break;
+                        default:
+                            log.error("지원하지 않는 resource_kind와 event_kind의 조합입니다." + eventKind);
+                            break;
+                    }
+                } break;
                 case comment:{
                     CommentDto commentDto = objectMapper.readValue(body.getMessage(), CommentDto.class);
                     switch (eventMessageDto.getEventKind()) {
                         case create:
                             commentEventMessageService.subscribeArticle(commentDto);
                             commentEventMessageService.createNotificationsForNewComment(commentDto);
                             break;
+                        default:
+                            log.error("지원하지 않는 resource_kind와 event_kind의 조합입니다." + eventKind);
+                            break;
                     }
                 } break;
                 case article: {
                     ArticleResource article = objectMapper.readValue(body.getMessage(), ArticleResource.class);
                     switch (eventKind) {
                         case create:{
                             articleEventMessageService.subscribeByNewArticle(article);
-                        }break;
+                        } break;
 
                         case new_hot_article:{
                             articleEventMessageService.notifyNewHotArticle(article);
-                        }break;
+                        } break;
+                        default:
+                            log.error("지원하지 않는 resource_kind와 event_kind의 조합입니다." + eventKind);
+                            break;
                     }
                 } break;
                 case announcement:{
@@ -66,6 +81,9 @@ public void receiveMessage(SqsMessageBodyDto body) {
                             slackNotifier.sendSlack("새로운 공지사항에 대한 알림을 보냅니다.", event.getAnnouncement().getTitle());
                             announcementEventService.notifyNewAnnouncementCrawled(event);
                         } break;
+                        default:
+                            log.error("지원하지 않는 resource_kind와 event_kind의 조합입니다." + eventKind);
+                            break;
                     }
                 } break;
                 case haksa_schedule:{
@@ -75,10 +93,14 @@ public void receiveMessage(SqsMessageBodyDto body) {
                             HaksaScheduleDto haksaScheduleDto = objectMapper.readValue(body.getMessage(), HaksaScheduleDto.class);
                             haksaScheduleEventService.createNotificationForHaksaScheduleStarts(haksaScheduleDto);
                         } break;
+                        default:
+                            log.error("지원하지 않는 resource_kind와 event_kind의 조합입니다." + eventKind);
+                            break;
                     }
                 } break;
                 default:
-                    System.out.println("default");
+                    log.error("지원하지 않는 resource_kind와 event_kind의 조합입니다." + eventKind);
+                    break;
             }
 
         } catch (Exception e) {

diff --git a/src/main/java/com/khumu/alimi/external/push/FcmPushManager.java b/src/main/java/com/khumu/alimi/external/push/FcmPushManager.java
@@ -18,14 +18,18 @@ public class FcmPushManager implements PushManager{
     @Value("${khumu.notification.rootLink}")
     String NOTIFICATION_ROOT_LINK;
 
-    public void notify(Notification n, String deviceToken) throws PushException {
+    public void notify(Notification n, String deviceToken) throws ExpiredPushTokenException {
         try {
             System.out.println("Execute push notify to " + n.getRecipient() + "(" + deviceToken + ")");
             String result = firebaseMessaging.send(
                     createMessage(n, deviceToken)
             );
             System.out.println(result);
         } catch (FirebaseMessagingException e) {
+            if (e.getMessage().contains("Requested entity was not found.")) {
+                throw new ExpiredPushTokenException(deviceToken);
+            }
+
             throw new PushException(e.getMessage());
         }
     }

diff --git a/src/main/java/com/khumu/alimi/external/push/PushManager.java b/src/main/java/com/khumu/alimi/external/push/PushManager.java
@@ -8,12 +8,18 @@
  * 이건 DB의 Entity가 아니라 FCM Push를 의미.
  */
 public interface PushManager {
-    void notify(Notification n, String deviceToken) throws PushException;
+    void notify(Notification n, String deviceToken) throws PushException, ExpiredPushTokenException;
     // 모두에게 Notify
     /// void notify(Notication n);
-    public static class PushException extends Exception{
+    class PushException extends RuntimeException{
         public PushException(String message) {
             super(message);
         }
     }
+
+    class ExpiredPushTokenException extends Exception{
+        public ExpiredPushTokenException(String token){
+            super("만료된 토큰입니다.: " + token);
+        }
+    }
 }
diff --git a/src/main/java/com/khumu/alimi/repository/CustomPushDeviceRepository.java b/src/main/java/com/khumu/alimi/repository/CustomPushDeviceRepository.java
@@ -54,4 +54,8 @@ public PushDevice save(PushDevice subscription) {
     public void delete(PushDevice device) {
         pushDeviceRepository.delete(device);
     }
+
+    public void deleteAll(Iterable<PushDevice> devices){
+        pushDeviceRepository.deleteAll(devices);
+    }
 }
diff --git a/src/main/java/com/khumu/alimi/repository/ResourceNotificationSubscriptionRepository.java b/src/main/java/com/khumu/alimi/repository/ResourceNotificationSubscriptionRepository.java
@@ -16,6 +16,8 @@ public interface ResourceNotificationSubscriptionRepository extends JpaRepositor
     List<ResourceNotificationSubscription> findAllByResourceKindAndResourceId(ResourceKind resourceKind, Long resourceId);
     List<ResourceNotificationSubscription> findAllBySubscriberAndResourceKindAndResourceId(String subscriberId, ResourceKind resourceKind, Long resourceId);
 
+    List<ResourceNotificationSubscription> findAllBySubscriber(String subscriberId);
+
     // 해당 유저의 해당 ResourceKind의 ResourceNotificationSubscription을 조회하거나 만들고 조회함.
     default ResourceNotificationSubscription getOrCreate(ResourceNotificationSubscription subscription){
         // user의 해당 리소스에 대한 구독 정보를 조회해주거나

diff --git a/...ice/NotifyAnnouncementCrawledService.java → ...mu/alimi/service/AnnouncementService.java b/...ice/NotifyAnnouncementCrawledService.java → ...mu/alimi/service/AnnouncementService.java
@@ -23,7 +23,7 @@
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class NotifyAnnouncementCrawledService {
+public class AnnouncementService {
     private final NotificationRepository notificationRepository;
     private final CustomPushDeviceRepository pushDeviceRepository;
     private final CustomPushOptionRepository pushOptionRepository;
@@ -50,13 +50,9 @@ public void notifyNewAnnouncementCrawled(NewAnnouncementCrawledDto event) {
                     try {
                         pushManager.notify(n, device.getDeviceToken());
                         log.info("푸시를 보냅니다. " + device.getUser());
-                    } catch (PushManager.PushException e) {
-                        if (e.getMessage().contains("Requested entity was not found.")) {
-                            log.warn("더 이상 존재하지 않는 device tokne이므로 삭제합니다." + device.getDeviceToken());
-                            pushDeviceRepository.delete(device);
-                        } else{
-                            e.printStackTrace();
-                        }
+                    } catch (PushManager.ExpiredPushTokenException e) {
+                        log.warn("더 이상 존재하지 않는 device tokne이므로 삭제합니다." + device.getDeviceToken());
+                        pushDeviceRepository.delete(device);
                     }
                 }
             }

diff --git a/...ice/notification/ArticleEventService.java → ...m/khumu/alimi/service/ArticleService.java b/...ice/notification/ArticleEventService.java → ...m/khumu/alimi/service/ArticleService.java
@@ -1,4 +1,4 @@
-package com.khumu.alimi.service.notification;
+package com.khumu.alimi.service;
 
 import com.khumu.alimi.data.ResourceKind;
 import com.khumu.alimi.data.dto.EventMessageDto;
@@ -9,6 +9,7 @@
 import com.khumu.alimi.repository.CustomPushOptionRepository;
 import com.khumu.alimi.repository.NotificationRepository;
 import com.khumu.alimi.repository.PushDeviceRepository;
+import com.khumu.alimi.service.notification.NotificationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -21,7 +22,7 @@
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class ArticleEventService {
+public class ArticleService {
     final NotificationRepository notificationRepository;
     final NotificationService notificationService;
     final PushDeviceRepository pushDeviceRepository;
@@ -59,10 +60,15 @@ public void notifyNewHotArticle(ArticleResource article) throws PushManager.Push
 
         Notification n = notificationRepository.save(tmp);
 
-        List<PushDevice> subscriptions = pushDeviceRepository.findAllByUser(author);
-        for (PushDevice subscription : subscriptions) {
-            pushManager.notify(n, subscription.getDeviceToken());
-            log.info("푸시를 보냅니다. " + subscription.getUser());
+        List<PushDevice> devices = pushDeviceRepository.findAllByUser(author);
+        for (PushDevice device : devices) {
+            try {
+                log.info("푸시를 보냅니다. " + n.getRecipient());
+                pushManager.notify(n, device.getDeviceToken());
+            } catch (PushManager.ExpiredPushTokenException e) {
+                log.warn("더 이상 존재하지 않는 device tokne이므로 삭제합니다." + device.getDeviceToken());
+                pushDeviceRepository.delete(device);
+            }
         }
     }
 }
diff --git a/...ice/notification/CommentEventService.java → ...m/khumu/alimi/service/CommentService.java b/...ice/notification/CommentEventService.java → ...m/khumu/alimi/service/CommentService.java
@@ -1,4 +1,4 @@
-package com.khumu.alimi.service.notification;
+package com.khumu.alimi.service;
 
 import com.google.gson.Gson;
 import com.khumu.alimi.data.ResourceKind;
@@ -7,6 +7,7 @@
 import com.khumu.alimi.data.entity.*;
 import com.khumu.alimi.external.push.PushManager;
 import com.khumu.alimi.repository.*;
+import com.khumu.alimi.service.notification.NotificationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -25,7 +26,7 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class CommentEventService {
+public class CommentService {
     final NotificationRepository notificationRepository;
     final CustomPushDeviceRepository pushDeviceRepository;
     final CustomPushOptionRepository pushOptionRepository;
@@ -51,10 +52,15 @@ public List<Notification> createNotificationsForNewComment(CommentDto commentDto
 
             Notification n = notificationRepository.save(tmp);
 
-            List<PushDevice> subscriptions = pushDeviceRepository.findAllByUser(recipientId);
-            for (PushDevice subscription : subscriptions) {
-                pushManager.notify(n, subscription.getDeviceToken());
-                log.info("푸시를 보냅니다. " + subscription.getUser());
+            List<PushDevice> devices = pushDeviceRepository.findAllByUser(recipientId);
+            for (PushDevice device : devices) {
+                try {
+                    log.info("푸시를 보냅니다. " + n.getRecipient());
+                    pushManager.notify(n, device.getDeviceToken());
+                } catch (PushManager.ExpiredPushTokenException e) {
+                    log.warn("더 이상 존재하지 않는 device tokne이므로 삭제합니다." + device.getDeviceToken());
+                    pushDeviceRepository.delete(device);
+                }
             }
             results.add(n);
         }