From 875055e446358f6bbf54dd329b1406bff3236e60 Mon Sep 17 00:00:00 2001 From: dl-00-e8 Date: Sun, 12 May 2024 14:23:26 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[#128]=20refactor:=20=EB=AF=B8=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=20=ED=8C=8C=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/domain/post/controller/PostController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/gongjakso/server/domain/post/controller/PostController.java b/src/main/java/com/gongjakso/server/domain/post/controller/PostController.java index 3e2a0c2a..a4cf87a8 100644 --- a/src/main/java/com/gongjakso/server/domain/post/controller/PostController.java +++ b/src/main/java/com/gongjakso/server/domain/post/controller/PostController.java @@ -1,6 +1,5 @@ package com.gongjakso.server.domain.post.controller; -import com.gongjakso.server.domain.apply.service.ApplyService; import com.gongjakso.server.domain.post.dto.*; import com.gongjakso.server.domain.post.service.PostService; import com.gongjakso.server.global.common.ApplicationResponse; @@ -23,7 +22,6 @@ public class PostController { private final PostService postService; - private final ApplyService applyService; @Operation(summary = "공모전/프로젝트 공고 생성 API", description = "팀빌딩 페이지에서 정보 입력 후 공고 생성") @PostMapping("") @@ -33,7 +31,7 @@ public ApplicationResponse create(@AuthenticationPrincipal PrincipalDet @Operation(summary = "사용자 별 상세 조회 API", description = "사용자별로 공고 상세 조회 다르게 반환") @GetMapping("/read") - public ApplicationResponse read(@AuthenticationPrincipal PrincipalDetails principalDetails, @RequestParam(value = "id", required = true) Long postId, @RequestParam(value = "role", required = false) String role ) { + public ApplicationResponse read(@AuthenticationPrincipal PrincipalDetails principalDetails, @RequestParam(value = "id") Long postId, @RequestParam(value = "role", required = false) String role ) { return ApplicationResponse.ok(postService.read(principalDetails, postId, role)); } From b56896b2024167b5d02b03f085eb704501270d3f Mon Sep 17 00:00:00 2001 From: dl-00-e8 Date: Sat, 18 May 2024 15:11:34 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[#128]=20fix:=20=ED=99=9C=EB=8F=99=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=EB=8F=84=20=ED=8F=AC=ED=95=A8=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20filter=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gongjakso/server/domain/apply/service/ApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java b/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java index d3ca1da0..9b26ff54 100644 --- a/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java +++ b/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java @@ -184,7 +184,7 @@ public ParticipationPageRes myParticipationPostListPage(Member member,int page, Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt")); Page participationPage = applyRepository.findApplyByApplyTypeAndMember(ApplyType.PASS,member,pageable); List participationLists = participationPage.getContent().stream() - .filter(apply -> apply.getPost().getStatus().equals(PostStatus.ACTIVE)) + .filter(apply -> apply.getPost().getStatus().equals(PostStatus.ACTIVE) || apply.getPost().getStatus().equals(PostStatus.COMPLETE)) .map(apply -> ParticipationList.of(apply.getPost(), CategoryType.valueOf(apply.getRecruit_part()))) .collect(Collectors.toList()); int pageNo = participationPage.getNumber(); From 5ed927b7be9e2432c2a6a258c8b23a7861c7b306 Mon Sep 17 00:00:00 2001 From: dl-00-e8 Date: Sat, 18 May 2024 15:11:50 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[#128]=20fix:=20=ED=99=9C=EB=8F=99=20?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=20=EC=83=81=ED=83=9C=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=9C=20string=20=EA=B0=92=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gongjakso/server/domain/post/enumerate/PostStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/gongjakso/server/domain/post/enumerate/PostStatus.java b/src/main/java/com/gongjakso/server/domain/post/enumerate/PostStatus.java index 26d479b7..fc20ec47 100644 --- a/src/main/java/com/gongjakso/server/domain/post/enumerate/PostStatus.java +++ b/src/main/java/com/gongjakso/server/domain/post/enumerate/PostStatus.java @@ -11,7 +11,7 @@ public enum PostStatus { CANCEL("모집 취소"), CLOSE("모집 마감"), ACTIVE("활동 중"), - COMPLETE("모집 완료"), + COMPLETE("활동 완료"), EXTENSION("모집 연장"); private final String status; From bce13a409a48bc658ecb42958a3f4ff7721f7490 Mon Sep 17 00:00:00 2001 From: dl-00-e8 Date: Sat, 18 May 2024 15:22:06 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[#128]=20fix:=20=ED=99=9C=EB=8F=99=20?= =?UTF-8?q?=EC=A4=91/=ED=99=9C=EB=8F=99=20=EC=99=84=EB=A3=8C=EC=9D=B8=20?= =?UTF-8?q?=EA=B3=B5=EA=B3=A0=EB=93=A4=EC=97=90=20=EB=8C=80=ED=95=B4?= =?UTF-8?q?=EC=84=9C=EB=A7=8C=20=EB=B0=98=ED=99=98=ED=95=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/domain/apply/repository/ApplyRepository.java | 2 +- .../com/gongjakso/server/domain/apply/service/ApplyService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java b/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java index 6c150ce9..1a71c1ae 100644 --- a/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java +++ b/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java @@ -21,7 +21,7 @@ public interface ApplyRepository extends JpaRepository { Page findAllByPost(Post post, Pageable pageable); - Page findApplyByApplyTypeAndMember(ApplyType applyType, Member member, Pageable pageable); + Page findApplyByApplyTypeAndMemberAndIsCanceledFalse(ApplyType applyType, Member member, Pageable pageable); List findAllByMemberAndDeletedAtIsNull(Member member); diff --git a/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java b/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java index 9b26ff54..cc827599 100644 --- a/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java +++ b/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java @@ -182,7 +182,7 @@ public ApplyPageRes applyListPage(Member member, long postId, int page, int size public ParticipationPageRes myParticipationPostListPage(Member member,int page, int size) { Pageable pageable = PageRequest.of(page, size, Sort.by(Sort.Direction.DESC, "createdAt")); - Page participationPage = applyRepository.findApplyByApplyTypeAndMember(ApplyType.PASS,member,pageable); + Page participationPage = applyRepository.findApplyByApplyTypeAndMemberAndIsCanceledFalse(ApplyType.PASS,member,pageable); List participationLists = participationPage.getContent().stream() .filter(apply -> apply.getPost().getStatus().equals(PostStatus.ACTIVE) || apply.getPost().getStatus().equals(PostStatus.COMPLETE)) .map(apply -> ParticipationList.of(apply.getPost(), CategoryType.valueOf(apply.getRecruit_part()))) From 6f6fbcb2ebd679b827f45fb7dab9b7019d6f4fde Mon Sep 17 00:00:00 2001 From: dl-00-e8 Date: Sat, 18 May 2024 15:28:31 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[#128]=20fix:=20=EC=A0=95=EB=A0=AC=20?= =?UTF-8?q?=EA=B8=B0=EC=A4=80=EC=9D=84=20=EC=83=9D=EC=84=B1=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=81=20=EA=B8=B0=EC=A4=80=20=EB=82=B4=EB=A6=BC=EC=B0=A8?= =?UTF-8?q?=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apply/repository/ApplyRepository.java | 2 +- .../domain/apply/service/ApplyService.java | 2 +- .../post/repository/PostRepository.java | 2 +- .../domain/post/service/PostService.java | 23 ++++++++----------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java b/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java index 1a71c1ae..c787632c 100644 --- a/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java +++ b/src/main/java/com/gongjakso/server/domain/apply/repository/ApplyRepository.java @@ -23,7 +23,7 @@ public interface ApplyRepository extends JpaRepository { Page findApplyByApplyTypeAndMemberAndIsCanceledFalse(ApplyType applyType, Member member, Pageable pageable); - List findAllByMemberAndDeletedAtIsNull(Member member); + List findAllByMemberAndDeletedAtIsNullOrderByCreatedAtDesc(Member member); Apply findApplyByMemberAndPost(Member member,Post post); diff --git a/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java b/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java index cc827599..556d1ba5 100644 --- a/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java +++ b/src/main/java/com/gongjakso/server/domain/apply/service/ApplyService.java @@ -262,7 +262,7 @@ public List getMyApplyList(Member member) { // Validation // Business Logic - List applyList = applyRepository.findAllByMemberAndDeletedAtIsNull(member); + List applyList = applyRepository.findAllByMemberAndDeletedAtIsNullOrderByCreatedAtDesc(member); // Response diff --git a/src/main/java/com/gongjakso/server/domain/post/repository/PostRepository.java b/src/main/java/com/gongjakso/server/domain/post/repository/PostRepository.java index b225b9fd..9dcdfadf 100644 --- a/src/main/java/com/gongjakso/server/domain/post/repository/PostRepository.java +++ b/src/main/java/com/gongjakso/server/domain/post/repository/PostRepository.java @@ -130,5 +130,5 @@ public interface PostRepository extends JpaRepository { Page findAllPostsJoinedWithStackNamesByTitleContainsAndPostTypeTrueAndDeletedAtIsNullAndFinishDateAfterAndStatusAndMeetingCityContainsAndMeetingTownContainsAndStackNamesStackNameTypeContainsOrderByScrapCountDescPostIdDesc (@Param("searchWord") String searchWord, @Param("currentTimestamp") LocalDateTime currentTimestamp, @Param("status") PostStatus status, @Param("meetingCity") String meetingCity, @Param("meetingTown") String meetingTown, @Param("stackNameType") String stackNameType,Pageable pageable); - List findAllByMemberAndStatusAndDeletedAtIsNull(Member member, PostStatus status); + List findAllByMemberAndStatusAndDeletedAtIsNullOrderByCreatedAtDesc(Member member, PostStatus status); } diff --git a/src/main/java/com/gongjakso/server/domain/post/service/PostService.java b/src/main/java/com/gongjakso/server/domain/post/service/PostService.java index 4b6bdc1f..301b5546 100644 --- a/src/main/java/com/gongjakso/server/domain/post/service/PostService.java +++ b/src/main/java/com/gongjakso/server/domain/post/service/PostService.java @@ -17,10 +17,7 @@ import com.gongjakso.server.global.security.PrincipalDetails; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -144,7 +141,7 @@ public PostDeleteRes delete(Member member, Long id) { */ @Transactional public Page getContests(String sort, Pageable page) throws ApplicationException { - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); Page posts; if(sort.equals("createdAt")){ //최신순 posts = postRepository.findAllByPostTypeFalseAndDeletedAtIsNullAndFinishDateAfterAndStatusOrderByPostIdDesc(LocalDateTime.now(), RECRUITING, pageable); @@ -162,7 +159,7 @@ public Page getContests(String sort, Pageable page) throws Applic */ @Transactional public Page getContestsBySearchWord(String sort, String searchWord, Pageable page) throws ApplicationException { - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); Page posts; if (sort.equals("createdAt")) { posts = postRepository.findAllByTitleContainsAndPostTypeFalseAndDeletedAtIsNullAndFinishDateAfterAndStatusOrderByPostIdDesc(searchWord.toLowerCase(), LocalDateTime.now(), RECRUITING, pageable); @@ -181,7 +178,7 @@ public Page getContestsBySearchWord(String sort, String searchWor @Transactional public Page getContestsByMeetingAreaAndCategoryAndSearchWord( String sort, String meetingCity, String meetingTown, String category, String searchWord, Pageable page) throws ApplicationException { - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); if(meetingTown.equals("전체")){ meetingTown = ""; } @@ -216,7 +213,7 @@ public Page getContestsByMeetingAreaAndCategoryAndSearchWord( */ @Transactional public Page getProjects(String sort, Pageable page) throws ApplicationException { - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); Page posts; if(sort.equals("createdAt")){ //최신순 posts = postRepository.findAllByPostTypeTrueAndDeletedAtIsNullAndFinishDateAfterAndStatusOrderByPostIdDesc(LocalDateTime.now(), RECRUITING, pageable); @@ -233,7 +230,7 @@ public Page getProjects(String sort, Pageable page) throws Applic */ @Transactional public Page getProjectsBySearchWord(String sort, String searchWord, Pageable page) throws ApplicationException { - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); Page posts; if (sort.equals("createdAt")) { posts = postRepository.findAllByTitleContainsAndPostTypeTrueAndDeletedAtIsNullAndFinishDateAfterAndStatusOrderByPostIdDesc(searchWord.toLowerCase(), LocalDateTime.now(), RECRUITING, pageable); @@ -251,7 +248,7 @@ public Page getProjectsBySearchWord(String sort, String searchWor @Transactional public Page getProjectsByMeetingAreaAndStackNameAndSearchWord( String sort, String meetingCity, String meetingTown, String stackName, String searchWord, Pageable page) throws ApplicationException { - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); if(meetingTown.equals("전체")){ meetingTown = ""; } @@ -338,7 +335,7 @@ public List getMyPostList(Member member) { // Validation // Business Logic - List postList = postRepository.findAllByMemberAndStatusAndDeletedAtIsNull(member, RECRUITING); + List postList = postRepository.findAllByMemberAndStatusAndDeletedAtIsNullOrderByCreatedAtDesc(member, RECRUITING); // Return return postList.stream() @@ -374,7 +371,7 @@ public GetPostRelation checkPostRelation(Member member, Long postId) { @Transactional public Page getMyScrapProject(Member member, Pageable page){ - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); Page scrapPageList = postScrapRepository.findAllByMemberAndScrapStatusTrueOrderByPostScrapIdDesc(member, pageable); @@ -401,7 +398,7 @@ public Page getMyScrapProject(Member member, Pageable page){ @Transactional public Page getMyScrapContest(Member member, Pageable page){ - Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize()); + Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize(), Sort.by(Sort.Order.desc("created_at"))); Page scrapPageList = postScrapRepository.findAllByMemberAndScrapStatusTrueOrderByPostScrapIdDesc(member, pageable);