Refactor/pet

.gitignore

@@ -5,6 +5,9 @@ build/
 !**/src/main/**/build/
 !**/src/test/**/build/
 
+### log 파일 제외 ###
+/logs/
+
 ### STS ###
 .apt_generated
 .classpath

src/main/java/com/petmatz/api/global/ImageErrorApi.java

@@ -3,7 +3,7 @@
 import com.petmatz.api.global.dto.ImageErrorRequest;
 import com.petmatz.api.global.dto.ImgType;
 import com.petmatz.domain.pet.PetService;
-import com.petmatz.domain.user.service.UserService;
+//import com.petmatz.domain.user.service.UserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
@@ -17,7 +17,7 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/v1")
 public class ImageErrorApi {
-    private final UserService userService;
+//    private final UserService userService;
     private final PetService petService;
 
     @DeleteMapping("/image/error")
@@ -32,7 +32,7 @@ public ResponseEntity<String> UserImageErrorDeleteUser(@RequestBody ImageErrorRe
 
     private void selectService(ImgType type, Long UUID) {
         if (type.name().equals("U")) {
-            userService.deleteUser(UUID);
+//            userService.deleteUser(UUID);
         } else if (type.name().equals("P")) {
 
         } else if (type.name().equals("H")) {

src/main/java/com/petmatz/api/pet/PetController.java

@@ -2,22 +2,19 @@
 
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.global.dto.S3ImgDataResponse;
-import com.petmatz.api.pet.dto.PetApiRequest;
+import com.petmatz.api.pet.dto.PetRegisterNoRequest;
 import com.petmatz.api.pet.dto.PetInfoResponse;
 import com.petmatz.api.pet.dto.PetRequest;
 import com.petmatz.api.pet.dto.PetUpdateRequest;
 import com.petmatz.common.security.utils.JwtExtractProvider;
 import com.petmatz.domain.global.S3ImgDataInfo;
 import com.petmatz.domain.pet.PetService;
 import com.petmatz.domain.pet.dto.OpenApiPetInfo;
-import com.petmatz.domain.pet.dto.PetInf;
-import com.petmatz.domain.pet.dto.PetUpdateInfo;
-import com.petmatz.domain.user.component.UserReader;
 import com.petmatz.domain.user.component.UserService;
 import com.petmatz.domain.user.entity.User;
-import com.petmatz.domain.user.repository.UserRepository;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -36,9 +33,12 @@ public class PetController {
     // 동물등록번호 조회
     @PostMapping("/fetch")
     @Operation(summary = "동물등록번호 조회", description = "외부 API를 통해 동물등록번호 정보를 조회합니다.")
-    public Response<PetInfoResponse> fetchPetInfo(@RequestBody PetApiRequest request) {
-        PetInf serviceDto = PetApiRequest.toServiceDto(request);
-        OpenApiPetInfo openApiPetInfo = petService.fetchPetInfo(serviceDto.dogRegNo(), serviceDto.ownerNm());
+    @Parameters({
+            @Parameter(name = "dogRegNo", description = "강아지 고유 No", example = "1123412"),
+            @Parameter(name = "ownerNm", description = "사용자 이름", example = "홍길동"),
+    })
+    public Response<PetInfoResponse> fetchPetInfo(@RequestBody PetRegisterNoRequest request) {
+        OpenApiPetInfo openApiPetInfo = petService.fetchPetInfo(request.dogRegNo(), request.ownerNm());
         PetInfoResponse responseDto = PetInfoResponse.of(openApiPetInfo);
         return Response.success(responseDto);
     }
@@ -49,7 +49,7 @@ public Response<PetInfoResponse> fetchPetInfo(@RequestBody PetApiRequest request
     public Response<S3ImgDataResponse> registerPet(@RequestBody PetRequest request) throws MalformedURLException {
         Long userId = jwtExtractProvider.findIdFromJwt();
         User user = userService.findUser(userId);
-        S3ImgDataInfo petSaveInfo = petService.savePet(user, PetInf.of(request));
+        S3ImgDataInfo petSaveInfo = petService.savePet(user, request.of());
         return Response.success(S3ImgDataResponse.of(petSaveInfo));
     }
 
@@ -60,7 +60,7 @@ public Response<S3ImgDataResponse> registerPet(@RequestBody PetRequest request)
     public Response<S3ImgDataResponse> updatePet(@PathVariable Long id, @RequestBody PetUpdateRequest petUpdateRequest) throws MalformedURLException {
         Long userId = jwtExtractProvider.findIdFromJwt();
         User user = userService.findUser(userId);
-        S3ImgDataInfo petSaveInfo = petService.updatePet(id, user, PetUpdateInfo.of(petUpdateRequest));
+        S3ImgDataInfo petSaveInfo = petService.updatePet(id, user, petUpdateRequest.of());
         return Response.success(S3ImgDataResponse.of(petSaveInfo));
     }
 

src/main/java/com/petmatz/api/pet/dto/PetRegisterNoRequest.java

@@ -0,0 +1,9 @@
+package com.petmatz.api.pet.dto;
+
+public record PetRegisterNoRequest(
+        String dogRegNo,
+        String ownerNm
+) {
+
+}
+

src/main/java/com/petmatz/api/pet/dto/PetRequest.java

@@ -1,5 +1,7 @@
 package com.petmatz.api.pet.dto;
 
+import com.petmatz.domain.pet.dto.PetSaveInfo;
+
 public record PetRequest(
         Long id,
         String dogRegNo,
@@ -15,5 +17,24 @@ public record PetRequest(
         String profileImg,
         String comment
 ) {
+
+    public PetSaveInfo of() {
+        return PetSaveInfo.builder()
+                .id(id)
+                .dogRegNo(dogRegNo)
+                .ownerNm(ownerNm)
+                .petName(petName)
+                .breed(breed)
+                .gender(gender)
+                .neuterYn(neuterYn)
+                .size(size)
+                .age(age)
+                .temperament(temperament)
+                .preferredWalkingLocation(preferredWalkingLocation)
+                .profileImg(profileImg)
+                .comment(comment)
+                .build();
+    }
+
 }
 

src/main/java/com/petmatz/api/pet/dto/PetResponse.java

@@ -1,6 +1,5 @@
 package com.petmatz.api.pet.dto;
 
-import com.petmatz.domain.pet.dto.PetInf;
 import com.petmatz.domain.pet.entity.Pet;
 import com.petmatz.domain.sosboard.dto.SosBoardPet;
 
@@ -18,22 +17,6 @@ public record PetResponse(
         String preferredWalkingLocation,
         String comment
 ) {
-    public static PetResponse of(PetInf serviceDto) {
-        return new PetResponse(
-                serviceDto.id(), // ID 추가
-                serviceDto.dogRegNo(),
-                serviceDto.petName(),
-                serviceDto.gender(),
-                serviceDto.breed(),
-                serviceDto.neuterYn().equalsIgnoreCase("YES") ? "중성" : "미중성",
-                serviceDto.profileImg(),
-                serviceDto.age(),
-                serviceDto.temperament(),
-                serviceDto.size(),
-                serviceDto.preferredWalkingLocation(),
-                serviceDto.comment()
-        );
-    }
 
     public static PetResponse of(SosBoardPet dto) {
         return new PetResponse(

src/main/java/com/petmatz/api/pet/dto/PetUpdateRequest.java

@@ -2,6 +2,7 @@
 
 import com.petmatz.domain.pet.Gender;
 import com.petmatz.domain.pet.Size;
+import com.petmatz.domain.pet.dto.PetUpdateInfo;
 
 
 public record PetUpdateRequest(
@@ -17,4 +18,18 @@ public record PetUpdateRequest(
         String temperament
 
 ) {
+
+    public PetUpdateInfo of() {
+        return PetUpdateInfo.builder()
+                .age(age)
+                .breed(breed)
+                .comment(comment)
+                .gender(gender)
+                .neuterYn(neuterYn)
+                .petName(petName)
+                .profileImg(profileImg)
+                .size(size)
+                .temperament(temperament)
+                .build();
+    }
 }

src/main/java/com/petmatz/api/user/controller/AuthController.java

@@ -11,7 +11,6 @@
 import com.petmatz.domain.user.response.SignInResponseDto;
 import com.petmatz.domain.user.response.SignUpResponseDto;
 import com.petmatz.domain.user.service.AuthService;
-import com.petmatz.domain.user.service.UserService;
 import com.petmatz.user.common.LogInResponseDto;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;

src/main/java/com/petmatz/api/user/controller/PasswordController.java

@@ -3,13 +3,10 @@
 import com.petmatz.api.global.dto.Response;
 import com.petmatz.api.user.request.RepasswordRequestDto;
 import com.petmatz.api.user.request.SendRepasswordRequestDto;
-import com.petmatz.domain.user.component.PasswordService;
-import com.petmatz.domain.user.response.RepasswordResponseDto;
 import com.petmatz.domain.user.response.SendRepasswordResponseDto;
 import com.petmatz.domain.user.service.PasswordService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/petmatz/domain/pet/PetService.java

@@ -1,31 +1,17 @@
 package com.petmatz.domain.pet;
 
-import com.petmatz.domain.aws.AwsClient;
-import com.petmatz.domain.aws.vo.S3Imge;
 import com.petmatz.domain.global.S3ImgDataInfo;
 import com.petmatz.domain.pet.component.OpenApiPet;
 import com.petmatz.domain.pet.component.PetAppend;
 import com.petmatz.domain.pet.component.PetDelete;
 import com.petmatz.domain.pet.component.PetUpdater;
-import com.petmatz.domain.pet.dto.OpenApiPetInfo;
-import com.petmatz.domain.pet.dto.PetInf;
-import com.petmatz.domain.pet.dto.PetUpdateInfo;
-import com.petmatz.domain.pet.entity.Pet;
-import com.petmatz.domain.pet.exception.PetErrorCode;
-import com.petmatz.domain.pet.exception.PetServiceException;
-import com.petmatz.domain.pet.repository.PetRepository;
-import com.petmatz.domain.pet.utils.PetMapper;
+import com.petmatz.domain.pet.dto.*;
 import com.petmatz.domain.user.entity.User;
-import com.petmatz.domain.user.repository.UserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.net.MalformedURLException;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static com.petmatz.domain.pet.exception.PetErrorCode.PET_NOT_FOUND;
 
 @Service
 @RequiredArgsConstructor
@@ -49,8 +35,8 @@ public void deletePet(Long petId, User user) {
 
     // 펫 저장
     @Transactional
-    public S3ImgDataInfo savePet(User user, PetInf petInf) throws MalformedURLException {
-        return petAppend.savePet(user, petInf);
+    public S3ImgDataInfo savePet(User user, PetSaveInfo petSaveInfo) throws MalformedURLException {
+        return petAppend.savePet(user, petSaveInfo);
     }
 
     // 펫 업데이트

src/main/java/com/petmatz/domain/pet/component/PetAppend.java

@@ -3,7 +3,7 @@
 import com.petmatz.domain.aws.AwsClient;
 import com.petmatz.domain.aws.vo.S3Imge;
 import com.petmatz.domain.global.S3ImgDataInfo;
-import com.petmatz.domain.pet.dto.PetInf;
+import com.petmatz.domain.pet.dto.PetSaveInfo;
 import com.petmatz.domain.pet.entity.Pet;
 import com.petmatz.domain.pet.exception.PetErrorCode;
 import com.petmatz.domain.pet.exception.PetServiceException;
@@ -12,7 +12,6 @@
 import com.petmatz.domain.user.entity.User;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.net.MalformedURLException;
 
@@ -23,15 +22,15 @@ public class PetAppend {
     private final AwsClient awsClient;
     private final PetRepository petRepository;
 
-    public S3ImgDataInfo savePet(User user, PetInf petInf) throws MalformedURLException {
-        if (petRepository.existsByDogRegNo(petInf.dogRegNo())) {
+    public S3ImgDataInfo savePet(User user, PetSaveInfo petSaveInfo) throws MalformedURLException {
+        if (petRepository.existsByDogRegNo(petSaveInfo.dogRegNo())) {
             throw new PetServiceException(PetErrorCode.DOG_REG_NO_DUPLICATE);
         }
 
         //6-1 Img 정제
-        S3Imge petImg = awsClient.UploadImg(user.getAccountId(), petInf.profileImg(), "PET_IMG", petInf.dogRegNo());
+        S3Imge petImg = awsClient.UploadImg(user.getAccountId(), petSaveInfo.profileImg(), "PET_IMG", petSaveInfo.dogRegNo());
         //Pet Entity 생성
-        Pet pet = PetMapper.of(petInf, petImg.uploadURL(), user);
+        Pet pet = PetMapper.of(petSaveInfo, petImg.uploadURL(), user);
 
         //Pet 정보 저장
         Pet petEntity = petRepository.save(pet);

src/main/java/com/petmatz/domain/pet/component/PetDelete.java

@@ -18,7 +18,6 @@ public void deletePet(Long petId, User user) {
         perRepository.findByIdAndUser(petId, user)
                 .orElseThrow(() -> new PetServiceException(PET_NOT_FOUND));
         perRepository.deleteById(petId);
-//        repository.delete(pet);
     }
 
 }