🚀 :: v0.0.5

🚀 :: v0.0.5

src/main/java/io/github/depromeet/knockknockbackend/domain/notification/domain/Notification.java

@@ -64,10 +64,16 @@ public class Notification extends BaseTimeEntity {
     @OneToMany(mappedBy = "notification", fetch = FetchType.LAZY)
     private Set<NotificationReaction> notificationReactions = new HashSet<>();
 
+    private boolean deleted;
+
     public void addReceivers(List<NotificationReceiver> receivers) {
         this.receivers.addAll(receivers);
     }
 
+    public void deleteNotification() {
+        this.deleted = true;
+    }
+
     public static Notification of(Long notificationId) {
         return Notification.builder().id(notificationId).build();
     }

src/main/java/io/github/depromeet/knockknockbackend/domain/notification/domain/repository/NotificationRepository.java

@@ -12,7 +12,8 @@ public interface NotificationRepository
         extends JpaRepository<Notification, Long>, CustomNotificationRepository {
 
     @EntityGraph(attributePaths = {"group"})
-    Slice<Notification> findAllByGroupId(Long groupId, Pageable pageable);
+    Slice<Notification> findAllByGroupIdAndDeleted(
+            Long groupId, boolean deleted, Pageable pageable);
 
     @EntityGraph(attributePaths = {"group"})
     Optional<Notification> findById(Long notificationId);

src/main/java/io/github/depromeet/knockknockbackend/domain/notification/presentation/NotificationController.java

@@ -13,13 +13,7 @@
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.web.PageableDefault;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @SecurityRequirement(name = "access-token")
 @Tag(name = "푸쉬알림 관련 컨트롤러", description = "")
@@ -60,4 +54,12 @@ public QueryNotificationListResponse queryListByGroupId(
             @PathVariable(value = "group_id") Long groupId) {
         return notificationService.queryListByGroupId(pageable, groupId);
     }
+
+    @Operation(summary = "푸쉬알림 삭제")
+    @ResponseStatus(HttpStatus.OK)
+    @DeleteMapping("{notification_id}")
+    public void deleteByNotificationId(
+            @PathVariable(value = "notification_id") Long notificationId) {
+        notificationService.deleteByNotificationId(notificationId);
+    }
 }

src/main/java/io/github/depromeet/knockknockbackend/domain/notification/service/NotificationService.java

@@ -15,6 +15,8 @@
 import io.github.depromeet.knockknockbackend.domain.notification.domain.repository.NotificationRepository;
 import io.github.depromeet.knockknockbackend.domain.notification.domain.vo.NotificationReactionCountInfoVo;
 import io.github.depromeet.knockknockbackend.domain.notification.exception.FcmResponseException;
+import io.github.depromeet.knockknockbackend.domain.notification.exception.NotificationForbiddenException;
+import io.github.depromeet.knockknockbackend.domain.notification.exception.NotificationNotFoundException;
 import io.github.depromeet.knockknockbackend.domain.notification.presentation.dto.request.RegisterFcmTokenRequest;
 import io.github.depromeet.knockknockbackend.domain.notification.presentation.dto.request.SendInstanceRequest;
 import io.github.depromeet.knockknockbackend.domain.notification.presentation.dto.response.MyNotificationReactionResponseElement;
@@ -42,6 +44,7 @@
 @Service
 public class NotificationService {
 
+    private static final boolean CREATED_DELETED_STATUS = false;
     private final NotificationRepository notificationRepository;
     private final DeviceTokenRepository deviceTokenRepository;
     private final NotificationReactionRepository notificationReactionRepository;
@@ -55,7 +58,8 @@ public QueryNotificationListResponse queryAlarmHistoryByUserId(Pageable pageable
     @Transactional(readOnly = true)
     public QueryNotificationListResponse queryListByGroupId(Pageable pageable, Long groupId) {
         Slice<Notification> notifications =
-                notificationRepository.findAllByGroupId(groupId, pageable);
+                notificationRepository.findAllByGroupIdAndDeleted(
+                        groupId, CREATED_DELETED_STATUS, pageable);
 
         Slice<QueryNotificationListResponseElement> notificationListResponseElements =
                 getNotificationListResponseElements(notifications);
@@ -133,6 +137,13 @@ public void sendInstance(SendInstanceRequest request) {
         notificationRepository.save(notification);
     }
 
+    public void deleteByNotificationId(Long notificationId) {
+        Notification notification = queryNotificationById(notificationId);
+        validateDeletePermission(notification);
+        notification.deleteNotification();
+        notificationRepository.save(notification);
+    }
+
     public Slice<QueryNotificationListResponseElement> getNotificationListResponseElements(
             Slice<Notification> notifications) {
 
@@ -236,4 +247,16 @@ private Slice<NotificationReaction> retrieveNotificationReactions(
         return notificationReactionRepository.findByUserIdAndNotificationIn(
                 SecurityUtils.getCurrentUserId(), notifications.getContent());
     }
+
+    private void validateDeletePermission(Notification notification) {
+        if (!SecurityUtils.getCurrentUserId().equals(notification.getSendUser().getId())) {
+            throw NotificationForbiddenException.EXCEPTION;
+        }
+    }
+
+    private Notification queryNotificationById(Long notificationId) {
+        return notificationRepository
+                .findById(notificationId)
+                .orElseThrow(() -> NotificationNotFoundException.EXCEPTION);
+    }
 }

src/main/java/io/github/depromeet/knockknockbackend/domain/reaction/presentation/ReactionController.java

@@ -26,22 +26,23 @@ public class ReactionController {
 
     private final ReactionService reactionService;
 
-    @ResponseStatus(HttpStatus.CREATED)
     @Operation(summary = "알림에 리액션 등록")
+    @ResponseStatus(HttpStatus.OK)
     @PostMapping
     public void registerReaction(@RequestBody RegisterReactionRequest request) {
         reactionService.registerReaction(request);
     }
 
+    @Operation(summary = "알림 리액션 수정")
     @ResponseStatus(HttpStatus.CREATED)
-    @Operation(summary = "알림에 리액션 수정")
     @PatchMapping("{notification_reaction_id}")
     public void changeReaction(
             @PathVariable("notification_reaction_id") Long notificationReactionId,
             @RequestBody RegisterReactionRequest request) {
         reactionService.changeReaction(notificationReactionId, request);
     }
 
+    @Operation(summary = "알림 리액션 삭제")
     @ResponseStatus(HttpStatus.OK)
     @DeleteMapping("{notification_reaction_id}")
     public void deleteReaction(

src/main/java/io/github/depromeet/knockknockbackend/global/successResponse/SuccessResponseAdvice.java

@@ -11,7 +11,7 @@
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
 
-@RestControllerAdvice
+@RestControllerAdvice(basePackages = "io.github.depromeet")
 public class SuccessResponseAdvice implements ResponseBodyAdvice {
 
     @Override