Merge pull request #173 from TRIP-Side-Project/dev

kwondongwook · web-flow · commit 1890c42e6a7c · 2023-12-29T14:19:22.000+09:00
pr for merge
diff --git a/src/main/java/com/api/trip/common/sse/emitter/SseEmitterMap.java b/src/main/java/com/api/trip/common/sse/emitter/SseEmitterMap.java
@@ -15,40 +15,40 @@
 @Slf4j
 public class SseEmitterMap {
 
-    private final Map<Long, SseEmitter> sseEmitterMap = new ConcurrentHashMap<>();
+    private final Map<String, SseEmitter> sseEmitterMap = new ConcurrentHashMap<>();
 
-    public void put(Long memberId, SseEmitter sseEmitter) {
-        sseEmitter.onCompletion(() -> remove(memberId));
+    public void put(String email, SseEmitter sseEmitter) {
+        sseEmitter.onCompletion(() -> remove(email));
         sseEmitter.onTimeout(sseEmitter::complete);
-        sseEmitterMap.put(memberId, sseEmitter);
-        log.info("connected with {}, the number of connections is {}", memberId, sseEmitterMap.size());
+        sseEmitterMap.put(email, sseEmitter);
+        log.info("connected with {}, the number of connections is {}", email, sseEmitterMap.size());
     }
 
-    public void remove(Long memberId) {
-        sseEmitterMap.remove(memberId);
-        log.info("disconnected with {}, the number of connections is {}", memberId, sseEmitterMap.size());
+    public void remove(String email) {
+        sseEmitterMap.remove(email);
+        log.info("disconnected with {}, the number of connections is {}", email, sseEmitterMap.size());
     }
 
-    public void send(Long memberId, String eventName, Object eventData) {
-        SseEmitter sseEmitter = sseEmitterMap.get(memberId);
+    public void send(String email, String eventName, Object eventData) {
+        SseEmitter sseEmitter = sseEmitterMap.get(email);
         try {
             sseEmitter.send(
                     event()
                             .name(eventName)
                             .data(eventData)
             );
         } catch (IOException | IllegalStateException e) {
-            remove(memberId);
+            remove(email);
         }
     }
 
     public void sendToAll(String eventName, Object eventData) {
         SseEventBuilder sseEventBuilder = event().name(eventName).data(eventData);
-        sseEmitterMap.forEach((memberId, sseEmitter) -> {
+        sseEmitterMap.forEach((email, sseEmitter) -> {
             try {
                 sseEmitter.send(sseEventBuilder);
             } catch (IOException | IllegalStateException e) {
-                remove(memberId);
+                remove(email);
             }
         });
     }
diff --git a/src/main/java/com/api/trip/domain/notification/controller/NotificationController.java b/src/main/java/com/api/trip/domain/notification/controller/NotificationController.java
@@ -1,10 +1,9 @@
 package com.api.trip.domain.notification.controller;
 
-import com.api.trip.common.exception.CustomException;
-import com.api.trip.common.exception.ErrorCode;
-import com.api.trip.domain.member.repository.MemberRepository;
-import com.api.trip.domain.notification.controller.dto.GetMyNotificationsResponse;
 import com.api.trip.common.sse.emitter.SseEmitterMap;
+import com.api.trip.domain.notification.controller.dto.DeleteNotificationRequest;
+import com.api.trip.domain.notification.controller.dto.GetMyNotificationsResponse;
+import com.api.trip.domain.notification.controller.dto.ReadNotificationRequest;
 import com.api.trip.domain.notification.service.NotificationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.MediaType;
@@ -20,46 +19,35 @@
 @RequiredArgsConstructor
 public class NotificationController {
 
-    private final MemberRepository memberRepository;
     private final NotificationService notificationService;
     private final SseEmitterMap sseEmitterMap;
 
     @GetMapping(value = "/connect", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     public ResponseEntity<SseEmitter> connect() {
         String email = SecurityContextHolder.getContext().getAuthentication().getName();
-        Long memberId = memberRepository.findByEmail(email)
-                .orElseThrow(() -> new CustomException(ErrorCode.UNAUTHORIZED))
-                .getId();
-
         SseEmitter sseEmitter = new SseEmitter(3600000L);
-        sseEmitterMap.put(memberId, sseEmitter);
-        sseEmitterMap.send(memberId, "connect", LocalDateTime.now());
+        sseEmitterMap.put(email, sseEmitter);
+        sseEmitterMap.send(email, "connect", LocalDateTime.now());
         return ResponseEntity.ok(sseEmitter);
     }
 
-    @GetMapping("/send-to-all")
-    public void sendToAll(@RequestParam String message) {
-        String email = SecurityContextHolder.getContext().getAuthentication().getName();
-        sseEmitterMap.sendToAll("send-to-all", email + ": " + message);
-    }
-
     @GetMapping("/me")
     public ResponseEntity<GetMyNotificationsResponse> getMyNotifications() {
         String email = SecurityContextHolder.getContext().getAuthentication().getName();
         return ResponseEntity.ok(notificationService.getMyNotifications(email));
     }
 
-    @PatchMapping("/{notificationId}")
-    public ResponseEntity<Void> readNotification(@PathVariable Long notificationId) {
+    @PatchMapping
+    public ResponseEntity<Void> readNotification(@RequestBody ReadNotificationRequest request) {
         String email = SecurityContextHolder.getContext().getAuthentication().getName();
-        notificationService.readNotification(notificationId, email);
+        notificationService.readNotification(request, email);
         return ResponseEntity.ok().build();
     }
 
-    @DeleteMapping("/{notificationId}")
-    public ResponseEntity<Void> deleteNotification(@PathVariable Long notificationId) {
+    @DeleteMapping
+    public ResponseEntity<Void> deleteNotification(@RequestBody DeleteNotificationRequest request) {
         String email = SecurityContextHolder.getContext().getAuthentication().getName();
-        notificationService.deleteNotification(notificationId, email);
+        notificationService.deleteNotification(request, email);
         return ResponseEntity.ok().build();
     }
 
diff --git a/src/main/java/com/api/trip/domain/notification/controller/dto/DeleteNotificationRequest.java b/src/main/java/com/api/trip/domain/notification/controller/dto/DeleteNotificationRequest.java
@@ -0,0 +1,11 @@
+package com.api.trip.domain.notification.controller.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+
+@Getter
+public class DeleteNotificationRequest {
+
+    @NotNull(message = "itemId를 입력해 주세요.")
+    private Long itemId;
+}
diff --git a/src/main/java/com/api/trip/domain/notification/controller/dto/ReadNotificationRequest.java b/src/main/java/com/api/trip/domain/notification/controller/dto/ReadNotificationRequest.java
@@ -0,0 +1,11 @@
+package com.api.trip.domain.notification.controller.dto;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+
+@Getter
+public class ReadNotificationRequest {
+
+    @NotNull(message = "itemId를 입력해 주세요.")
+    private Long itemId;
+}
diff --git a/src/main/java/com/api/trip/domain/notification/repository/NotificationRepository.java b/src/main/java/com/api/trip/domain/notification/repository/NotificationRepository.java
@@ -5,8 +5,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface NotificationRepository extends JpaRepository<Notification, Long>, NotificationRepositoryCustom {
 
     List<Notification> findAllByMember(Member member);
+
+    Optional<Notification> findByMemberIdAndItemId(Long memberId, Long itemId);
 }
diff --git a/src/main/java/com/api/trip/domain/notification/service/NotificationService.java b/src/main/java/com/api/trip/domain/notification/service/NotificationService.java
@@ -7,7 +7,9 @@
 import com.api.trip.domain.itemtag.model.ItemTag;
 import com.api.trip.domain.member.model.Member;
 import com.api.trip.domain.member.repository.MemberRepository;
+import com.api.trip.domain.notification.controller.dto.DeleteNotificationRequest;
 import com.api.trip.domain.notification.controller.dto.GetMyNotificationsResponse;
+import com.api.trip.domain.notification.controller.dto.ReadNotificationRequest;
 import com.api.trip.domain.notification.domain.Notification;
 import com.api.trip.domain.notification.repository.NotificationRepository;
 import lombok.RequiredArgsConstructor;
@@ -25,17 +27,17 @@ public class NotificationService {
     private final NotificationRepository notificationRepository;
     private final InterestTagService interestTagService;
 
-    public void createNotification(Item item, List<String> tagNames){
-
+    public void createNotification(Item item, List<String> tagNames) {
         List<Member> receivers = interestTagService.getMemberByTags(tagNames);
 
-        receivers.stream().forEach(member -> {
-            notificationRepository.save(Notification.builder()
-                    .item(item)
-                    .member(member).build());
+        receivers.forEach(member -> {
+            notificationRepository.save(
+                    Notification.builder()
+                            .item(item)
+                            .member(member)
+                            .build()
+            );
         });
-
-
     }
 
     @Transactional(readOnly = true)
@@ -54,31 +56,23 @@ public GetMyNotificationsResponse getMyNotifications(String email) {
         return GetMyNotificationsResponse.of(notifications, itemTags);
     }
 
-    public void readNotification(Long notificationId, String email) {
+    public void readNotification(ReadNotificationRequest request, String email) {
         Member member = memberRepository.findByEmail(email)
                 .orElseThrow(() -> new CustomException(ErrorCode.UNAUTHORIZED));
 
-        Notification notification = notificationRepository.findById(notificationId)
+        Notification notification = notificationRepository.findByMemberIdAndItemId(member.getId(), request.getItemId())
                 .orElseThrow(() -> new CustomException(ErrorCode.NOTIFICATION_NOT_FOUND));
 
-        if (notification.getMember() == member) {
-            throw new CustomException(ErrorCode.FORBIDDEN);
-        }
-
         notification.read();
     }
 
-    public void deleteNotification(Long notificationId, String email) {
+    public void deleteNotification(DeleteNotificationRequest request, String email) {
         Member member = memberRepository.findByEmail(email)
                 .orElseThrow(() -> new CustomException(ErrorCode.UNAUTHORIZED));
 
-        Notification notification = notificationRepository.findById(notificationId)
+        Notification notification = notificationRepository.findByMemberIdAndItemId(member.getId(), request.getItemId())
                 .orElseThrow(() -> new CustomException(ErrorCode.NOTIFICATION_NOT_FOUND));
 
-        if (notification.getMember() == member) {
-            throw new CustomException(ErrorCode.FORBIDDEN);
-        }
-
         notificationRepository.delete(notification);
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,9 +1,6 @@
 spring:
   profiles:
     active: dev
-  datasource:
-    hikari:
-      maximum-pool-size: 4
   h2:
     console:
       enabled: true
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
diff --git a/src/main/resources/static/src/eventsource.js b/src/main/resources/static/src/eventsource.js

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,11 @@`
`5`	`5`	`import org.springframework.data.jpa.repository.JpaRepository;`
`6`	`6`
`7`	`7`	`import java.util.List;`
	`8`	`+import java.util.Optional;`
`8`	`9`
`9`	`10`	`public interface NotificationRepository extends JpaRepository<Notification, Long>, NotificationRepositoryCustom {`
`10`	`11`
`11`	`12`	`List<Notification> findAllByMember(Member member);`
	`13`	`+`
	`14`	`+ Optional<Notification> findByMemberIdAndItemId(Long memberId, Long itemId);`
`12`	`15`	`}`