feat/#139

Author: whale22

src/main/java/cmf/commitField/domain/admin/controller/ApiV1PetImgController.java renamed to src/main/java/cmf/commitField/domain/admin/admin/controller/ApiV1PetImgController.java

@@ -1,4 +1,4 @@
-package cmf.commitField.domain.admin.controller;
+package cmf.commitField.domain.admin.admin.controller;
 
 import cmf.commitField.global.aws.s3.S3Service;
 import lombok.RequiredArgsConstructor;

src/main/java/cmf/commitField/domain/admin/notice/entity/Notice.java

@@ -0,0 +1,18 @@
+package cmf.commitField.domain.admin.notice.entity;
+
+
+import cmf.commitField.global.jpa.BaseEntity;
+import jakarta.persistence.Entity;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Entity
+@SuperBuilder
+@Getter
+@Setter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+public class Notice extends BaseEntity {
+    private String title;
+    private String content;
+}

src/main/java/cmf/commitField/domain/commit/scheduler/CommitUpdateService.java

@@ -1,6 +1,7 @@
 package cmf.commitField.domain.commit.scheduler;
 
 import cmf.commitField.domain.commit.totalCommit.service.TotalCommitService;
+import cmf.commitField.domain.noti.noti.service.NotiService;
 import cmf.commitField.domain.user.dto.UserInfoDto;
 import cmf.commitField.domain.user.entity.Tier;
 import cmf.commitField.domain.user.entity.User;
@@ -16,9 +17,9 @@
 public class CommitUpdateService {
     private final TotalCommitService totalCommitService;
     private final UserRepository userRepository;
-    private final SimpMessagingTemplate messagingTemplate;
+    private final NotiService notiService;
 
-    // 유저 랭킹 상승 로짓
+    // 유저 랭킹 상승 로직
     public UserInfoDto updateUserTier(String username){
         User user = userRepository.findByUsername(username).get();
         long seasonCommitCount;
@@ -27,6 +28,8 @@ public UserInfoDto updateUserTier(String username){
         System.out.println(username+"유저 레벨 업! 현재 티어: "+user.getTier());
         userRepository.save(user);
 
+        notiService.createRankUpNoti(user);
+
         return UserInfoDto.builder()
                 .username(user.getUsername())
                 .email(user.getEmail())

src/main/java/cmf/commitField/domain/noti/noti/controller/ApiV1NotiController.java

@@ -30,7 +30,6 @@
 public class ApiV1NotiController {
     private final NotiService notiService;
     private final UserRepository userRepository;
-    private final ApplicationEventPublisher eventPublisher;
 
     @GetMapping("")
     public GlobalResponse<List<NotiDto>> getNoti(@AuthenticationPrincipal OAuth2User oAuth2User) {
@@ -40,11 +39,6 @@ public GlobalResponse<List<NotiDto>> getNoti(@AuthenticationPrincipal OAuth2User
         return GlobalResponse.success(notis);
     }
 
-    @PostMapping("")
-    public void createNoti() {
-
-    }
-
     @PostMapping("/read")
     public GlobalResponse<Object> readNoti() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();

src/main/java/cmf/commitField/domain/noti/noti/entity/NotiDetailType.java

@@ -2,12 +2,13 @@
 
 public enum NotiDetailType {
     // 업적
+    RANK_UP, // 랭킹 상승
     ACHIEVEMENT_COMPLETED,  // 업적 달성
 
     // 연속
     STREAK_CONTINUED,  // 연속 커밋 이어짐
     STREAK_BROKEN,  // 연속 커밋 끊김
 
-    // 시즌
+    NOTICE_CREATED, // 시즌
     SEASON_START    // 시즌 시작
 }

src/main/java/cmf/commitField/domain/noti/noti/entity/NotiMessageTemplates.java

@@ -8,7 +8,9 @@ public class NotiMessageTemplates {
             NotiDetailType.ACHIEVEMENT_COMPLETED, "🎉 {0}님이 [{1}] 업적을 달성했습니다!",
             NotiDetailType.STREAK_CONTINUED, "🔥 {0}님의 연속 커밋이 {1}일째 이어지고 있습니다!",
             NotiDetailType.STREAK_BROKEN, "😢 {0}님의 연속 커밋 기록이 끊겼습니다. 다음번엔 더 오래 유지해봐요!",
-            NotiDetailType.SEASON_START, "🚀 새로운 [{0}] 시즌 이 시작되었습니다! 랭킹 경쟁을 준비하세요!"
+            NotiDetailType.SEASON_START, "🚀 새로운 [{0}] 시즌 이 시작되었습니다! 랭킹 경쟁을 준비하세요!",
+            NotiDetailType.RANK_UP, "📈 축하합니다! {0}님의 랭킹이 {1}(으)로 상승했습니다! 🎊",
+            NotiDetailType.NOTICE_CREATED, "📢 공지사항이 있습니다: {0}"
     );
 
     // 알림 메시지 템플릿을 반환하는 메서드

src/main/java/cmf/commitField/domain/noti/noti/repository/NotiRepository.java

@@ -2,12 +2,15 @@
 
 import cmf.commitField.domain.noti.noti.dto.NotiDto;
 import cmf.commitField.domain.noti.noti.entity.Noti;
+import cmf.commitField.domain.noti.noti.entity.NotiDetailType;
+import cmf.commitField.domain.noti.noti.entity.NotiType;
 import cmf.commitField.domain.user.entity.User;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Optional;
 
@@ -18,4 +21,7 @@ public interface NotiRepository extends JpaRepository<Noti, Long> {
             "FROM Noti n JOIN n.receiver u WHERE u.id = :receiverId AND n.isRead = :isRead")
     Optional<List<NotiDto>> findNotiDtoByReceiverId(@Param("receiverId") Long receiverId, @Param("isRead") boolean isRead);
     Optional<List<Noti>> findNotiByReceiver(User receiver);
+
+    // 최근 10일 내 동일한 커밋 부재 알림이 있는지 확인
+    boolean existsByReceiverAndTypeCodeAndType2CodeAndCreatedAtAfter(User receiver, NotiType type, NotiDetailType detailType, LocalDateTime after);
 }

src/main/java/cmf/commitField/domain/noti/noti/service/CommitAbsenceNotiService.java

@@ -0,0 +1,53 @@
+package cmf.commitField.domain.noti.noti.service;
+
+import cmf.commitField.domain.noti.noti.entity.NotiDetailType;
+import cmf.commitField.domain.noti.noti.entity.NotiType;
+import cmf.commitField.domain.noti.noti.repository.NotiRepository;
+import cmf.commitField.domain.user.entity.User;
+import cmf.commitField.domain.user.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class CommitAbsenceNotiService {
+    private final UserRepository userRepository;
+    private final NotiService notiService;
+    private final NotiRepository notiRepository;
+
+    // 매일 10시 실행
+    @Scheduled(cron = "0 0 10 * * *")
+    @Transactional
+    public void sendCommitAbsenceNoti() {
+        log.info("커밋 부재 알림 전송 시작");
+        LocalDateTime today = LocalDateTime.now();
+        LocalDateTime thresholdDate = today.minusDays(10); // 10일 전 날짜 계산
+
+        // 마지막 커밋이 10일 이상 지난 사용자 찾기
+        List<User> inactiveUsers = userRepository.findUsersWithLastCommitBefore(thresholdDate);
+
+        for (User user : inactiveUsers) {
+            if (!hasRecentAbsenceNoti(user)) { // 최근 알림이 없는 경우에만 생성
+                notiService.createStreakBrokenNoti(user);
+                log.info("커밋 부재 알림 전송: {}", user.getUsername());
+            }
+        }
+    }
+
+    // 최근 10일 내 커밋 부재 알림이 있었는지 확인
+    private boolean hasRecentAbsenceNoti(User user) {
+        log.info("커밋 부재 알림 확인: {}", user.getUsername());
+        LocalDateTime checkDate = LocalDateTime.now().minusDays(10);
+        return notiRepository.existsByReceiverAndTypeCodeAndType2CodeAndCreatedAtAfter(
+                user, NotiType.STREAK, NotiDetailType.STREAK_BROKEN, checkDate.toLocalDate().atTime(LocalTime.MIN)
+        );
+    }
+}

src/main/java/cmf/commitField/domain/noti/noti/service/CommitSteakNotiService.java

@@ -0,0 +1,13 @@
+package cmf.commitField.domain.noti.noti.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class CommitSteakNotiService {
+    private final NotiService notiService;
+
+}

src/main/java/cmf/commitField/domain/noti/noti/service/NotiService.java

@@ -7,6 +7,7 @@
 import cmf.commitField.domain.noti.noti.entity.NotiType;
 import cmf.commitField.domain.noti.noti.event.NotiEvent;
 import cmf.commitField.domain.noti.noti.repository.NotiRepository;
+import cmf.commitField.domain.season.entity.Rank;
 import cmf.commitField.domain.season.entity.Season;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
@@ -38,34 +39,39 @@ public static String generateMessage(NotiDetailType type, Object... params) {
         return message;
     }
 
+    // 알림 생성
     @Transactional
-    public void createNoti(User receiver) {
-        System.out.println("알림 생성");
-        String message = NotiService.generateMessage(NotiDetailType.STREAK_BROKEN, receiver.getNickname());
+    public void createNoti(User receiver, NotiType notiType, NotiDetailType notiDetailType, Long relId, String relTypeCode, Object... params) {
+        // 메시지 생성
+        String message = NotiService.generateMessage(notiDetailType, params);
 
+        // 알림 엔티티 생성
         Noti noti = Noti.builder()
-                .typeCode(NotiType.STREAK)
-                .type2Code(NotiDetailType.STREAK_BROKEN)
+                .typeCode(notiType)
+                .type2Code(notiDetailType)
                 .receiver(receiver)
                 .isRead(false)
                 .message(message)
+                .relId(relId)
+                .relTypeCode(relTypeCode)
                 .build();
 
+        notiRepository.save(noti);
+
+        // WebSocket 이벤트 발생
         List<NotiDto> notis = new ArrayList<>();
-        Noti savedNoti = notiRepository.save(noti);
-        notis.add(new NotiDto(savedNoti.getId(), savedNoti.getMessage(), savedNoti.getCreatedAt()));
+        notis.add(new NotiDto(noti.getId(), noti.getMessage(), noti.getCreatedAt()));
         NotiEvent event = new NotiEvent(this, receiver.getUsername(), notis, "새로운 알림이 생성되었습니다.");
         eventPublisher.publishEvent(event);
     }
 
-
+    // 알림 조회
     public List<NotiDto> getNotReadNoti(User receiver) {
-        System.out.println("알림 조회");
         List<NotiDto> notis = notiRepository.findNotiDtoByReceiverId(receiver.getId(), false).orElse(null);
-        System.out.println("알림 조회 끝");
         return notis;
     }
 
+    // 시즌 알림 확인
     public List<Noti> getSeasonNotiCheck(User receiver, long seasonId) {
         return notiRepository.findNotiByReceiverAndRelId(receiver, seasonId)
                 .orElseThrow(() -> new CustomException(ErrorCode.ERROR_CHECK)); // 알림이 없을 경우 예외 발생
@@ -74,23 +80,37 @@ public List<Noti> getSeasonNotiCheck(User receiver, long seasonId) {
     // 새 시즌 알림 생성
     @Transactional
     public void createNewSeasonNoti(Season season, User user) {
-        System.out.println("새 시즌 알림 생성");
-        // 메시지 생성
-        String message = NotiService.generateMessage(NotiDetailType.SEASON_START, season.getName());
+        createNoti(user, NotiType.SEASON, NotiDetailType.SEASON_START, season.getId(), season.getModelName(), season.getName());
+    }
 
-        Noti noti = Noti.builder()
-                .typeCode(NotiType.SEASON)
-                .type2Code(NotiDetailType.SEASON_START)
-                .receiver(user)
-                .isRead(false)
-                .message(message)
-                .relId(season.getId())
-                .relTypeCode(season.getModelName())
-                .build();
+    // 랭킹 업 알림 생성
+    @Transactional
+    public void createRankUpNoti(User user) {
+        createNoti(user, NotiType.RANK, NotiDetailType.RANK_UP, 0L, null, getDisplayName(user), user.getTier().name());
+    }
 
-        notiRepository.save(noti);
+    // 연속 커밋 축하 알림 생성
+    @Transactional
+    public void createStreakCommitNoti(User user, String days) {
+        createNoti(user, NotiType.STREAK, NotiDetailType.STREAK_CONTINUED, 0L, null, getDisplayName(user), days);
+    }
+
+    // 커밋 부재 알림 생성
+    @Transactional
+    public void createStreakBrokenNoti(User user) {
+        createNoti(user, NotiType.STREAK, NotiDetailType.STREAK_BROKEN, 0L, null, getDisplayName(user));
+    }
 
-        System.out.println("새 시즌 알림 생성 끝");
+    // 업적 알림 생성
+    @Transactional
+    public void createAchievementNoti(User user, String achievementName) {
+        createNoti(user, NotiType.ACHIEVEMENT, NotiDetailType.ACHIEVEMENT_COMPLETED, 0L, null, getDisplayName(user), achievementName);
+    }
+
+    // 공지사항 알림 생성
+    @Transactional
+    public void createNoticeNoti(User user, String noticeTitle) {
+        createNoti(user, NotiType.NOTICE, NotiDetailType.NOTICE_CREATED, 0L, null, noticeTitle);
     }
 
     // 읽음 처리
@@ -104,4 +124,8 @@ public List<Noti> read(User receiver) {
         System.out.println("알림 읽음 처리 끝");
         return notis;
     }
+
+    private String getDisplayName(User user) {
+        return user.getNickname() != null ? user.getNickname() : user.getUsername();
+    }
 }

src/main/java/cmf/commitField/domain/user/repository/UserRepository.java

@@ -7,6 +7,9 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 @Repository
@@ -18,4 +21,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
     @Modifying
     @Query("UPDATE User u SET u.status = :status WHERE u.username = :username")
     void updateStatus(@Param("username") String username, @Param("status") boolean status);
+
+    @Query("SELECT u FROM User u WHERE u.lastCommitted <= :date")
+    List<User> findUsersWithLastCommitBefore(@Param("date") LocalDateTime date);
 }

src/main/java/cmf/commitField/global/scheduler/NotiTestScheduler.java

@@ -1,5 +1,7 @@
 package cmf.commitField.global.scheduler;
 
+import cmf.commitField.domain.noti.noti.entity.NotiDetailType;
+import cmf.commitField.domain.noti.noti.entity.NotiType;
 import cmf.commitField.domain.noti.noti.service.NotiService;
 import cmf.commitField.domain.user.entity.User;
 import cmf.commitField.domain.user.repository.UserRepository;
@@ -22,6 +24,6 @@ public void test() {
         System.out.println("test 실행");
 
         User user = userRepository.findById(1L).orElseThrow(() -> new CustomException(ErrorCode.NOT_FOUND_USER));
-        notiService.createNoti(user);
+        notiService.createStreakBrokenNoti(user);
         }
 }