test: 배포 환경 테스트

anifriends · Apr 1, 2024 · cba4dc0 · cba4dc0
1 parent c110dd6
commit cba4dc0
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 7 deletions.
diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
@@ -2,7 +2,7 @@ name: CD
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "dev", "main", "test/find-animals" ]
 
 jobs:
   build:
@@ -45,14 +45,14 @@ jobs:
           aws-region: ap-northeast-2
 
       - name: Upload to S3
-        run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://team07-bucket/anifriends/$GITHUB_SHA.zip
+        run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://anifriends-s3/deploy/$GITHUB_SHA.zip
 
       - name: Deploy
         run: |
           aws deploy create-deployment \
-          --application-name team07-deploy \
+          --application-name anifriends \
           --deployment-config-name CodeDeployDefault.AllAtOnce \
-          --deployment-group-name team07 \
+          --deployment-group-name anifriends \
           --file-exists-behavior OVERWRITE \
-          --s3-location bucket=team07-bucket,bundleType=zip,key=anifriends/$GITHUB_SHA.zip \
+          --s3-location bucket=anifriends-s3,bundleType=zip,key=deploy/$GITHUB_SHA.zip \
           --region ap-northeast-2 \
diff --git a/src/main/java/com/clova/anifriends/domain/animal/controller/AnimalController.java b/src/main/java/com/clova/anifriends/domain/animal/controller/AnimalController.java
@@ -88,6 +88,22 @@ public ResponseEntity<FindAnimalsResponse> findAnimals(
         ));
     }
 
+    @GetMapping("/v1/animals")
+    public ResponseEntity<FindAnimalsResponse> findAnimalsV1_1(
+        Pageable pageable,
+        @ModelAttribute FindAnimalsRequest findAnimalsRequest
+    ) {
+        return ResponseEntity.ok(animalService.findAnimalsV1_1(
+            findAnimalsRequest.type(),
+            findAnimalsRequest.active(),
+            findAnimalsRequest.neuteredFilter(),
+            findAnimalsRequest.age(),
+            findAnimalsRequest.gender(),
+            findAnimalsRequest.animalSize(),
+            pageable
+        ));
+    }
+
     @GetMapping("/v2/animals")
     public ResponseEntity<FindAnimalsResponse> findAnimalsV2(
         Pageable pageable,

diff --git a/src/main/java/com/clova/anifriends/domain/animal/mapper/AnimalMapper.java b/src/main/java/com/clova/anifriends/domain/animal/mapper/AnimalMapper.java
@@ -2,9 +2,15 @@
 
 import com.clova.anifriends.domain.animal.Animal;
 import com.clova.anifriends.domain.animal.dto.request.RegisterAnimalRequest;
+import com.clova.anifriends.domain.animal.dto.response.FindAnimalsResponse;
+import com.clova.anifriends.domain.animal.dto.response.FindAnimalsResponse.FindAnimalResponse;
+import com.clova.anifriends.domain.animal.repository.response.FindAnimalsResult;
+import com.clova.anifriends.domain.common.PageInfo;
 import com.clova.anifriends.domain.shelter.Shelter;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
+import org.springframework.data.domain.Page;
 
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public final class AnimalMapper {
@@ -23,4 +29,10 @@ public static Animal toAnimal(Shelter shelter, RegisterAnimalRequest registerAni
             registerAnimalRequest.information(),
             registerAnimalRequest.imageUrls());
     }
+
+    public static FindAnimalsResponse resultToResponse(Page<FindAnimalsResult> animapPage) {
+        PageInfo pageInfo = PageInfo.of(animapPage.getTotalElements(), animapPage.hasNext());
+        List<FindAnimalResponse> content = animapPage.map(FindAnimalResponse::from).getContent();
+        return new FindAnimalsResponse(pageInfo, content);
+    }
 }
diff --git a/src/main/java/com/clova/anifriends/domain/animal/repository/AnimalRepositoryImpl.java b/src/main/java/com/clova/anifriends/domain/animal/repository/AnimalRepositoryImpl.java
@@ -92,7 +92,6 @@ public Page<Animal> findAnimals(
     ) {
         List<Animal> animals = query.selectFrom(animal)
             .join(animal.shelter).fetchJoin()
-            .leftJoin(animal.shelter.image).fetchJoin()
             .where(
                 animalTypeContains(type),
                 animalActiveContains(active),

diff --git a/src/main/java/com/clova/anifriends/domain/animal/service/AnimalService.java b/src/main/java/com/clova/anifriends/domain/animal/service/AnimalService.java
@@ -106,6 +106,27 @@ public FindAnimalsResponse findAnimals(
         return FindAnimalsResponse.from(animalsWithPagination);
     }
 
+    @Transactional(readOnly = true)
+    public FindAnimalsResponse findAnimalsV1_1(
+        AnimalType type,
+        AnimalActive active,
+        AnimalNeuteredFilter neuteredFilter,
+        AnimalAge age,
+        AnimalGender gender,
+        AnimalSize size,
+        Pageable pageable) {
+        Page<FindAnimalsResult> animapPage = animalRepository.findAnimalsV1_1(
+            type,
+            active,
+            neuteredFilter,
+            age,
+            gender,
+            size,
+            pageable
+        );
+        return AnimalMapper.resultToResponse(animapPage);
+    }
+
     @Transactional(readOnly = true)
     public FindAnimalsResponse findAnimalsV2(
         AnimalType type,

diff --git a/src/main/resources/backend-config b/src/main/resources/backend-config