Merge pull request #25 from YAPP-Github/feat/T3-109

[T3-109] 루틴 완료 여부 갱신

Author: yuseok0215

src/main/java/bitnagil/bitnagil_backend/changedRoutine/repository/ChangedRoutineRepository.java

@@ -8,10 +8,15 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 public interface ChangedRoutineRepository extends JpaRepository<ChangedRoutine, HistoryPk> {
 
+    Optional<ChangedRoutine> findByChangedRoutinePk(HistoryPk changedRoutinePk);
+
+    List<ChangedRoutine> findByChangedRoutinePk_Id(UUID changedRoutineId);
+
     /**
      * 현재 시점을 기준으로 유저의 살아있는 변경루틴 이력을 조회
      * historyStartDateTime < systime <= historyEndDateTime

src/main/java/bitnagil/bitnagil_backend/changedRoutine/repository/ChangedSubRoutineRepository.java

@@ -7,10 +7,13 @@
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
 public interface ChangedSubRoutineRepository extends JpaRepository<ChangedSubRoutine, HistoryPk> {
 
+    Optional<ChangedSubRoutine> findByChangedSubRoutinePk(HistoryPk changedSubRoutinePk);
+
     /**
      * 현재 시점을 기준으로 살아있는 변경 서브루틴 이력을 조회
      * historyStartDateTime < systime <= historyEndDateTime

src/main/java/bitnagil/bitnagil_backend/global/entity/BaseTimeEntity.java

@@ -24,5 +24,5 @@ public class BaseTimeEntity {
     @Column(columnDefinition = "TIMESTAMP")
     private LocalDateTime updatedAt;
 
-    private LocalDateTime deletedAt;
+    protected LocalDateTime deletedAt;
 }

src/main/java/bitnagil/bitnagil_backend/global/errorcode/ErrorCode.java

@@ -58,6 +58,17 @@ public enum ErrorCode {
 
     // 서브 루틴 관련 에러 코드
     NOT_FOUND_SUB_ROUTINE("SR001", HttpStatus.NOT_FOUND, "해당 복합 키에 맞는 서브 루틴이 존재하지 않습니다."),
+    SUB_ROUTINE_USER_NOT_MATCHED("SR002", HttpStatus.FORBIDDEN, "서브루틴의 유저 정보와 로그인 유저 정보가 일치하지 않습니다."),
+
+    // 변경 루틴 관련 에러 코드
+    NOT_FOUND_CHANGED_ROUTINE("CR001", HttpStatus.NOT_FOUND, "존재하지 않는 변경 루틴입니다."),
+    CHANGED_ROUTINE_USER_NOT_MATCHED("CR002", HttpStatus.FORBIDDEN, "변경 루틴의 유저 정보와 로그인 유저 정보가 일치하지 않습니다."),
+
+    // 변경 서브루틴 관련 에러 코드
+    NOT_FOUND_CHANGED_SUB_ROUTINE("CSR001", HttpStatus.NOT_FOUND, "존재하지 않는 변경 서브루틴입니다."),
+    CHANGED_SUB_ROUTINE_USER_NOT_MATCHED("CSR002", HttpStatus.FORBIDDEN, "변경 서브루틴의 유저 정보와 로그인 유저 정보가 일치하지 않습니다."),
+
+    // 루틴 타입 관련 에러 코드
 
     // 온보딩 관련 에러 코드
     NOT_FOUND_RECOMMENDED_ROUTINE("ON000", HttpStatus.NOT_FOUND, "조건에 맞는 추천 루틴을 찾을 수 없습니다."),

src/main/java/bitnagil/bitnagil_backend/routine/controller/RoutineController.java

@@ -3,7 +3,11 @@
 import java.time.LocalDate;
 import java.util.UUID;
 
+import bitnagil.bitnagil_backend.routine.domain.enums.RoutineType;
+import bitnagil.bitnagil_backend.routine.request.UpdateRoutineCompletionRequest;
 import jakarta.validation.constraints.NotNull;
+
+import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -64,4 +68,16 @@ public CustomResponseDto<RoutineSearchResponse> getRoutines(@CurrentUser User us
                                                                 @RequestParam @NotNull LocalDate endDate) {
         return CustomResponseDto.from(routineService.getRoutines(user, startDate, endDate));
     }
+
+    /**
+     * 루틴 완료 여부 업데이트
+     * 새 엔티티를 생성할 수도, 부분 수정할 수도 있기에 PATCH를 쓰지 않고 POST를 씁니다.
+     */
+    @PostMapping("/completions")
+    public CustomResponseDto<Object> updateRoutineCompletionStatus(@CurrentUser User user,
+        @RequestBody UpdateRoutineCompletionRequest updateRoutineCompletionRequest) {
+        routineService.updateRoutineCompletionStatus(user, updateRoutineCompletionRequest);
+
+        return CustomResponseDto.from(null);
+    }
 }

src/main/java/bitnagil/bitnagil_backend/routine/controller/spec/RoutineSpec.java

@@ -8,8 +8,8 @@
 import bitnagil.bitnagil_backend.global.swagger.ApiErrorCodeExamples;
 import bitnagil.bitnagil_backend.global.swagger.ApiTags;
 import bitnagil.bitnagil_backend.routine.request.RegisterRoutineRequest;
+import bitnagil.bitnagil_backend.routine.request.UpdateRoutineCompletionRequest;
 import bitnagil.bitnagil_backend.routine.request.UpdateRoutineRequest;
-import bitnagil.bitnagil_backend.routine.request.RoutineSearchRequest;
 import bitnagil.bitnagil_backend.routine.response.RoutineSearchResponse;
 import bitnagil.bitnagil_backend.user.domain.User;
 import io.swagger.v3.oas.annotations.Operation;
@@ -40,4 +40,8 @@ public interface RoutineSpec {
     @Operation(summary = "루틴 및 서브 루틴을 모두 삭제합니다.")
     @ApiErrorCodeExamples({ErrorCode.NOT_FOUND_ROUTINE, ErrorCode.ROUTINE_USER_NOT_MATCHED})
     CustomResponseDto<Object> deleteRoutine(User user, UUID routineId);
+
+    @Operation(summary = "여러 루틴의 완료 여부를 갱신합니다.")
+    CustomResponseDto<Object> updateRoutineCompletionStatus(User user,
+        UpdateRoutineCompletionRequest updateRoutineCompletionRequest);
 }

src/main/java/bitnagil/bitnagil_backend/routine/domain/Routine.java

@@ -73,4 +73,9 @@ public Routine(HistoryPk routinePk, String name, List<DayOfWeek> repeatDay, Loca
     public void updateHistoryEndDateTime(LocalDateTime updateDateTime) {
         this.historyEndDateTime = updateDateTime;
     }
+
+    // sort delete
+    public void setDeleteAt(LocalDateTime deleteAt) {
+        this.deletedAt = deleteAt;
+    }
 }

src/main/java/bitnagil/bitnagil_backend/routine/domain/RoutineCompletion.java

@@ -0,0 +1,62 @@
+package bitnagil.bitnagil_backend.routine.domain;
+
+import java.time.LocalDate;
+import java.util.UUID;
+
+import bitnagil.bitnagil_backend.global.entity.BaseTimeEntity;
+import bitnagil.bitnagil_backend.routine.domain.enums.RoutineType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotNull;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+/**
+ * 루틴 완료 여부를 관리하는 엔티티 클래스입니다.
+ */
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity
+public class RoutineCompletion extends BaseTimeEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long routineCompletionId;
+
+    @NotNull
+    private Boolean completeYn;
+
+    @NotNull
+    private LocalDate performedDate;
+
+    @NotNull
+    private UUID routineId;
+
+    @NotNull
+    private Long routineHistorySeq;
+
+    @Enumerated(EnumType.STRING)
+    @Column(columnDefinition = "varchar(40)", nullable = false)
+    private RoutineType routineType;
+
+    @Builder
+    public RoutineCompletion(Boolean completeYn, LocalDate performedDate, UUID routineId, Long routineHistorySeq,
+        RoutineType routineType) {
+        this.completeYn = completeYn;
+        this.performedDate = performedDate;
+        this.routineId = routineId;
+        this.routineHistorySeq = routineHistorySeq;
+        this.routineType = routineType;
+    }
+
+    public void updateCompleteYn(Boolean completeYn) {
+        this.completeYn = completeYn;
+    }
+}

src/main/java/bitnagil/bitnagil_backend/routine/domain/SubRoutine.java

@@ -70,4 +70,8 @@ public void updateSortOrder(Integer sortOrder) {
         this.sortOrder = sortOrder;
     }
 
+    // sort delete
+    public void setDeleteAt(LocalDateTime deleteAt) {
+        this.deletedAt = deleteAt;
+    }
 }

src/main/java/bitnagil/bitnagil_backend/routine/domain/enums/RoutineType.java

@@ -0,0 +1,17 @@
+package bitnagil.bitnagil_backend.routine.domain.enums;
+
+import bitnagil.bitnagil_backend.enums.EnumType;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum RoutineType implements EnumType {
+    ROUTINE("루틴"),
+    SUB_ROUTINE("서브루틴"),
+    CHANGED_ROUTINE("변경 루틴"),
+    CHANGED_SUB_ROUTINE("변경 서브루틴"),
+    ;
+
+    private final String description;
+}