refactor: walk 도메인 리팩토링 및 Ver2 기능추가

src/main/java/com/kau/capstone/entity/member/repository/MemberRepository.java

@@ -17,7 +17,7 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
     void updateRefreshTokenByMemberId(@Param("memberId") Long memberId,
         @Param("refreshToken") String refreshToken);
 
-    default Member getById(long id) {
+    default Member getById(Long id) {
         return findById(id).orElseThrow(MemberNotFoundException::new);
     }
 }

src/main/java/com/kau/capstone/entity/member/repository/OwnedPetRepository.java

@@ -3,6 +3,7 @@
 import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.entity.member.OwnedPet;
 import com.kau.capstone.entity.pet.Pet;
+import com.kau.capstone.v2.walk.exception.PetOwnershipException;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -19,7 +20,9 @@ public interface OwnedPetRepository extends JpaRepository<OwnedPet, Long> {
     @Query("SELECT op.pet FROM OwnedPet op WHERE op.member.id = :memberId AND op.pet.id = :petId")
     Optional<Pet> findPetByMemberAndPetId(@Param("memberId") Long memberId, @Param("petId") Long petId);
 
-    @Query("SELECT COUNT(o) > 0 FROM OwnedPet o WHERE o.member = :member AND o.pet = :pet")
-    Boolean existsByMemberAndPet(@Param("member") Member member, @Param("pet") Pet pet);
+    List<OwnedPet> pet(Pet pet);
 
+    default Pet getPetByMemberAndPetId(Member member, Long petId) {
+        return findPetByMemberAndPetId(member.getId(), petId).orElseThrow(PetOwnershipException::new);
+    }
 }

src/main/java/com/kau/capstone/entity/walk/Walk.java

@@ -3,94 +3,111 @@
 import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.entity.pet.Pet;
 import com.kau.capstone.global.common.BaseEntity;
+import com.kau.capstone.v1.walk.dto.request.WalkRequest;
+import com.kau.capstone.v2.walk.dto.request.WalkCreateReqV2;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
-import lombok.*;
-import org.hibernate.annotations.Comment;
-
-import java.time.LocalDate;
+import java.time.Duration;
 import java.time.LocalDateTime;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Comment;
 
 
 @Entity
 @Getter
-@Setter
-@Builder
-@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Walk extends BaseEntity {
 
-    private static final Double UNIT_STEP_PER_METER = 1.2; // 1M당 1.2보로 측정
-    private static final Double UNIT_KCAL_PER_STEP = 0.04; // 한 걸음당 0.04kcal로 측정
+    private static final double UNIT_STEP_PER_METER = 2.0; // 1M당 2보로 측정
+    private static final double UNIT_KCAL_PER_STEP = 0.04; // 한 걸음당 0.04kcal로 측정
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Comment("산책한 사용자 식별자")
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
     @JoinColumn(name = "member_id")
     private Member member;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REMOVE)
     @JoinColumn(name = "pet_id")
     private Pet pet;
 
-    @Comment("측정 일자")
-    private LocalDate dataIntDt;
+    @Comment("산책 시작 시간")
+    private LocalDateTime startTime;
+
+    @Comment("산책 종료 시간")
+    private LocalDateTime endTime;
+
+    @Comment("산책 시간")
+    private long duration;
 
     @Comment("이동 거리")
-    private Double distance;
+    private double distance;
 
     @Comment("소모 칼로리")
-    private Double kcal;
+    private double kcal;
 
     @Comment("걸음 수")
-    private Long step;
-
-    @Comment("산책 시간")
-    private Long walkingTime;
-
-    @Comment("누적 조도량")
-    private Double tLux;
+    private long step;
+
+
+    // V1 생성자
+    private Walk(Member member, Pet pet, WalkRequest walkReq) {
+        this.member = member;
+        this.pet = pet;
+        this.startTime = walkReq.getStartTime();
+        this.endTime = walkReq.getEndTime();
+        this.duration = Duration.between(startTime, endTime).getSeconds();
+        this.distance = walkReq.getDistance();
+        this.kcal = calcKcal(walkReq.getDistance());
+        this.step = calcStep(walkReq.getDistance());
+    }
 
-    @Comment("평균 색온도")
-    private Double avgK;
+    // V2 생성자
+    private Walk(Member member, Pet pet, WalkCreateReqV2 walkCreateReq) {
+        this.member = member;
+        this.pet = pet;
+        this.startTime = walkCreateReq.startTime();
+        this.endTime = walkCreateReq.endTime();
+        this.duration = Duration.between(startTime, endTime).getSeconds();
+        this.distance = walkCreateReq.distance();
+        this.kcal = calcKcal(walkCreateReq.distance());
+        this.step = calcStep(walkCreateReq.distance());
+    }
 
-    @Comment("평균 조도량")
-    private Double avgLux;
+    // V1 생성자 메소드
+    public static Walk of(Member member, Pet pet, WalkRequest walkReq) {
+        return new Walk(member, pet, walkReq);
+    }
 
-    @Comment("산책 시작 시간")
-    private LocalDateTime startTime;
+    // V2 생성자 메소드
+    public static Walk of(Member member, Pet pet, WalkCreateReqV2 walkCreateReq) {
+        return new Walk(member, pet, walkCreateReq);
+    }
 
-    @Comment("산책 종료 시간")
-    private LocalDateTime endTime;
+    // 걸음수 계산 메소드
+    private static long calcStep(double distance){
+        return (long)(distance * UNIT_STEP_PER_METER);
+    }
 
-    private static Double calculateKcal(Long step) {
-        return step * UNIT_KCAL_PER_STEP;
+    // 칼로리 계산 메소드
+    private static double calcKcal(double distance) {
+        return calcStep(distance) * UNIT_KCAL_PER_STEP;
     }
 
-    public static Walk create(Member member, Pet pet, LocalDate dataIntDt, Double distance, Long step, Long walkingTime, Double tLux, Double avgK, Double avgLux, LocalDateTime startTime, LocalDateTime endTime) {
-        Double kcal = calculateKcal(step);
-        return Walk.builder()
-                .member(member)
-                .pet(pet)
-                .dataIntDt(dataIntDt)
-                .distance(distance)
-                .step(step)
-                .walkingTime(walkingTime)
-                .tLux(tLux)
-                .avgK(avgK)
-                .avgLux(avgLux)
-                .startTime(startTime)
-                .endTime(endTime)
-                .kcal(kcal)
-                .build();
+    // 산책 시간 계산 메소드
+    public static long calcWalkTime(LocalDateTime startTime, LocalDateTime endTime) {
+        Duration duration = Duration.between(startTime, endTime);
+        return duration.getSeconds();
     }
 
 }

src/main/java/com/kau/capstone/entity/walk/repository/WalkRepository.java

@@ -1,28 +1,49 @@
 package com.kau.capstone.entity.walk.repository;
 
+import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.entity.pet.Pet;
 import com.kau.capstone.entity.walk.Walk;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 import org.springframework.data.domain.Pageable;
 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;
-
 public interface WalkRepository extends JpaRepository<Walk,Long> {
-    Optional<Walk> findTopByPetOrderByDataIntDtDesc(Pet pet);
-
-    List<Walk> findByPetAndDataIntDt(Pet pet, LocalDate dataIntDt);
 
-    @Query("SELECT w FROM Walk w WHERE w.pet = :pet AND YEAR(w.dataIntDt) = :year AND MONTH(w.dataIntDt) = :month")
+    @Query("SELECT w FROM Walk w WHERE w.pet = :pet AND YEAR(w.startTime) = :year AND MONTH(w.startTime) = :month")
     List<Walk> findByPetAndYearAndMonth(@Param("pet") Pet pet, @Param("year") int year, @Param("month") int month);
 
-    @Query("SELECT w FROM Walk w WHERE w.pet = :pet AND w.dataIntDt BETWEEN :startDate AND :endDate")
-    List<Walk> findByPetAndDateBetween(@Param("pet") Pet pet, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
-
-    @Query("SELECT w FROM Walk w WHERE w.pet = :pet ORDER BY w.dataIntDt DESC")
+    @Query("SELECT w FROM Walk w WHERE w.pet = :pet ORDER BY w.startTime DESC")
     List<Walk> findTop5ByPetOrderByDataIntDtDesc(@Param("pet") Pet pet, Pageable pageable);
+
+    @Query("SELECT w FROM Walk w WHERE w.pet = :pet AND FUNCTION('DATE', w.startTime) = :walkDate")
+    List<Walk> findDailyWalksByPetAndWalkDate(@Param("pet") Pet pet, @Param("walkDate") LocalDate walkDate);
+
+    @Query("SELECT w FROM Walk w WHERE w.pet = :pet AND w.startTime BETWEEN :startDateTime AND :endDateTime")
+    List<Walk> findWeeklyWalks(@Param("pet") Pet pet, @Param("startDateTime") LocalDateTime startDateTime, @Param("endDateTime") LocalDateTime endDateTime
+    );
+
+    List<Walk> findTop20ByMemberOrderByStartTimeDesc(Member member);
+
+
+
+    default List<Walk> getRecentWalks(Member member) {
+        return findTop20ByMemberOrderByStartTimeDesc(member);
+    }
+
+    default List<Walk> getDailyWalks(Pet pet, LocalDate walkDate) {
+        return findDailyWalksByPetAndWalkDate(pet, walkDate);
+    }
+
+    default List<Walk> getWalkCalendar(Pet pet, int year, int month) {
+        return findByPetAndYearAndMonth(pet, year, month);
+    }
+
+    default List<Walk> getWeeklyWalks(Pet pet, LocalDateTime monday, LocalDateTime sunday){
+        return findWeeklyWalks(pet, monday, sunday);
+    }
 }
 

src/main/java/com/kau/capstone/v1/walk/controller/WalkController.java

@@ -30,25 +30,31 @@ public class WalkController {
 
     // 산책 기록하기
     @PostMapping("/register/{petId}")
-    public ResponseEntity<WalkResponse> registerWalk(@RequestBody @Valid WalkRequest walkData,
+    public ResponseEntity<WalkResponse> registerWalk(
+        @RequestBody @Valid WalkRequest walkData,
         @LoginUser LoginInfo loginUser,
-        @PathVariable Long petId) {
+        @PathVariable Long petId
+    ) {
         WalkResponse response = walkService.saveWalkData(walkData, loginUser.memberId(), petId);
         return ResponseEntity.ok(response);
     }
 
     // 최근 산책 기록 가져오기
     @GetMapping("/recent")
-    public ResponseEntity<WalkRecentDataListResponse> latestWalk(@LoginUser LoginInfo loginUser) {
+    public ResponseEntity<WalkRecentDataListResponse> latestWalk(
+        @LoginUser LoginInfo loginUser
+    ) {
         WalkRecentDataListResponse response = walkService.getWalkRecentData(loginUser.memberId());
         return ResponseEntity.ok(response);
     }
 
     // 일간 산책 기록 가져오기
     @GetMapping("/daily/{petId}")
-    public ResponseEntity<WalkDailySummaryResponse> dailyWalk(@LoginUser LoginInfo loginUser,
+    public ResponseEntity<WalkDailySummaryResponse> dailyWalk(
+        @LoginUser LoginInfo loginUser,
         @PathVariable Long petId,
-        @RequestParam LocalDate date) {
+        @RequestParam LocalDate date
+    ) {
 
         WalkDailySummaryResponse response = walkService.getDailySummary(loginUser.memberId(), petId,
             date);