Merge pull request #78 from GDSC-KNU/develop

merge the develop branch into the main branch.
GDG-on-Campus-KNU · Feb 25, 2024 · f817708 · f817708
2 parents 6d75b45 + 7850bbf
commit f817708
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/src/main/java/com/gdsc/pikpet/controller/UserAccountController.java b/src/main/java/com/gdsc/pikpet/controller/UserAccountController.java
@@ -3,6 +3,7 @@
 
 import com.gdsc.pikpet.config.security.UserSecurityDto;
 import com.gdsc.pikpet.dto.UserLikeResponse;
+import com.gdsc.pikpet.dto.response.AnimalDetailResponseDto;
 import com.gdsc.pikpet.service.UserAccountService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -12,6 +13,8 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/userInfo")
 @RequiredArgsConstructor
@@ -44,7 +47,8 @@ public ResponseEntity<UserLikeResponse> likeAnimal(
     //TODO: fixMe: 좋아하는 "동물" 조회하도록 변경해야함
     @GetMapping("/likeAnimal")
     public ResponseEntity<?> getLikeAnimal(Authentication authentication) {
-        return ResponseEntity.ok().body(userAccountService.getLikeAnimal((UserSecurityDto) authentication.getPrincipal()));
+        List<AnimalDetailResponseDto> likeAnimals = userAccountService.getLikeAnimal((UserSecurityDto) authentication.getPrincipal());
+        return ResponseEntity.ok().body(likeAnimals);
     }
 
     @GetMapping("/application/{animalId}")

diff --git a/src/main/java/com/gdsc/pikpet/dto/response/AnimalDetailResponseDto.java b/src/main/java/com/gdsc/pikpet/dto/response/AnimalDetailResponseDto.java
@@ -50,4 +50,25 @@ public static AnimalDetailResponseDto from(Animal animal, Boolean isLiked) {
                 isLiked
         );
     }
+    public static AnimalDetailResponseDto from(UserLike userLike) {
+        return new AnimalDetailResponseDto(
+                userLike.getAnimal().getId(),
+                userLike.getAnimal().getImageUrl(),
+                userLike.getAnimal().getSpecies(),
+                userLike.getAnimal().getGender(),
+                userLike.getAnimal().getSize(),
+                userLike.getAnimal().getDisease(),
+                userLike.getAnimal().getShelter(),
+                userLike.getAnimal().isNeutralized(),
+                userLike.getAnimal().isCheckUp(),
+                userLike.getAnimal().getCaptureDate(),
+                userLike.getAnimal().getEnthanasiaDate(),
+                userLike.getAnimal().getAnimalColors().stream()
+                        .map(AnimalColor::getColor)
+                        .toList(),
+                userLike.getAnimal().getAge(),
+                userLike.getAnimal().getBreed(),
+                true
+        );
+    }
 }
diff --git a/src/main/java/com/gdsc/pikpet/service/UserAccountService.java b/src/main/java/com/gdsc/pikpet/service/UserAccountService.java
@@ -2,6 +2,7 @@
 
 import com.gdsc.pikpet.config.security.UserSecurityDto;
 import com.gdsc.pikpet.dto.UserLikeResponse;
+import com.gdsc.pikpet.dto.response.AnimalDetailResponseDto;
 import com.gdsc.pikpet.entity.animal.Animal;
 import com.gdsc.pikpet.entity.Application;
 import com.gdsc.pikpet.entity.UserAccount;
@@ -47,9 +48,9 @@ public UserLikeResponse addlikeAnimal(UserSecurityDto userSecurityDto, Long anim
     }
 
     @Transactional(readOnly = true)
-    public List<UserLike> getLikeAnimal(UserSecurityDto userSecurityDto) {
+    public List<AnimalDetailResponseDto> getLikeAnimal(UserSecurityDto userSecurityDto) {
         UserAccount userAccount = getUserAccount(userSecurityDto);
-        return likeRepository.findAllByUserAccount(userAccount);
+        return likeRepository.findAllByUserAccount(userAccount).stream().map(AnimalDetailResponseDto::from).toList();
     }
 
     @Transactional