refactor: 백신 도메인 리펙토링

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

@@ -2,6 +2,8 @@
 
 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;
@@ -13,7 +15,7 @@ public interface MemberRepository extends JpaRepository<Member, Long> {
 
     Optional<Member> findByPlatformId(String platformId);
 
-    default Member getById(long id){
+    default @NonNull Member getById(@NonNull Long id) {
         return findById(id).orElseThrow(MemberNotFoundException::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/vaccination/Vaccination.java

@@ -1,24 +1,25 @@
 package com.kau.capstone.entity.vaccination;
 
-import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.entity.pet.Pet;
+import com.kau.capstone.v1.vaccination.dto.CreateVaccinationRequest;
+import com.kau.capstone.v2.vaccination.dto.CreateVaccinationReqV2;
+import com.kau.capstone.v1.vaccination.dto.PutVaccinationRequest;
+import com.kau.capstone.v2.vaccination.dto.PutVaccinationReqV2;
 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.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Comment;
 
+import java.time.LocalDate;
+
 @Entity
 @Getter
-@Builder
-@AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Vaccination {
 
@@ -27,32 +28,48 @@ public class Vaccination {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @ManyToOne
-    @Comment("사용자 연결")
-    @JoinColumn(name = "member_id")
-    private Member member;
-
     @ManyToOne
     @Comment("반려동물 연결")
     @JoinColumn(name = "pet_id")
     private Pet pet;
 
-    @Comment("예바접종 이름")
+    @Comment("예방접종 이름")
     private String name;
 
-    @Comment("연도")
-    private Integer timeYear;
+    @Comment("접종시기")
+    private LocalDate vaccinatedAt;
 
-    @Comment("월")
-    private Integer timeMonth;
+    private Vaccination(Pet pet, String name, LocalDate vaccinatedAt) {
+        this.pet = pet;
+        this.name = name;
+        this.vaccinatedAt = vaccinatedAt;
+    }
 
-    @Comment("일")
-    private Integer timeDay;
+    @Deprecated
+    public static Vaccination of(Pet pet, CreateVaccinationRequest request) {
+        return new Vaccination(
+                pet,
+                request.name(),
+                LocalDate.of(request.year(), request.month(), request.day())
+        );
+    }
 
-    public void modify(String name, Integer year, Integer month, Integer day) {
-        this.name = name;
-        this.timeYear = year;
-        this.timeMonth = month;
-        this.timeDay = day;
+    public static Vaccination of(Pet pet, CreateVaccinationReqV2 request) {
+        return new Vaccination(
+            pet,
+            request.name(),
+            request.vaccinatedAt()
+        );
+    }
+
+    @Deprecated
+    public void modify(PutVaccinationRequest request) {
+        this.name = request.name();
+        this.vaccinatedAt = LocalDate.of(request.year(), request.month(), request.day());
+    }
+
+    public void modify(PutVaccinationReqV2 request) {
+        this.name = request.name();
+        this.vaccinatedAt = request.vaccinatedAt();
     }
 }

src/main/java/com/kau/capstone/entity/vaccination/repository/VaccinationRepository.java

@@ -2,14 +2,17 @@
 
 import com.kau.capstone.entity.pet.Pet;
 import com.kau.capstone.entity.vaccination.Vaccination;
+import com.kau.capstone.v2.vaccination.exception.VaccinationNotFoundExceptionV2;
+import lombok.NonNull;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
 public interface VaccinationRepository extends JpaRepository<Vaccination, Long> {
 
-    @Query("SELECT v FROM Vaccination v WHERE v.pet = :pet ORDER BY v.timeYear DESC, v.timeMonth DESC, v.timeDay DESC")
-    List<Vaccination> findAllByMemberAndPet(@Param("pet") Pet pet);
+    List<Vaccination> findAllByPetOrderByVaccinatedAtDesc(Pet pet);
+
+    default @NonNull Vaccination getById(@NonNull Long id) {
+        return findById(id).orElseThrow(VaccinationNotFoundExceptionV2::new);
+    }
 }

src/main/java/com/kau/capstone/v1/vaccination/controller/VaccinationController.java

@@ -27,7 +27,7 @@ public class VaccinationController implements VaccinationApi {
     public ResponseEntity<Void> createVaccinationInfoForPet(@LoginUser LoginInfo loginInfo,
                                                             @PathVariable Long petId,
                                                             @RequestBody CreateVaccinationRequest request) {
-        vaccinationService.createVaccinationInfo(loginInfo.memberId(), petId, request);
+        vaccinationService.createVaccinationInfo(petId, request);
 
         return ResponseEntity.status(HttpStatus.CREATED).build();
     }

src/main/java/com/kau/capstone/v1/vaccination/dto/OneVaccinationResponse.java

@@ -1,9 +1,7 @@
 package com.kau.capstone.v1.vaccination.dto;
 
 import com.kau.capstone.entity.vaccination.Vaccination;
-import lombok.Builder;
 
-@Builder
 public record OneVaccinationResponse(
         Long id,
         String name,
@@ -13,12 +11,12 @@ public record OneVaccinationResponse(
 ) {
 
     public static OneVaccinationResponse toResponse(Vaccination vaccination) {
-        return OneVaccinationResponse.builder()
-                .id(vaccination.getId())
-                .name(vaccination.getName())
-                .year(vaccination.getTimeYear())
-                .month(vaccination.getTimeMonth())
-                .day(vaccination.getTimeDay())
-                .build();
+        return new OneVaccinationResponse(
+                vaccination.getId(),
+                vaccination.getName(),
+                vaccination.getVaccinatedAt().getYear(),
+                vaccination.getVaccinatedAt().getMonthValue(),
+                vaccination.getVaccinatedAt().getDayOfMonth()
+        );
     }
 }

src/main/java/com/kau/capstone/v1/vaccination/dto/PetVaccinationResponse.java

@@ -1,16 +1,12 @@
 package com.kau.capstone.v1.vaccination.dto;
 
 import com.kau.capstone.entity.pet.Pet;
-import lombok.Builder;
 
-@Builder
 public record PetVaccinationResponse(
         String name
 ) {
 
     public static PetVaccinationResponse toResponse(Pet pet) {
-        return PetVaccinationResponse.builder()
-                .name(pet.getName())
-                .build();
+        return new PetVaccinationResponse(pet.getName());
     }
 }

src/main/java/com/kau/capstone/v1/vaccination/dto/VaccinationsResponse.java

@@ -2,11 +2,9 @@
 
 import com.kau.capstone.entity.pet.Pet;
 import com.kau.capstone.entity.vaccination.Vaccination;
-import lombok.Builder;
 
 import java.util.List;
 
-@Builder
 public record VaccinationsResponse(
         PetVaccinationResponse pet,
         List<OneVaccinationResponse> vaccination
@@ -18,9 +16,6 @@ public static VaccinationsResponse toResponse(Pet pet, List<Vaccination> vaccina
                 .map(OneVaccinationResponse::toResponse)
                 .toList();
 
-        return VaccinationsResponse.builder()
-                .pet(petResponse)
-                .vaccination(vaccinationResponses)
-                .build();
+        return new VaccinationsResponse(petResponse, vaccinationResponses);
     }
 }

src/main/java/com/kau/capstone/v1/vaccination/service/VaccinationService.java

@@ -1,6 +1,5 @@
 package com.kau.capstone.v1.vaccination.service;
 
-import com.kau.capstone.entity.member.Member;
 import com.kau.capstone.entity.member.repository.MemberRepository;
 import com.kau.capstone.entity.pet.Pet;
 import com.kau.capstone.v1.pet.exception.PetNotFoundException;
@@ -32,33 +31,24 @@ public VaccinationsResponse getVaccinationInfo(Long petId) {
         Pet pet = petRepository.findById(petId)
                 .orElseThrow(() -> new PetNotFoundException());
 
-        List<Vaccination> vaccinations = vaccinationRepository.findAllByMemberAndPet(pet);
+        List<Vaccination> vaccinations = vaccinationRepository.findAllByPetOrderByVaccinatedAtDesc(pet);
 
         return VaccinationsResponse.toResponse(pet, vaccinations);
     }
 
-    public void createVaccinationInfo(Long memberId, Long petId, CreateVaccinationRequest request) {
-        Member member = memberRepository.getById(memberId);
-
+    public void createVaccinationInfo(Long petId, CreateVaccinationRequest request) {
         Pet pet = petRepository.findById(petId)
                 .orElseThrow(() -> new PetNotFoundException());
 
-        Vaccination vaccination = Vaccination.builder()
-                .member(member)
-                .pet(pet)
-                .name(request.name())
-                .timeYear(request.year())
-                .timeMonth(request.month())
-                .timeDay(request.day())
-                .build();
+        Vaccination vaccination = Vaccination.of(pet, request);
         vaccinationRepository.save(vaccination);
     }
 
     public void putVaccinationInfo(Long vaccinationId, PutVaccinationRequest request) {
         Vaccination vaccination = vaccinationRepository.findById(vaccinationId)
                 .orElseThrow(() -> new VaccinationNotFoundException(VACCINATION_NOT_FOUND));
 
-        vaccination.modify(request.name(), request.year(), request.month(), request.day());
+        vaccination.modify(request);
     }
 
     public void deleteVaccinationInfo(Long vaccinationId) {

src/main/java/com/kau/capstone/v2/pet/exception/PetNotFoundException.java → src/main/java/com/kau/capstone/v2/pet/exception/PetNotFoundExceptionV2.java

@@ -3,11 +3,11 @@
 import com.kau.capstone._core.exception.ApiException;
 import org.springframework.http.HttpStatus;
 
-public class PetNotFoundException extends ApiException {
+public class PetNotFoundExceptionV2 extends ApiException {
 
     private static final String message = "반려동물 정보를 찾을 수 없습니다.";
 
-    public PetNotFoundException() {
+    public PetNotFoundExceptionV2() {
         super(HttpStatus.BAD_REQUEST, message);
     }
 }

src/main/java/com/kau/capstone/v2/pet/service/PetServiceV2.java

@@ -40,7 +40,7 @@ public void createPetInfo(LoginInfo loginInfo, PetRegistReqV2 petRegistReqV2) {
     @Transactional(readOnly = true)
     public PetResV2 getPetInfo(LoginInfo loginInfo, Long petId) {
         Member member = memberRepository.getById(loginInfo.memberId());
-        Pet pet = petRepository.getByIdAndDeletedAtIsNullAndMember(petId, member);
+        Pet pet = petRepository.getByIdAndMemberAndDeletedAtIsNull(petId, member);
         return PetResV2.toResponse(pet);
     }
 
@@ -54,15 +54,15 @@ public OwnedPetsResV2 getPetsInfo(LoginInfo loginInfo) {
     @Transactional
     public void updatePetInfo(LoginInfo loginInfo, Long petId, PetReqV2 petRequest) {
         Member member = memberRepository.getById(loginInfo.memberId());
-        Pet pet = petRepository.getByIdAndDeletedAtIsNullAndMember(petId, member);
+        Pet pet = petRepository.getByIdAndMemberAndDeletedAtIsNull(petId, member);
         pet.updatePetV2(petRequest);
         petRepository.save(pet);
     }
 
     @Transactional
     public void updatePetImage(LoginInfo loginInfo, Long petId, MultipartFile image) {
         Member member = memberRepository.getById(loginInfo.memberId());
-        Pet pet = petRepository.getByIdAndDeletedAtIsNullAndMember(petId, member);
+        Pet pet = petRepository.getByIdAndMemberAndDeletedAtIsNull(petId, member);
         String dirName = petId + "/profile";
         String url = fileService.uploadImage(image, dirName);
         pet.updateImageUrl(url);
@@ -72,7 +72,7 @@ public void updatePetImage(LoginInfo loginInfo, Long petId, MultipartFile image)
     @Transactional
     public void deletePet(LoginInfo loginInfo, Long petId) {
         Member member = memberRepository.getById(loginInfo.memberId());
-        Pet pet = petRepository.getByIdAndDeletedAtIsNullAndMember(petId, member);
+        Pet pet = petRepository.getByIdAndMemberAndDeletedAtIsNull(petId, member);
         pet.deletePet();
         petRepository.save(pet);
     }