Merge pull request #306 from Team-WSS/fix/#305

Author: rinarina0429

src/main/java/org/websoso/WSSServer/service/CommentService.java

@@ -1,5 +1,6 @@
 package org.websoso.WSSServer.service;
 
+import static java.lang.Boolean.TRUE;
 import static org.websoso.WSSServer.domain.common.Action.DELETE;
 import static org.websoso.WSSServer.domain.common.Action.UPDATE;
 import static org.websoso.WSSServer.domain.common.DiscordWebhookMessageType.REPORT;
@@ -76,6 +77,10 @@ private void sendCommentPushMessageToFeedOwner(User user, Feed feed) {
         );
         notificationRepository.save(notification);
 
+        if (!TRUE.equals(feedOwner.getIsPushEnabled())) {
+            return;
+        }
+
         List<UserDevice> feedOwnerDevices = feedOwner.getUserDevices();
         if (feedOwnerDevices.isEmpty()) {
             return;
@@ -147,6 +152,10 @@ private void sendCommentPushMessageToCommenters(User user, Feed feed) {
             );
             notificationRepository.save(notification);
 
+            if (!TRUE.equals(commenter.getIsPushEnabled())) {
+                return;
+            }
+
             List<UserDevice> commenterDevices = commenter.getUserDevices();
             if (commenterDevices.isEmpty()) {
                 return;

src/main/java/org/websoso/WSSServer/service/FeedService.java

@@ -1,5 +1,6 @@
 package org.websoso.WSSServer.service;
 
+import static java.lang.Boolean.TRUE;
 import static org.websoso.WSSServer.domain.common.Action.DELETE;
 import static org.websoso.WSSServer.domain.common.Action.UPDATE;
 import static org.websoso.WSSServer.domain.common.DiscordWebhookMessageType.REPORT;
@@ -149,6 +150,10 @@ private void sendLikePushMessage(User liker, Feed feed) {
         );
         notificationRepository.save(notification);
 
+        if (!TRUE.equals(feedOwner.getIsPushEnabled())) {
+            return;
+        }
+
         List<UserDevice> feedOwnerDevices = feedOwner.getUserDevices();
         if (feedOwnerDevices.isEmpty()) {
             return;

src/main/java/org/websoso/WSSServer/service/PopularFeedService.java

@@ -1,5 +1,7 @@
 package org.websoso.WSSServer.service;
 
+import static java.lang.Boolean.TRUE;
+
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -56,6 +58,10 @@ private void sendPopularFeedPushMessage(Feed feed) {
         );
         notificationRepository.save(notification);
 
+        if (!TRUE.equals(feedOwner.getIsPushEnabled())) {
+            return;
+        }
+
         List<UserDevice> feedOwnerDevices = feedOwner.getUserDevices();
         if (feedOwnerDevices.isEmpty()) {
             return;