Merge pull request #164 from PawWithU/feat/163-intermediary-get-api-m…

…odify [Feature] 이동봉사 모집자 봉사 관리 - 목록 조회 API 수정
PawWithU · May 1, 2024 · 2f5bd06 · 2f5bd06
2 parents c52e4d5 + 15a7bf7
commit 2f5bd06
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 46 deletions.
diff --git a/.../connectdog/domain/application/dto/response/ApplicationIntermediaryCompletedResponse.java b/.../connectdog/domain/application/dto/response/ApplicationIntermediaryCompletedResponse.java
@@ -1,15 +1,24 @@
 package com.pawwithu.connectdog.domain.application.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pawwithu.connectdog.domain.dog.entity.DogSize;
 
 import java.time.LocalDate;
 
 public record ApplicationIntermediaryCompletedResponse(Long postId, String mainImage, String dogName,
+                                                       String departureLoc, String arrivalLoc,
                                                        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                                        LocalDate startDate,
                                                        @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                                        LocalDate endDate,
-                                                       String departureLoc, String arrivalLoc,
-                                                       String volunteerName, Long applicationId,
-                                                       Long reviewId, Long dogStatusId) {
+                                                       String pickUpTime,
+                                                       String dogSize,
+                                                       Boolean isKennel,
+                                                       Long reviewId) {
+    public ApplicationIntermediaryCompletedResponse(Long postId, String mainImage, String dogName,
+                                                      String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
+                                                      String pickUpTime, DogSize dogSize, Boolean isKennel, Long reviewId) {
+        this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
+                dogSize.getKey(), isKennel, reviewId);
+    }
 }
diff --git a/...onnectdog/domain/application/dto/response/ApplicationIntermediaryProgressingResponse.java b/...onnectdog/domain/application/dto/response/ApplicationIntermediaryProgressingResponse.java
@@ -1,15 +1,26 @@
 package com.pawwithu.connectdog.domain.application.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pawwithu.connectdog.domain.dog.entity.DogSize;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 public record ApplicationIntermediaryProgressingResponse(Long postId, String mainImage, String dogName,
+                                                         String departureLoc, String arrivalLoc,
                                                          @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                                          LocalDate startDate,
                                                          @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                                          LocalDate endDate,
-                                                         String departureLoc, String arrivalLoc,
-                                                         String volunteerName,
+                                                         String pickUpTime,
+                                                         String dogSize,
+                                                         Boolean isKennel,
                                                          Long applicationId) {
-}
+
+    public ApplicationIntermediaryProgressingResponse(Long postId, String mainImage, String dogName,
+                                                  String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
+                                                  String pickUpTime, DogSize dogSize, Boolean isKennel, Long applicationId) {
+        this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
+                dogSize.getKey(), isKennel, applicationId);
+    }
+}
diff --git a/...hu/connectdog/domain/application/dto/response/ApplicationIntermediaryWaitingResponse.java b/...hu/connectdog/domain/application/dto/response/ApplicationIntermediaryWaitingResponse.java
@@ -2,18 +2,28 @@
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pawwithu.connectdog.domain.dog.entity.DogSize;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 public record ApplicationIntermediaryWaitingResponse(@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "Asia/Seoul")
                                                      LocalDateTime applicationTime,
                                                      Long postId, String mainImage, String dogName,
+                                                     String departureLoc, String arrivalLoc,
                                                      @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                                      LocalDate startDate,
                                                      @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                                      LocalDate endDate,
-                                                     String departureLoc, String arrivalLoc,
-                                                     String volunteerName,
+                                                     String pickUpTime,
+                                                     String dogSize,
+                                                     Boolean isKennel,
                                                      Long applicationId) {
+
+    public ApplicationIntermediaryWaitingResponse(LocalDateTime applicationTime, Long postId, String mainImage, String dogName,
+                                                  String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
+                                                  String pickUpTime, DogSize dogSize, Boolean isKennel, Long applicationId) {
+        this(applicationTime, postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
+                dogSize.getKey(), isKennel, applicationId);
+    }
 }
diff --git a/...wwithu/connectdog/domain/application/repository/impl/CustomApplicationRepositoryImpl.java b/...wwithu/connectdog/domain/application/repository/impl/CustomApplicationRepositoryImpl.java
@@ -95,13 +95,13 @@ public Optional<Application> findByIdAndIntermediaryIdAndStatusWithPost(Long app
     public List<ApplicationIntermediaryWaitingResponse> getIntermediaryWaitingApplications(Long intermediaryId, Pageable pageable) {
         return queryFactory
                 .select(Projections.constructor(ApplicationIntermediaryWaitingResponse.class,
-                        application.createdDate, post.id, postImage.image, dog.name, post.startDate, post.endDate,
-                        post.departureLoc, post.arrivalLoc, volunteer.name, application.id))
+                        application.createdDate, post.id, postImage.image, dog.name,
+                        post.departureLoc, post.arrivalLoc, post.startDate, post.endDate, post.pickUpTime,
+                        dog.size, post.isKennel, application.id))
                 .from(application)
                 .join(application.post, post)
                 .join(application.post.mainImage, postImage)
                 .join(application.post.dog, dog)
-                .join(application.volunteer, volunteer)
                 .where(application.status.eq(ApplicationStatus.WAITING)
                         .and(application.intermediary.id.eq(intermediaryId)))
                 .orderBy(application.createdDate.desc())    // 신청 최신순
@@ -114,13 +114,13 @@ public List<ApplicationIntermediaryWaitingResponse> getIntermediaryWaitingApplic
     public List<ApplicationIntermediaryProgressingResponse> getIntermediaryProgressingApplications(Long intermediaryId, Pageable pageable) {
         return queryFactory
                 .select(Projections.constructor(ApplicationIntermediaryProgressingResponse.class,
-                        post.id, postImage.image, dog.name, post.startDate, post.endDate,
-                        post.departureLoc, post.arrivalLoc, volunteer.name, application.id))
+                        post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
+                        post.startDate, post.endDate, post.pickUpTime,
+                        dog.size, post.isKennel, application.id))
                 .from(application)
                 .join(application.post, post)
                 .join(application.post.mainImage, postImage)
                 .join(application.post.dog, dog)
-                .join(application.volunteer, volunteer)
                 .where(application.status.eq(ApplicationStatus.PROGRESSING)
                         .and(application.intermediary.id.eq(intermediaryId)))
                 .orderBy(application.modifiedDate.desc())   // 신청 확정 최신순
@@ -153,13 +153,13 @@ public List<ApplicationVolunteerCompletedResponse> getVolunteerCompletedApplicat
     public List<ApplicationIntermediaryCompletedResponse> getIntermediaryCompletedApplications(Long intermediaryId, Pageable pageable) {
         return queryFactory
                 .select(Projections.constructor(ApplicationIntermediaryCompletedResponse.class,
-                        post.id, postImage.image, dog.name, post.startDate, post.endDate, post.departureLoc, post.arrivalLoc,
-                        volunteer.name, application.id, review.id, dogStatus.id))
+                        post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
+                        post.startDate, post.endDate, post.pickUpTime,
+                        dog.size, post.isKennel, review.id))
                 .from(application)
                 .join(application.post, post)
                 .join(application.post.mainImage, postImage)
                 .join(application.post.dog, dog)
-                .join(application.volunteer, volunteer)
                 .leftJoin(review).on(post.id.eq(review.post.id))
                 .leftJoin(dogStatus).on(post.id.eq(dogStatus.post.id))
                 .where(application.status.eq(ApplicationStatus.COMPLETED)

diff --git a/src/main/java/com/pawwithu/connectdog/domain/dog/entity/DogSize.java b/src/main/java/com/pawwithu/connectdog/domain/dog/entity/DogSize.java
@@ -13,7 +13,7 @@
 @RequiredArgsConstructor
 public enum DogSize {
 
-    SMALL("소형견"), MEDIUM("중형견"), LARGE("대형견");
+    SMALL("소형"), MEDIUM("중형"), LARGE("대형");
 
     @JsonCreator
     public static DogSize create(String requestValue) {

diff --git a/src/main/java/com/pawwithu/connectdog/domain/post/controller/PostController.java b/src/main/java/com/pawwithu/connectdog/domain/post/controller/PostController.java
@@ -90,8 +90,8 @@ public ResponseEntity<List<PostRecruitingGetResponse>> getRecruitingPosts(@Authe
         return ResponseEntity.ok(response);
     }
 
-    @Operation(summary = "봉사 관리 - 모집중, 모집 마감", description = "이동봉사 모집중, 모집 마감 목록을 조회합니다.",
-            responses = {@ApiResponse(responseCode = "200", description = "이동봉사 모집중, 모집 마감 목록 조회 성공")
+    @Operation(summary = "봉사 관리 - 공고 삭제", description = "이동봉사 공고를 삭제합니다.",
+            responses = {@ApiResponse(responseCode = "200", description = "이동봉사 공고 삭제 성공")
                     , @ApiResponse(responseCode = "400"
                     , description = "M2, 해당 이동봉사 중개를 찾을 수 없습니다. \t\n P2, 해당 공고를 찾을 수 없습니다."
                     , content = @Content(schema = @Schema(implementation = ErrorResponse.class)))

diff --git a/...main/java/com/pawwithu/connectdog/domain/post/dto/response/PostRecruitingGetResponse.java b/...main/java/com/pawwithu/connectdog/domain/post/dto/response/PostRecruitingGetResponse.java
@@ -1,21 +1,26 @@
 package com.pawwithu.connectdog.domain.post.dto.response;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.pawwithu.connectdog.domain.dog.entity.DogSize;
 import com.pawwithu.connectdog.domain.post.entity.PostStatus;
 
 import java.time.LocalDate;
 
 public record PostRecruitingGetResponse(Long postId, String postStatus, String mainImage, String dogName,
+                                        String departureLoc, String arrivalLoc,
                                         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                         LocalDate startDate,
                                         @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
                                         LocalDate endDate,
-                                        String departureLoc, String arrivalLoc,
-                                        String volunteerName) {
+                                        String pickUpTime,
+                                        String dogSize,
+                                        Boolean isKennel) {
 
     // 공고 이동봉사자 이름을 제외한 생성자
     public PostRecruitingGetResponse(Long postId, PostStatus postStatus, String mainImage, String dogName,
-                                     LocalDate startDate, LocalDate endDate, String departureLoc, String arrivalLoc) {
-        this(postId, postStatus.getKey(), mainImage, dogName, startDate, endDate, departureLoc, arrivalLoc, null);
+                                     String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
+                                     String pickUpTime, DogSize dogSize, Boolean isKennel) {
+        this(postId, postStatus.getKey(), mainImage, dogName, departureLoc, arrivalLoc,
+                startDate, endDate, pickUpTime, dogSize.getKey(), isKennel);
     }
 }
diff --git a/src/main/java/com/pawwithu/connectdog/domain/post/entity/PostStatus.java b/src/main/java/com/pawwithu/connectdog/domain/post/entity/PostStatus.java
@@ -13,7 +13,7 @@
 @RequiredArgsConstructor
 public enum PostStatus {
 
-    RECRUITING("모집중"), WAITING("승인 대기중"), PROGRESSING("진행중"), COMPLETED("봉사 완료"), EXPIRED("마감");
+    RECRUITING("모집중"), WAITING("승인 대기중"), PROGRESSING("진행중"), COMPLETED("봉사 완료"), EXPIRED("모집 마감");
 
     @JsonCreator
     public static PostStatus create(String requestValue) {

diff --git a/...in/java/com/pawwithu/connectdog/domain/post/repository/impl/CustomPostRepositoryImpl.java b/...in/java/com/pawwithu/connectdog/domain/post/repository/impl/CustomPostRepositoryImpl.java
@@ -101,8 +101,8 @@ public PostVolunteerGetOneResponse getVolunteerOnePost(Long postId) {
     public List<PostRecruitingGetResponse> getRecruitingPosts(Long intermediaryId, Pageable pageable) {
         return queryFactory
                 .select(Projections.constructor(PostRecruitingGetResponse.class,
-                        post.id, post.status, postImage.image, dog.name, post.startDate, post.endDate,
-                        post.departureLoc, post.arrivalLoc))
+                        post.id, post.status, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
+                        post.startDate, post.endDate, post.pickUpTime, dog.size, post.isKennel))
                 .from(post)
                 .join(post.mainImage, postImage)
                 .join(post.dog, dog)

diff --git a/...java/com/pawwithu/connectdog/domain/application/controller/ApplicationControllerTest.java b/...java/com/pawwithu/connectdog/domain/application/controller/ApplicationControllerTest.java
@@ -191,10 +191,10 @@ void setUp() {
         LocalDateTime applicationTime = LocalDateTime.of(2023, 11, 25, 12, 30);
         LocalDate startDate = LocalDate.of(2023, 10, 2);
         LocalDate endDate = LocalDate.of(2023, 11, 7);
-        response.add(new ApplicationIntermediaryWaitingResponse(applicationTime, 1L, "image1", "포포1", startDate, endDate,
-                "서울시 성북구", "서울시 중랑구", "하노정", 1L));
-        response.add(new ApplicationIntermediaryWaitingResponse(applicationTime, 2L, "image2", "포포2", startDate, endDate,
-                "서울시 성북구", "서울시 중랑구", "민경혁", 2L));
+        response.add(new ApplicationIntermediaryWaitingResponse(applicationTime, 1L, "image1", "포포1", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 1L));
+        response.add(new ApplicationIntermediaryWaitingResponse(applicationTime, 2L, "image1", "포포1", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 2L));
 
 
         //when
@@ -215,10 +215,11 @@ void setUp() {
         List<ApplicationIntermediaryProgressingResponse> response = new ArrayList<>();
         LocalDate startDate = LocalDate.of(2023, 10, 2);
         LocalDate endDate = LocalDate.of(2023, 11, 7);
-        response.add(new ApplicationIntermediaryProgressingResponse(1L, "image1", "포포1", startDate, endDate,
-                "서울시 성북구", "서울시 중랑구", "하노정", 1L));
-        response.add(new ApplicationIntermediaryProgressingResponse(2L, "image2", "포포2", startDate, endDate,
-                "서울시 성북구", "서울시 중랑구", "민경혁", 2L));
+        response.add(new ApplicationIntermediaryProgressingResponse(1L, "image1", "포포1", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 1L));
+        response.add(new ApplicationIntermediaryProgressingResponse(2L, "image1", "포포1", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 2L));
+
 
 
         //when
@@ -241,7 +242,7 @@ void setUp() {
         response.add(new ApplicationVolunteerCompletedResponse(1L, "image1", "잔디", "서울시 성북구", "서울시 중랑구",
                 startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 1L));
         response.add(new ApplicationVolunteerCompletedResponse(2L, "image1", "잔디", "서울시 성북구", "서울시 중랑구",
-                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 1L));
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 2L));
 
         //when
         given(applicationService.getVolunteerCompletedApplications(anyString(), any())).willReturn(response);
@@ -260,12 +261,10 @@ void setUp() {
         List<ApplicationIntermediaryCompletedResponse> response = new ArrayList<>();
         LocalDate startDate = LocalDate.of(2023, 10, 2);
         LocalDate endDate = LocalDate.of(2023, 11, 7);
-        response.add(new ApplicationIntermediaryCompletedResponse(1L, "image1", "포포",
-                startDate, endDate, "이동봉사 중개", "서울시 성북구", "서울시 중랑구",
-                1L, 1L, null));
-        response.add(new ApplicationIntermediaryCompletedResponse(2L, "image1", "포포",
-                startDate, endDate, "이동봉사 중개", "서울시 성북구", "서울시 중랑구",
-                1L, 1L, null));
+        response.add(new ApplicationIntermediaryCompletedResponse(1L, "image1", "잔디", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 1L));
+        response.add(new ApplicationIntermediaryCompletedResponse(2L, "image1", "잔디", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true, 2L));
 
         //when
         given(applicationService.getIntermediaryCompletedApplications(anyString(), any())).willReturn(response);

diff --git a/src/test/java/com/pawwithu/connectdog/domain/post/controller/PostControllerTest.java b/src/test/java/com/pawwithu/connectdog/domain/post/controller/PostControllerTest.java
@@ -174,10 +174,10 @@ void setUp() {
         List<PostRecruitingGetResponse> response = new ArrayList<>();
         LocalDate startDate = LocalDate.of(2023, 10, 2);
         LocalDate endDate = LocalDate.of(2023, 11, 7);
-        response.add(new PostRecruitingGetResponse(1L, PostStatus.RECRUITING, "image1", "포포1", startDate, endDate,
-                "서울시 성북구", "서울시 중랑구"));
-        response.add(new PostRecruitingGetResponse(2L, PostStatus.EXPIRED, "image2", "포포2", startDate, endDate,
-                "서울시 성북구", "서울시 중랑구"));
+        response.add(new PostRecruitingGetResponse(1L, PostStatus.RECRUITING.getKey(), "image1", "잔디", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true));
+        response.add(new PostRecruitingGetResponse(2L, PostStatus.RECRUITING.getKey(), "image1", "잔디", "서울시 성북구", "서울시 중랑구",
+                startDate, endDate, "13:00", DogSize.MEDIUM.getKey(), true));
 
 
         //when