Merge pull request #114 from UMCWegg/feature/#7

2ivii · web-flow · commit a9254a3d51de · 2025-02-18T20:57:48.000+09:00
Feature/#7
diff --git a/src/main/java/umc/wegg/controller/NotificationController.java b/src/main/java/umc/wegg/controller/NotificationController.java
@@ -18,7 +18,9 @@
 import umc.wegg.domain.User;
 import umc.wegg.domain.apiPayload.ApiResponse;
 import umc.wegg.domain.enums.AccountVisibility;
+import umc.wegg.domain.enums.FollowStatus;
 import umc.wegg.dto.*;
+import umc.wegg.repository.FollowRepository;
 import umc.wegg.repository.UserRepository;
 import umc.wegg.service.NotificationService.NotificationService;
 import umc.wegg.service.UserService.UserCommandService;
@@ -32,6 +34,7 @@ public class NotificationController {
 
     private final NotificationService notificationService;
     private final UserRepository userRepository;
+    private final FollowRepository followRepository;
 
     //Last-Event-ID는 SSE 연결이 끊어졌을 경우, 클라이언트가 수신한 마지막 데이터의 id 값을 의미합니다. 항상 존재하는 것이 아니기 때문에 false
     @GetMapping(value = "/subscribe", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
@@ -54,10 +57,18 @@ public ApiResponse<NotificationResponseDTO.NotificationListDTO> getUserNotificat
                 .map(NotificationConverter::toResultDTO)
                 .toList();
 
-        // 🔹 accountVisibility와 알림 리스트를 포함한 DTO 반환
+        // 🔹 followStatus가 WAITING인 요청 개수 조회
+        Long waitingFollowRequests = followRepository.countByFolloweeIdAndFollowStatus(userId, FollowStatus.WAITING);
+
+        // 🔹 updatedAt이 가장 최신인 follower의 accountId 조회
+        String latestFollowerAccountId = followRepository.findLatestFollowerAccountIdByFolloweeId(userId).orElse(null);
+
+        // 🔹 DTO 생성 및 응답 반환
         NotificationResponseDTO.NotificationListDTO response = NotificationResponseDTO.NotificationListDTO.builder()
                 .accountVisibility(AccountVisibility.valueOf(accountVisibility))
                 .notifications(result)
+                .latestFollowerAccountId(latestFollowerAccountId)
+                .waitingFollowRequests(waitingFollowRequests)
                 .build();
 
         return ApiResponse.onSuccess(response);
diff --git a/src/main/java/umc/wegg/converter/PlanConverter.java b/src/main/java/umc/wegg/converter/PlanConverter.java
@@ -4,6 +4,7 @@
 import umc.wegg.domain.Plan;
 import umc.wegg.domain.User;
 import umc.wegg.domain.Address;
+import umc.wegg.domain.apiPayload.ApiResponse;
 import umc.wegg.domain.enums.LateStatus;
 import umc.wegg.domain.enums.PlanStatus;
 import umc.wegg.dto.PlanRequestDTO;
@@ -38,25 +39,26 @@ public static PlanResponseDTO.PlanUpdateResultDTO toPlanUpdateResultDTO(Plan pla
                 .build();
     }
 
-    public static List<Plan> toPlan(PlanRequestDTO.PlanAddDTO request,
-                                    UserRepository userRepository,
-                                    Address address,
-                                    PlanRepository planRepository) {
+    public static ApiResponse<List<Plan>> toPlan(PlanRequestDTO.PlanAddDTO request,
+                                                 UserRepository userRepository,
+                                                 Address address,
+                                                 PlanRepository planRepository) {
         PlanStatus status = request.getStatus() != null ? request.getStatus() : PlanStatus.YET;
         User user = userRepository.findById(request.getUserId())
                 .orElseThrow(() -> new RuntimeException("User not found"));
 
         List<Plan> planList = new ArrayList<>();
-        LocalDate today = LocalDate.now(); // 오늘 날짜
-        LocalDate maxAllowedDate = today.plusDays(14); // 2주 후까지만 허용
+        LocalDate today = LocalDate.now();
+        LocalDate maxAllowedDate = today.plusDays(14);
 
-        request.getPlanDates().forEach(planDate -> {
-            // ✅ 날짜 검증 (과거 및 15일 초과)
+        for (LocalDate planDate : request.getPlanDates()) {
+            // ✅ 과거 날짜 체크
             if (planDate.isBefore(today)) {
-                throw new IllegalArgumentException("이미 날짜가 지났습니다.");
+                return ApiResponse.onFailure("FAIL", "이미 날짜가 지났습니다.", null);
             }
+            // ✅ 2주 후 초과 체크
             if (planDate.isAfter(maxAllowedDate)) {
-                throw new IllegalArgumentException("2주 뒤까지의 계획만 설정 가능합니다.");
+                return ApiResponse.onFailure("FAIL", "2주 뒤까지의 계획만 설정 가능합니다.", null);
             }
 
             LocalDateTime startTime = LocalDateTime.of(planDate, request.getStartTime().truncatedTo(ChronoUnit.MINUTES));
@@ -66,12 +68,12 @@ public static List<Plan> toPlan(PlanRequestDTO.PlanAddDTO request,
                 finishTime = finishTime.plusDays(1);
             }
 
-            // ✅ 겹치는 일정 확인
+            // ✅ 일정 겹침 체크
             boolean hasConflict = planRepository.existsByUserAndStartTimeBeforeAndFinishTimeAfter(
                     user, finishTime, startTime);
 
             if (hasConflict) {
-                throw new IllegalStateException("해당 시간대에 이미 일정이 존재합니다.");
+                return ApiResponse.onFailure("FAIL", "해당 시간대에 이미 일정이 존재합니다.", null);
             }
 
             // Plan 객체 생성 및 저장
@@ -86,11 +88,11 @@ public static List<Plan> toPlan(PlanRequestDTO.PlanAddDTO request,
                     .planDate(planDate)
                     .build();
 
-            planRepository.save(newPlan); // Plan 저장
-            planList.add(newPlan); // 저장된 Plan 추가
-        });
+            planRepository.save(newPlan);
+            planList.add(newPlan);
+        }
 
-        return planList; // Plan 리스트 반환
+        return ApiResponse.onSuccess(planList); // 성공 응답
     }
     // PlanRequestDTO를 사용하여 기존 Plan을 업데이트하는 메서드 추가
     public static Plan toPlanUpdate(PlanRequestDTO.PlanUpdateDTO requestDTO, Plan existingPlan, AddressRepository addressRepository) {
diff --git a/src/main/java/umc/wegg/domain/enums/NotificationType.java b/src/main/java/umc/wegg/domain/enums/NotificationType.java
@@ -1,5 +1,5 @@
 package umc.wegg.domain.enums;
 
 public enum NotificationType {
-    POST, EMOJI, COMMENT, PLAN_REMINDER, PLACE_VERIFY, RANDOM_VERIFY, EGG
+    POST, EMOJI, COMMENT, FOLLOW, PLAN_REMINDER, PLACE_VERIFY, RANDOM_VERIFY, EGG
 }
diff --git a/src/main/java/umc/wegg/dto/NotificationResponseDTO.java b/src/main/java/umc/wegg/dto/NotificationResponseDTO.java
@@ -18,7 +18,10 @@ public class NotificationResponseDTO {
     @AllArgsConstructor
     public static class NotificationListDTO {
         AccountVisibility accountVisibility; // 🔹 로그인한 유저의 accountVisibility 추가
+        String latestFollowerAccountId;
+        Long waitingFollowRequests;
         List<ResultDTO> notifications; // 🔹 기존의 알림 리스트
+
     }
 
     @Builder
diff --git a/src/main/java/umc/wegg/repository/FollowRepository.java b/src/main/java/umc/wegg/repository/FollowRepository.java
@@ -14,6 +14,12 @@
 public interface FollowRepository extends JpaRepository<Follow, Long> {
     Optional<Follow> findById(Long id);
 
+    //웨이팅 개수 세기
+    Long countByFolloweeIdAndFollowStatus(Long followeeId, FollowStatus followStatus);
+    //한명의 어카운트아이디 가져오기
+    @Query("SELECT f.follower.accountId FROM Follow f WHERE f.followee.id = :followeeId ORDER BY f.updatedAt DESC LIMIT 1")
+    Optional<String> findLatestFollowerAccountIdByFolloweeId(@Param("followeeId") Long followeeId);
+
     boolean existsByFollowerAndFolloweeAndFollowStatus(User follower, User followee, FollowStatus status);
 
     @Query("SELECT COUNT(f) FROM Follow f WHERE f.followee.id = :userId")
diff --git a/src/main/java/umc/wegg/service/FollowService/FollowCommandServiceImpl.java b/src/main/java/umc/wegg/service/FollowService/FollowCommandServiceImpl.java
@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
+import umc.wegg.domain.Setting;
 import umc.wegg.domain.User;
 import umc.wegg.domain.enums.AccountVisibility;
 import umc.wegg.domain.enums.FollowStatus;
@@ -11,7 +12,9 @@
 import umc.wegg.dto.FollowResponseDTO;
 import umc.wegg.repository.ContactFriendsRepository;
 import umc.wegg.repository.FollowRepository;
+import umc.wegg.repository.SettingRepository;
 import umc.wegg.repository.UserRepository;
+import umc.wegg.service.NotificationService.NotificationService;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -23,7 +26,7 @@ public class FollowCommandServiceImpl implements FollowCommandService {
     private final FollowRepository followRepository;
     private final UserRepository userRepository;
     private final ContactFriendsRepository contactFriendsRepository; // 연락처 친구 조회를 위해 필요
-
+    private final NotificationService notificationService;
     /**
      * 팔로우 요청 생성
      * @param requestDTO 팔로우 요청 데이터
@@ -47,6 +50,10 @@ public FollowStatus createFollowRequest(FollowRequestDTO.CreateFollowRequestDTO
         AccountVisibility visibility = followee.getSetting().getAccountVisibility();
         FollowStatus followStatus = (visibility == AccountVisibility.PUBLIC) ? FollowStatus.SUCCEEDED : FollowStatus.WAITING;
 
+        // 알림 메시지 작성
+        String message = (visibility == AccountVisibility.PUBLIC) ? follower.getAccountId() + "님이 팔로우를 시작합니다." : follower.getAccountId() + "님이 팔로우를 요청했습니다.";
+        notificationService.sendNotificationToFollowee(followee, follower.getId(), message, "FOLLOW", follower.getProfileImage());
+
         // 팔로우 요청 저장
         Follow follow = Follow.builder()
                 .follower(follower)
diff --git a/src/main/java/umc/wegg/service/NotificationService/NotificationService.java b/src/main/java/umc/wegg/service/NotificationService/NotificationService.java
@@ -14,6 +14,7 @@ public interface NotificationService {
     void send(User receiver, NotificationType notificationType, String content, String url, String profileImage);
     void sendNotificationToPostOwner(User postOwner, Long postId, String message, String notificationType, String profileImage);
     void sendNotificationToEggOwner(User planUser, String content, String notificationType, String profileImage);
+    void sendNotificationToFollowee(User followee, Long followerId, String content, String notificationType, String profileImage);
     void scheduleNotification(User user, NotificationType type, LocalDateTime notificationTime, String content, String url, String profileImage);
     List<Notification> getUserNotifications(Long userId);
     Notification readNotification(Long notificationId, NotificationRequestDTO.ReadDTO request);
diff --git a/src/main/java/umc/wegg/service/NotificationService/NotificationServiceImpl.java b/src/main/java/umc/wegg/service/NotificationService/NotificationServiceImpl.java
@@ -128,6 +128,10 @@ public void sendNotificationToFollower(User follower, Long postId, String conten
         NotificationType type = NotificationType.valueOf(notificationType.toUpperCase());
         send(follower, type, content, "/posts/" + postId + "/view", profileImage);
     }
+    public void sendNotificationToFollowee(User followee, Long followerId, String content, String notificationType, String profileImage) {
+        NotificationType type = NotificationType.valueOf(notificationType.toUpperCase());
+        send(followee, type, content, "/home/month/" + followerId, profileImage);
+    }
 
     public void scheduleNotification(User user, NotificationType type, LocalDateTime notificationTime, String content, String url, String profileImage) {
         long delay = notificationTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() - System.currentTimeMillis();
diff --git a/src/main/java/umc/wegg/service/PlanService/PlanCommandServiceImpl.java b/src/main/java/umc/wegg/service/PlanService/PlanCommandServiceImpl.java
@@ -8,6 +8,8 @@
 import umc.wegg.domain.Egg;
 import umc.wegg.domain.Address;
 import umc.wegg.domain.Plan;
+import umc.wegg.domain.apiPayload.ApiResponse;
+import umc.wegg.domain.apiPayload.code.status.SuccessStatus;
 import umc.wegg.domain.enums.EggStatus;
 import umc.wegg.domain.enums.NotificationType;
 import umc.wegg.dto.MapResponseDTO;
@@ -23,6 +25,7 @@
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -50,7 +53,7 @@ public List<PlanResponseDTO.PlanAddResultDTO> addPlan(PlanRequestDTO.PlanAddDTO
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return null; // 변환 실패 시 처리
+            return Collections.emptyList(); // 변환 실패 시 빈 리스트 반환
         }
 
         Address address = addressRepository.findByPlaceName(request.getPlaceName()).orElse(null);
@@ -60,8 +63,14 @@ public List<PlanResponseDTO.PlanAddResultDTO> addPlan(PlanRequestDTO.PlanAddDTO
             addressRepository.save(address);
         }
 
-        // ✅ 컨버터가 이제 List<Plan>을 반환함
-        List<Plan> newPlans = PlanConverter.toPlan(request, userRepository, address, planRepository);
+        // ✅ 컨버터가 이제 ApiResponse<List<Plan>>을 반환함
+        ApiResponse<List<Plan>> response = PlanConverter.toPlan(request, userRepository, address, planRepository);
+
+        if (!response.getCode().equals(SuccessStatus._OK.getCode())) {
+            return List.of(new PlanResponseDTO.PlanAddResultDTO(null, null, response.getMessage()));
+        }
+
+        List<Plan> newPlans = response.getResult();
 
         // ✅ 응답용 DTO 생성
         List<PlanResponseDTO.PlanAddResultDTO> resultDTOList = newPlans.stream()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package umc.wegg.domain.enums;`
`2`	`2`
`3`	`3`	`public enum NotificationType {`
`4`		`- POST, EMOJI, COMMENT, PLAN_REMINDER, PLACE_VERIFY, RANDOM_VERIFY, EGG`
	`4`	`+ POST, EMOJI, COMMENT, FOLLOW, PLAN_REMINDER, PLACE_VERIFY, RANDOM_VERIFY, EGG`
`5`	`5`	`}`