Merge branch 'develop' into feat/#133-bucket-detail-fe

Change-Id: Ic385f65072ecae52443666bddb4fbbce3364d8ce
ggumms · Feb 13, 2024 · 7591d06 · 7591d06
2 parents 9d02ee4 + cff43d1
commit 7591d06
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 8 deletions.
diff --git a/backend/src/main/java/com/ggums/ggumtle/common/handler/AlarmHandler.java b/backend/src/main/java/com/ggums/ggumtle/common/handler/AlarmHandler.java
@@ -76,7 +76,7 @@ public void createUserAlarm(User receiver, User sender, AlarmType type){
      *
      * @param receiver receiver user
      * @param sender sender user
-     * @param type likeCommentBucket, remind, followBucket, followBucketAchieve, commentBucket, reviewReaction
+     * @param type likeCommentBucket, followBucket, followBucketAchieve, bucketReaction
      * @param bucket alarmed bucket
      */
     public void createBucketAlarm(User receiver, User sender, AlarmType type, Bucket bucket){
@@ -99,7 +99,7 @@ public void createBucketAlarm(User receiver, User sender, AlarmType type, Bucket
      *
      * @param receiver receiver user
      * @param sender sender user
-     * @param type likeCommentReview, followReview, followCommentReview, followCommentReview, reviewReaction
+     * @param type likeCommentReview, followReview, reviewReaction
      * @param review alarmed review
      */
     public void createReviewAlarm(User receiver, User sender, AlarmType type, Review review){
@@ -117,6 +117,39 @@ public void createReviewAlarm(User receiver, User sender, AlarmType type, Review
         sendEventToUser(receiver.getId());
     }
 
+    /**
+     * Giving comment alarm
+     * Caution that there could be only bucket orElse review
+     *
+     * @param receiver receiver
+     * @param sender sender
+     * @param type followCommentReview, commentBucket
+     * @param comment comment
+     * @param bucket bucket
+     * @param review review
+     */
+    public void createCommentAlarm(User receiver, User sender, AlarmType type, String comment, Bucket bucket, Review review){
+        if (!receiver.getAlarm()) {
+            return;
+        }
+
+        Alarm alarm = Alarm.builder()
+                .receiver(receiver)
+                .sender(sender)
+                .context(comment)
+                .type(type)
+                .build();
+
+        if (review == null) {
+            alarm.setDataId(bucket.getId());
+        } else {
+            alarm.setDataId(review.getId());
+        }
+
+        alarmRepository.save(alarm);
+        sendEventToUser(receiver.getId());
+    }
+
     /**
      *  For Reminder
      * @param receiver receiver user

diff --git a/backend/src/main/java/com/ggums/ggumtle/service/CommentBucketService.java b/backend/src/main/java/com/ggums/ggumtle/service/CommentBucketService.java
@@ -61,7 +61,7 @@ public String commentCreate(User user, long bucketId, CommentRequestDto requestD
             follow.setScore(currentScore + Score.COMMENT);
         }
 
-        alarmHandler.createBucketAlarm(bucket.getUser(), user, AlarmType.commentBucket, bucket);
+        alarmHandler.createCommentAlarm(bucket.getUser(), user, AlarmType.commentBucket, requestDto.getContext(), bucket, null);
 
         return "댓글이 생성되었습니다.";
     }

diff --git a/backend/src/main/java/com/ggums/ggumtle/service/CommentReviewService.java b/backend/src/main/java/com/ggums/ggumtle/service/CommentReviewService.java
@@ -65,7 +65,7 @@ public String commentCreate(User user, long reviewId, CommentRequestDto requestD
             follow.setScore(currentScore + Score.COMMENT);
         }
 
-        alarmHandler.createReviewAlarm(review.getBucket().getUser(), user, AlarmType.followCommentReview, review);
+        alarmHandler.createCommentAlarm(review.getBucket().getUser(), user, AlarmType.followCommentReview, requestDto.getContext(), null, review);
 
         return "댓글이 생성되었습니다.";
     }

diff --git a/frontend/nginx.conf b/frontend/nginx.conf
@@ -5,10 +5,6 @@ server {
 	listen 443 ssl;
 	listen [::]:443 ssl;
     server_name  i10d111.p.ssafy.io;
-
-	if ($scheme = http) {
-		return 301 https://$server_name$request_uri;
-	}
 
 	location /.well-known/acme-challenge {
 		root /var/lib/letsencrypt/;