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

src/main/java/com/kau/capstone/entity/AI/CatEyes.java

@@ -0,0 +1,64 @@
+package com.kau.capstone.entity.AI;
+
+import com.kau.capstone.entity.pet.Pet;
+import com.kau.capstone.v2.ai.dto.response.CatEyeRes;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Comment;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class CatEyes {
+
+    @Id
+    @Comment("안구질환 식별자")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Comment("각막궤양")
+    private float cornealUlcer;
+
+    @Comment("각막부골편")
+    private float cornealDystcatrophy;
+
+    @Comment("결막염")
+    private float conjunctivitis;
+
+    @Comment("안검염")
+    private float blepharitis;
+
+    @Comment("비궤양성 각막질환")
+    private float nonUlcerativeKeratitis;
+
+    @ManyToOne
+    @JoinColumn(name = "pet_id")
+    private Pet pet;
+
+    private CatEyes(float cornealUlcer, float cornealDystcatrophy, float conjunctivitis,
+        float blepharitis, float nonUlcerativeKeratitis, Pet pet){
+        this.cornealUlcer = cornealUlcer;
+        this.cornealDystcatrophy = cornealDystcatrophy;
+        this.conjunctivitis = conjunctivitis;
+        this.blepharitis = blepharitis;
+        this.nonUlcerativeKeratitis = nonUlcerativeKeratitis;
+        this.pet = pet;
+    }
+
+    public static CatEyes of(CatEyeRes eyeRes, Pet pet){
+        return new CatEyes(eyeRes.cornealUlcer(),
+            eyeRes.cornealDystcatrophy(),
+            eyeRes.conjunctivitis(),
+            eyeRes.blepharitis(),
+            eyeRes.nonUlcerativeKeratitis(),
+            pet);
+    }
+
+}

src/main/java/com/kau/capstone/entity/AI/DogEyes.java

@@ -0,0 +1,84 @@
+package com.kau.capstone.entity.AI;
+
+import com.kau.capstone.entity.pet.Pet;
+import com.kau.capstone.v2.ai.dto.response.DogEyeRes;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Comment;
+
+@Entity
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class DogEyes {
+
+    @Id
+    @Comment("안구질환 식별자")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Comment("궤양성 각막질환")
+    private float ulcerativeKeratitis;
+
+    @Comment("백내장")
+    private float cataract;
+
+    @Comment("색소침착성각막염")
+    private float pigmentaryKeratitis;
+
+    @Comment("안검내반증")
+    private float entropion;
+
+    @Comment("안검종양")
+    private float eyelidTumor;
+
+    @Comment("유루증")
+    private float incontinence;
+
+    @Comment("핵경화")
+    private float nuclearSclerosis;
+
+    @Comment("결막염")
+    private float conjunctivitis;
+
+    @Comment("안검염")
+    private float blepharitis;
+
+    @Comment("비궤양성 각막질환")
+    private float nonUlcerativeKeratitis;
+
+    @ManyToOne
+    @JoinColumn(name = "pet_id")
+    private Pet pet;
+
+    private DogEyes(float ulcerativeKeratitis, float cataract, float pigmentaryKeratitis,
+        float entropion, float eyelidTumor, float incontinence, float nuclearSclerosis,
+        float conjunctivitis, float blepharitis, float nonUlcerativeKeratitis, Pet pet) {
+        this.ulcerativeKeratitis = ulcerativeKeratitis;
+        this.cataract = cataract;
+        this.pigmentaryKeratitis = pigmentaryKeratitis;
+        this.entropion = entropion;
+        this.eyelidTumor = eyelidTumor;
+        this.incontinence = incontinence;
+        this.nuclearSclerosis = nuclearSclerosis;
+        this.conjunctivitis = conjunctivitis;
+        this.blepharitis = blepharitis;
+        this.nonUlcerativeKeratitis = nonUlcerativeKeratitis;
+        this.pet = pet;
+    }
+
+    public static DogEyes of(DogEyeRes eyeRes, Pet pet) {
+        return new DogEyes(eyeRes.ulcerativeKeratitis(), eyeRes.cataract(),
+            eyeRes.pigmentaryKeratitis(),
+            eyeRes.entropion(), eyeRes.eyelidTumor(), eyeRes.incontinence(),
+            eyeRes.nuclearSclerosis(),
+            eyeRes.conjunctivitis(), eyeRes.blepharitis(), eyeRes.nonUlcerativeKeratitis(), pet);
+    }
+
+}

src/main/java/com/kau/capstone/entity/AI/Repository/CatEyesRepository.java

@@ -0,0 +1,8 @@
+package com.kau.capstone.entity.AI.Repository;
+
+import com.kau.capstone.entity.AI.CatEyes;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface CatEyesRepository extends JpaRepository<CatEyes, Long> {
+
+}

src/main/java/com/kau/capstone/entity/AI/Repository/DogEyesRepository.java

@@ -0,0 +1,8 @@
+package com.kau.capstone.entity.AI.Repository;
+
+import com.kau.capstone.entity.AI.DogEyes;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface DogEyesRepository extends JpaRepository<DogEyes, Long> {
+
+}

src/main/java/com/kau/capstone/entity/food/Food.java

@@ -13,11 +13,8 @@
 
 @Entity
 @Getter
-@Builder
-@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Food {
-
     @Id
     @Comment("강아지 사료 식별자")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -30,5 +27,11 @@ public class Food {
     private String imageUrl;
 
     @Comment("사료 가격")
-    private Long price;
+    private long price;
+
+    private Food(String name, String imageUrl, Long price) {
+        this.name = name;
+        this.imageUrl = imageUrl;
+        this.price = price;
+    }
 }

src/main/java/com/kau/capstone/entity/food/repository/FoodRepository.java

@@ -1,7 +1,12 @@
 package com.kau.capstone.entity.food.repository;
 
 import com.kau.capstone.entity.food.Food;
+import com.kau.capstone.v2.food.exception.FoodNotFoundExceptionV2;
+import lombok.NonNull;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface FoodRepository extends JpaRepository<Food, Long> {
+    default @NonNull Food getById(@NonNull Long id){
+        return findById(id).orElseThrow(FoodNotFoundExceptionV2::new);
+    }
 }

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

@@ -2,22 +2,23 @@
 
 import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.v1.member.exception.MemberNotFoundException;
-import java.util.Optional;
+import lombok.NonNull;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
+import java.util.Optional;
+
 public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByPlatformId(String platformId);
 
-    @Modifying
-    @Query("UPDATE Member m SET m.refreshToken = :refreshToken WHERE m.id = :memberId")
-    void updateRefreshTokenByMemberId(@Param("memberId") Long memberId,
-        @Param("refreshToken") String refreshToken);
-
-    default Member getById(long id) {
+    default @NonNull Member getById(@NonNull Long id) {
         return findById(id).orElseThrow(MemberNotFoundException::new);
     }
+
+    @Modifying
+    @Query("UPDATE Member m SET m.refreshToken = :refreshToken WHERE m.id = :memberId")
+    void updateRefreshTokenByMemberId(@Param("memberId") Long memberId, @Param("refreshToken") String refreshToken);
 }

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,8 @@ 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);
 
+    default Pet getPetByMemberAndPetId(Member member, Long petId) {
+        return findPetByMemberAndPetId(member.getId(), petId).orElseThrow(PetOwnershipException::new);
+    }
 }

src/main/java/com/kau/capstone/entity/pet/repository/PetRepository.java

@@ -2,7 +2,7 @@
 
 import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.entity.pet.Pet;
-import com.kau.capstone.v1.pet.exception.PetAndMemberNotMatchedException;
+import com.kau.capstone.v2.pet.exception.PetNotFoundExceptionV2;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -16,10 +16,11 @@ public interface PetRepository extends JpaRepository<Pet, Long> {
     List<Pet> findByMember(@Param("member") Member member);
 
     @Query("SELECT p FROM Pet p WHERE p.id = :id AND p.deletedAt IS NULL AND p.member = :member")
-    Optional<Pet> findByIdAndDeletedAtIsNullAndMember(@Param("id") Long id, @Param("member") Member member);
+    Optional<Pet> findByIdAndMemberAndDeletedAtIsNull(@Param("id") Long id, @Param("member") Member member);
 
-    default Pet getByIdAndDeletedAtIsNullAndMember(Long id, Member member) {
-        return findByIdAndDeletedAtIsNullAndMember(id, member).orElseThrow(
-            PetAndMemberNotMatchedException::new);
+    default Pet getByIdAndMemberAndDeletedAtIsNull(Long id, Member member) {
+        return findByIdAndMemberAndDeletedAtIsNull(id, member).orElseThrow(
+            PetNotFoundExceptionV2::new
+        );
     }
 }

src/main/java/com/kau/capstone/entity/point/History.java

@@ -1,6 +1,8 @@
 package com.kau.capstone.entity.point;
 
 import com.kau.capstone.entity.member.Member;
+import com.kau.capstone.v2.point.dto.request.DepositPointReqV2;
+import com.kau.capstone.v2.point.dto.request.PayPointReqV2;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -9,7 +11,6 @@
 import jakarta.persistence.ManyToOne;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Comment;
@@ -18,8 +19,6 @@
 
 @Entity
 @Getter
-@Builder
-@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class History {
 
@@ -33,11 +32,6 @@ public class History {
     @JoinColumn(name = "point_id")
     private Point point;
 
-    @ManyToOne
-    @Comment("사용자 연결")
-    @JoinColumn(name = "member_id")
-    private Member member;
-
     @Comment("적립/결제 후의 총 포인트")
     private Long totalPoint;
 
@@ -48,5 +42,28 @@ public class History {
     private String name;
 
     @Comment("적립/결제 일자")
-    private LocalDateTime date;
+    private LocalDateTime date = LocalDateTime.now();
+
+    private History(Point point, Long totalPoint, Long changePoint, String name) {
+        this.point = point;
+        this.totalPoint = totalPoint;
+        this.changePoint = changePoint;
+        this.name = name;
+    }
+
+    public static History of(Point point, Long changePoint, String name) {
+        return new History(point, point.getAmount(), changePoint, name);
+    }
+    public static History of(Point point, PayPointReqV2 req, PointType type) {
+        return new History(point, point.getAmount(), -req.point(), type.description);
+    }
+
+    public static History of(Point point, DepositPointReqV2 req, PointType type) {
+        return new History(point, point.getAmount(), req.point(), type.description);
+    }
+
+    @Deprecated
+    public static History of(Member member, Point point, Long changePoint, String name){
+        return new History(point, point.getAmount(), changePoint, name);
+    }
 }

src/main/java/com/kau/capstone/entity/point/Point.java

@@ -15,31 +15,33 @@
 
 @Entity
 @Getter
-@Builder
-@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Point {
-
     @Id
     @Comment("포인트 식별자")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private long id;
 
     @OneToOne(mappedBy = "point")
     private Member member;
 
     @Comment("포인트 값")
-    private Long amount;
+    private long amount;
 
-    public void connectMember(Member member) {
+    private Point(Member member) {
         this.member = member;
+        this.amount = 0L;
+    }
+
+    public static Point of(Member member) {
+        return new Point(member);
     }
 
-    public void payment(Long payPoint) {
+    public void payment(long payPoint) {
         this.amount -= payPoint;
     }
 
-    public void deposit(Long depositPoint) {
+    public void deposit(long depositPoint) {
         this.amount += depositPoint;
     }
 }