Merge pull request #45 from 9oormDari/develop

feat: 마이페이지 목표 완료 기록

src/main/java/com/goormdari/domain/history/application/HistoryService.java

@@ -0,0 +1,148 @@
+package com.goormdari.domain.history.application;
+
+import com.goormdari.domain.history.domain.History;
+import com.goormdari.domain.history.domain.dto.response.HistoryResponse;
+import com.goormdari.domain.history.domain.repository.HistoryRepository;
+import com.goormdari.domain.history.exception.ResourceNotFoundException;
+import com.goormdari.domain.routine.domain.Routine;
+import com.goormdari.domain.routine.domain.repository.RoutineRepository;
+import com.goormdari.domain.team.domain.Team;
+import com.goormdari.domain.team.domain.repository.TeamRepository;
+import com.goormdari.domain.user.domain.User;
+import com.goormdari.domain.user.domain.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+public class HistoryService {
+
+    private final HistoryRepository historyRepository;
+    private final TeamRepository teamRepository;
+    private final RoutineRepository routineRepository;
+    private final UserRepository userRepository;
+
+    // 최초 기록 생성
+    public void createHistory(Long userId, Long teamId, boolean isSuccess) {
+        // 팀 정보 가져오기
+        Team team = teamRepository.findById(teamId)
+                .orElseThrow(() -> new ResourceNotFoundException("Team " + teamId + " not found"));
+
+        // 팀의 시작일과 데드라인
+        LocalDate startDate = team.getCreatedAt().toLocalDate();
+        LocalDate endDate = team.getDeadLine();
+
+        // 중복 확인: 해당 유저와 기간(시작일 ~ 데드라인)에 대한 기록이 이미 존재하는지 확인
+        boolean historyExists = historyRepository.existsByUserIdAndDateRange(userId, startDate, endDate);
+
+        if (historyExists) {
+            // 이미 기록이 존재하면 더 이상 생성하지 않음
+            return;
+        }
+
+        // 유저 정보 가져오기
+        User user = userRepository.findById(userId)
+                .orElseThrow(() -> new ResourceNotFoundException("User " + userId + " not found"));
+
+        // 히스토리 생성 및 저장
+        History history = History.builder()
+                .goal(team.getGoal())
+                .routine1(team.getRoutine1())
+                .routine2(team.getRoutine2())
+                .routine3(team.getRoutine3())
+                .routine4(team.getRoutine4())
+                .user(user)  // 유저 정보 할당
+                .isSuccess(isSuccess)  // 70% 이상 성공 여부 반영
+                .build();
+        historyRepository.save(history);
+    }
+
+
+    @Scheduled(cron = "0 0 0 * * *")  // 매일 자정 실행
+    public void checkTeamGoalsAndCreateHistory() {
+        LocalDate today = LocalDate.now();
+        List<Team> expiredTeams = teamRepository.findAllByDeadLineBefore(today);
+
+        for (Team team : expiredTeams) {
+            List<User> teamMembers = userRepository.findAllByTeamId(team.getId());
+
+            for (User user : teamMembers) {
+                // 목표 달성 여부 계산
+                boolean isGoalAchieved = calculateGoalAchievement(user.getId(), team.getId());
+
+                // 중복 기록 생성 방지 처리된 히스토리 생성
+                createHistory(user.getId(), team.getId(), isGoalAchieved);
+            }
+        }
+    }
+
+    // D-Day 자정마다 초기화
+    // 매일 자정에 실행 (cron 표현식: "0 0 0 * * *")
+    @Scheduled(cron = "0 0 0 * * *")
+    public void updateDDayPlus() {
+        // 모든 히스토리를 조회
+        List<History> histories = historyRepository.findAll();
+
+        for (History history : histories) {
+            // dDayPlus 값을 1씩 증가
+            history.incrementDDayPlus();
+        }
+        // 업데이트된 히스토리 저장
+        historyRepository.saveAll(histories);
+    }
+
+    // 70% 이상 루틴 완수 시에 성공으로 계산
+    public boolean calculateGoalAchievement(Long userId, Long teamId) {
+        // 유저와 팀 정보 가져오기
+        Team team = teamRepository.findById(teamId)
+                .orElseThrow(() -> new ResourceNotFoundException("Team " + teamId + " not found"));
+
+        // 팀의 시작일과 데드라인 가져오기
+        LocalDate startDate = team.getCreatedAt().toLocalDate();
+        LocalDate endDate = team.getDeadLine();
+
+        // 해당 기간 내에 유저가 수행한 루틴 목록 가져오기
+        List<Routine> routines = routineRepository.findRoutinesByUserAndDateRange(userId, startDate, endDate);
+
+        // 성공한 루틴 개수 계산 (이미지가 있는 경우 성공한 것으로 간주)
+        long successfulRoutines = routines.stream()
+                .filter(routine -> routine.getRoutineImg() != null && !routine.getRoutineImg().isEmpty())
+                .count();
+
+        // 전체 루틴 개수 계산
+        long totalRoutines = routines.size();
+
+        // 성공률 계산 (70% 이상 성공 시 목표 달성)
+        if (totalRoutines > 0) {
+            double successRate = (double) successfulRoutines / totalRoutines;
+            return successRate >= 0.7;
+        }
+        return false; // 루틴이 없는 경우 실패로 간주
+    }
+
+    // 특정 유저의 히스토리 페이징 처리
+    public List<HistoryResponse> getAllHistoriesByUser(Long userId) {
+        List<History> histories = historyRepository.findAllByUserId(userId);
+
+        return histories.stream().map(history -> {
+            String[] routines = {
+                    history.getRoutine1(),
+                    history.getRoutine2(),
+                    history.getRoutine3(),
+                    history.getRoutine4()
+            };
+
+            int dDay = history.getDDayPlus();
+            String result = history.getIsSuccess() ? "성공" : "실패";
+
+            return new HistoryResponse(dDay, history.getGoal(), routines, result);
+        }).collect(Collectors.toList());
+    }
+}

src/main/java/com/goormdari/domain/history/domain/History.java

@@ -1,12 +1,12 @@
 package com.goormdari.domain.history.domain;
 
 import com.goormdari.domain.common.BaseEntity;
-import com.goormdari.domain.team.domain.Team;
+import com.goormdari.domain.user.domain.User;
 import jakarta.persistence.*;
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import lombok.*;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDateTime;
 
 @Entity
 @Getter
@@ -37,8 +37,29 @@ public class History extends BaseEntity {
     @Column(name = "is_success")
     private Boolean isSuccess;
 
+    @CreatedDate
+    private LocalDateTime createAt;
+
+    private int dDayPlus;
+
     @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "team_id")
-    private Team team;
+    @JoinColumn(name = "user_id")  // user_id로 User와 연결
+    private User user;
+
+    @Builder
+    public History(String goal, String routine1, String routine2, String routine3, String routine4, User user, Boolean isSuccess, int dDayPlus) {
+        this.goal = goal;
+        this.routine1 = routine1;
+        this.routine2 = routine2;
+        this.routine3 = routine3;
+        this.routine4 = routine4;
+        this.user = user;
+        this.isSuccess = isSuccess;
+        this.dDayPlus = dDayPlus;
+    }
+
+    public void incrementDDayPlus() {
+        this.dDayPlus++;  // dDayPlus 증가
+    }
 
 }

src/main/java/com/goormdari/domain/history/domain/dto/request/CreateHistoryRequest.java

@@ -0,0 +1,17 @@
+package com.goormdari.domain.history.domain.dto.request;
+
+import lombok.Builder;
+
+import java.util.List;
+
+@Builder
+public record CreateHistoryRequest(
+        String goal,
+        String routine1,
+        String routine2,
+        String routine3,
+        String routine4,
+        List<Long> routineIds
+//        Long teamId
+) {
+}

src/main/java/com/goormdari/domain/history/domain/dto/response/HistoryResponse.java

@@ -0,0 +1,15 @@
+package com.goormdari.domain.history.domain.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor
+@AllArgsConstructor
+public class HistoryResponse {
+    private int dDay;
+    private String goal;
+    private String[] routineList;
+    private String result;
+}

src/main/java/com/goormdari/domain/history/domain/repository/HistoryRepository.java

@@ -0,0 +1,20 @@
+package com.goormdari.domain.history.domain.repository;
+
+import com.goormdari.domain.history.domain.History;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+public interface HistoryRepository extends JpaRepository<History, Long> {
+
+    // 특정 유저와 기간(시작일~데드라인)에 대한 기록이 있는지 확인
+    @Query("SELECT COUNT(h) > 0 FROM History h WHERE h.user.id = :userId AND DATE(h.createdAt) BETWEEN :startDate AND :endDate")
+    boolean existsByUserIdAndDateRange(@Param("userId") Long userId,
+                                       @Param("startDate") LocalDate startDate,
+                                       @Param("endDate") LocalDate endDate);
+
+    List<History> findAllByUserId(Long userId);
+}

src/main/java/com/goormdari/domain/history/exception/ResourceNotFoundException.java

@@ -0,0 +1,8 @@
+package com.goormdari.domain.history.exception;
+
+public class ResourceNotFoundException extends RuntimeException {
+
+    public ResourceNotFoundException(String message) {
+        super(message);
+    }
+}

src/main/java/com/goormdari/domain/history/presentation/HistoryController.java

@@ -0,0 +1,40 @@
+package com.goormdari.domain.history.presentation;
+
+import com.goormdari.domain.calendar.exception.InvalidTokenException;
+import com.goormdari.domain.history.application.HistoryService;
+import com.goormdari.domain.history.domain.dto.response.HistoryResponse;
+import com.goormdari.global.config.security.jwt.JWTUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/histories")
+@RequiredArgsConstructor
+public class HistoryController {
+
+    private final HistoryService historyService;
+    private final JWTUtil jwtUtil;
+
+    @Operation(summary = "루틴 완수 기록 화면 조회", description = "루틴 완수 기록을 list 형태로 반홥합니다.")
+    @GetMapping
+    public ResponseEntity<List<HistoryResponse>> getHistoriesByUser(@Parameter(description = "Accesstoken을 입력해주세요.", required = true) @RequestHeader("Authorization") String token) {
+        if (token == null) {
+            throw new InvalidTokenException();
+        }
+
+        String jwt = token.startsWith("Bearer ") ? token.substring(7) : token;
+        if (!jwtUtil.validateToken(jwt)) {
+            throw new IllegalArgumentException("Invalid token");
+        }
+        Long userId = jwtUtil.extractId(jwt);
+
+        List<HistoryResponse> histories = historyService.getAllHistoriesByUser(userId);
+        return ResponseEntity.ok(histories);
+    }
+
+}

src/main/java/com/goormdari/domain/routine/domain/repository/RoutineRepository.java

@@ -3,7 +3,9 @@
 import com.goormdari.domain.routine.domain.Routine;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
@@ -13,4 +15,10 @@ public interface RoutineRepository  extends JpaRepository<Routine, Long> {
 
     @Query("SELECT r FROM Routine r WHERE r.user.id = :userId")
     List<Routine> findAllByUserId(Long userId);
+
+    // 유저와 팀의 시작일~데드라인 사이에 해당하는 루틴 검색
+    @Query("SELECT r FROM Routine r WHERE r.user.id = :userId AND DATE(r.createdAt) BETWEEN :startDate AND :endDate")
+    List<Routine> findRoutinesByUserAndDateRange(@Param("userId") Long userId,
+                                                 @Param("startDate") LocalDate startDate,
+                                                 @Param("endDate") LocalDate endDate);
 }

src/main/java/com/goormdari/domain/team/domain/repository/TeamRepository.java

@@ -3,8 +3,11 @@
 import com.goormdari.domain.team.domain.Team;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
 public interface TeamRepository extends JpaRepository<Team, Long> {
     Optional<Team> findByJoinCode(String joinCode);
+    List<Team> findAllByDeadLineBefore(LocalDate today);
 }

src/main/java/com/goormdari/domain/user/domain/dto/AddUserRequest.java → src/main/java/com/goormdari/domain/user/domain/dto/request/AddUserRequest.java

@@ -1,4 +1,4 @@
-package com.goormdari.domain.user.domain.dto;
+package com.goormdari.domain.user.domain.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.*;

src/main/java/com/goormdari/domain/user/domain/dto/LoginRequest.java → src/main/java/com/goormdari/domain/user/domain/dto/request/LoginRequest.java

@@ -1,4 +1,4 @@
-package com.goormdari.domain.user.domain.dto;
+package com.goormdari.domain.user.domain.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;

src/main/java/com/goormdari/domain/user/domain/dto/JwtResponse.java → src/main/java/com/goormdari/domain/user/domain/dto/response/JwtResponse.java

@@ -1,4 +1,4 @@
-package com.goormdari.domain.user.domain.dto;
+package com.goormdari.domain.user.domain.dto.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

src/main/java/com/goormdari/domain/user/domain/repository/UserRepository.java

@@ -10,6 +10,7 @@
 public interface UserRepository extends JpaRepository<User, Long> {
 
     Optional<User> findByUsername(String username);
+    List<User> findAllByTeamId(Long teamId);
 
     @Query("SELECT t.joinCode FROM User u JOIN u.team t WHERE u.id = :userId")
     String findJoinCodeByUserId(Long userId);

src/main/java/com/goormdari/domain/user/domain/service/UserService.java

@@ -4,9 +4,9 @@
 import com.goormdari.domain.team.domain.repository.TeamRepository;
 import com.goormdari.domain.user.domain.dto.response.findCurrentStepResponse;
 import com.goormdari.domain.user.domain.User;
-import com.goormdari.domain.user.domain.dto.AddUserRequest;
-import com.goormdari.domain.user.domain.dto.JwtResponse;
-import com.goormdari.domain.user.domain.dto.LoginRequest;
+import com.goormdari.domain.user.domain.dto.request.AddUserRequest;
+import com.goormdari.domain.user.domain.dto.response.JwtResponse;
+import com.goormdari.domain.user.domain.dto.request.LoginRequest;
 import com.goormdari.domain.user.domain.repository.UserRepository;
 import com.goormdari.global.config.security.jwt.JWTUtil;
 import jakarta.transaction.Transactional;

src/main/java/com/goormdari/domain/user/presentation/AuthController.java

@@ -1,8 +1,8 @@
 package com.goormdari.domain.user.presentation;
 
-import com.goormdari.domain.user.domain.dto.AddUserRequest;
-import com.goormdari.domain.user.domain.dto.JwtResponse;
-import com.goormdari.domain.user.domain.dto.LoginRequest;
+import com.goormdari.domain.user.domain.dto.request.AddUserRequest;
+import com.goormdari.domain.user.domain.dto.response.JwtResponse;
+import com.goormdari.domain.user.domain.dto.request.LoginRequest;
 import com.goormdari.domain.user.domain.service.UserService;
 
 import jakarta.validation.Valid;

src/main/java/com/goormdari/global/config/SchedulingConfig.java

@@ -0,0 +1,10 @@
+package com.goormdari.global.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableScheduling
+public class SchedulingConfig {
+    // 스케줄링 활성화
+}