Merge pull request #155 from Gongjakso/test/post-pagination

test: 스크랩 관련 Domain, Service 유닛 테스트 코드 작성
Gongjakso · May 28, 2024 · 87cc9ce · 87cc9ce
2 parents 6ef5fff + 8af601f
commit 87cc9ce
Show file tree

Hide file tree

Showing 15 changed files with 564 additions and 45 deletions.
diff --git a/src/main/java/com/gongjakso/server/domain/apply/controller/ApplyController.java b/src/main/java/com/gongjakso/server/domain/apply/controller/ApplyController.java
@@ -15,8 +15,6 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/v1/apply")

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
@@ -18,7 +18,6 @@
 import com.gongjakso.server.domain.post.repository.StackNameRepository;
 import com.gongjakso.server.global.exception.ApplicationException;
 import com.gongjakso.server.global.exception.ErrorCode;
-// import com.gongjakso.server.global.util.email.EmailClient;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;

diff --git a/src/main/java/com/gongjakso/server/domain/member/entity/Member.java b/src/main/java/com/gongjakso/server/domain/member/entity/Member.java
@@ -77,4 +77,18 @@ public Member(String email, String password, String name, String phone, String p
         this.major = major;
         this.job = job;
     }
+
+    public Member(Long id, String email, String password, String name, String phone, String profileUrl, String memberType, String loginType, String status, String major, String job){
+        this.memberId = id;
+        this.email = email;
+        this.password = password;
+        this.name = name;
+        this.phone = phone;
+        this.profileUrl = profileUrl;
+        this.memberType = MemberType.valueOf(memberType);
+        this.loginType = LoginType.valueOf(loginType);
+        this.status = status;
+        this.major = major;
+        this.job = job;
+    }
 }
diff --git a/src/main/java/com/gongjakso/server/domain/post/entity/Post.java b/src/main/java/com/gongjakso/server/domain/post/entity/Post.java
@@ -145,4 +145,31 @@ public void updatePostView(Long postView) {
     public void updateStatus(PostStatus status) {
         this.status = status;
     }
+
+    @Builder
+    public Post(Long id, String title, Member member, String contents, String contestLink, LocalDateTime startDate,
+                LocalDateTime endDate, LocalDateTime finishDate, Long maxPerson, MeetingMethod meetingMethod,
+                String meetingCity, String meetingTown, boolean questionMethod, String questionLink, boolean postType,
+                List<StackName> stackNames, List<Category> categories) {
+        this.postId = id;
+        this.title = title;
+        this.member = member;
+        this.contents = contents;
+        this.contestLink = contestLink;
+        this.status = PostStatus.RECRUITING;
+        this.startDate = startDate;
+        this.finishDate = finishDate;
+        this.endDate = endDate;
+        this.maxPerson = maxPerson;
+        this.meetingMethod = meetingMethod;
+        this.meetingCity = meetingCity;
+        this.meetingTown = meetingTown;
+        this.questionMethod = questionMethod;
+        this.questionLink = questionLink;
+        this.postType = postType;
+        this.daysRemaining = finishDate.isBefore(LocalDateTime.now()) ? -1 : ChronoUnit.DAYS.between(LocalDateTime.now(), finishDate);
+        this.stackNames = stackNames;
+        this.categories = categories;
+        this.postView = 0L;
+    }
 }
diff --git a/src/main/java/com/gongjakso/server/domain/post/entity/PostScrap.java b/src/main/java/com/gongjakso/server/domain/post/entity/PostScrap.java
@@ -31,6 +31,14 @@ public PostScrap(Post post, Member member, Boolean scrapStatus){
         this.scrapStatus = scrapStatus;
     }
 
+    @Builder
+    public PostScrap(long postScrapId, Post post, Member member, Boolean scrapStatus){
+        this.postScrapId = postScrapId;
+        this.post = post;
+        this.member = member;
+        this.scrapStatus = scrapStatus;
+    }
+
     public Boolean getScrapStatus(){
         return scrapStatus;
     }

diff --git a/src/main/java/com/gongjakso/server/domain/post/repository/PostScrapRepository.java b/src/main/java/com/gongjakso/server/domain/post/repository/PostScrapRepository.java
@@ -13,5 +13,8 @@ public interface PostScrapRepository extends JpaRepository<PostScrap, Long> {
     PostScrap findByPostAndMember(Post post, Member member);
     List<PostScrap> findByMemberAndScrapStatus(Member member,boolean scrapStatus);
 
-    Page<PostScrap> findAllByMemberAndScrapStatusTrueOrderByPostScrapIdDesc(Member member, Pageable pageable);
+    Page<PostScrap> findAllByMemberAndPostPostTypeTrueAndPostDeletedAtIsNullAndScrapStatusTrueOrderByPostScrapIdDesc(Member member, Pageable pageable);
+
+    Page<PostScrap> findAllByMemberAndPostPostTypeFalseAndPostDeletedAtIsNullAndScrapStatusTrueOrderByPostScrapIdDesc(Member member, Pageable pageable);
+
 }
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
@@ -18,7 +18,10 @@
 import com.gongjakso.server.global.security.PrincipalDetails;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.domain.*;
+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.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -377,17 +380,9 @@ public GetPostRelation checkPostRelation(Member member, Long postId) {
     public Page<GetProjectRes> getMyScrapProject(Member member, Pageable page){
         Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize());
 
-        Page<PostScrap> scrapPageList = postScrapRepository.findAllByMemberAndScrapStatusTrueOrderByPostScrapIdDesc(member, pageable);
+        Page<PostScrap> scrapPageList = postScrapRepository.findAllByMemberAndPostPostTypeTrueAndPostDeletedAtIsNullAndScrapStatusTrueOrderByPostScrapIdDesc(member, pageable);
 
-        List<GetProjectRes> filteredProjects = scrapPageList.stream()
-                .filter(scrap -> {
-                    Post post = scrap.getPost();
-
-                    //유효한 post만 남기기
-                    return post != null &&
-                            post.isPostType() &&
-                            post.getDeletedAt() == null;
-                })
+        List<GetProjectRes> myScrapProjects = scrapPageList.stream()
                 .map(scrap -> {
                     Post post = scrap.getPost();
                     post.getCategories().size();
@@ -397,24 +392,16 @@ public Page<GetProjectRes> getMyScrapProject(Member member, Pageable page){
                 .collect(Collectors.toList()); // 리스트로 수집
 
         // 필터링된 리스트를 페이지로 반환
-        return new PageImpl<>(filteredProjects, pageable, scrapPageList.getTotalElements());
+        return new PageImpl<>( myScrapProjects, pageable, myScrapProjects.size());
     }
 
     @Transactional
     public Page<GetContestRes> getMyScrapContest(Member member, Pageable page){
         Pageable pageable = PageRequest.of(page.getPageNumber(), page.getPageSize());
 
-        Page<PostScrap> scrapPageList = postScrapRepository.findAllByMemberAndScrapStatusTrueOrderByPostScrapIdDesc(member, pageable);
+        Page<PostScrap> scrapPageList = postScrapRepository.findAllByMemberAndPostPostTypeFalseAndPostDeletedAtIsNullAndScrapStatusTrueOrderByPostScrapIdDesc(member, pageable);
 
-        List<GetContestRes> filteredContests = scrapPageList.stream()
-                .filter(scrap -> {
-                    Post post = scrap.getPost();
-
-                    //유효한 post만 남기기
-                    return post != null &&
-                            !post.isPostType() &&
-                            post.getDeletedAt() == null;
-                })
+        List<GetContestRes> myScrapContests = scrapPageList.stream()
                 .map(scrap -> {
                     Post post = scrap.getPost();
                     post.getCategories().size();
@@ -424,9 +411,10 @@ public Page<GetContestRes> getMyScrapContest(Member member, Pageable page){
                 .collect(Collectors.toList()); // 리스트로 수집
 
         // 필터링된 리스트를 페이지로 반환
-        return new PageImpl<>(filteredContests, pageable, scrapPageList.getTotalElements());
+        return new PageImpl<>(myScrapContests, pageable, myScrapContests.size());
     }
 
+
     @Transactional
     public PostSimpleRes completePost(Member member, Long postId) {
         // Validation: Post 논리적 삭제 및 사용자의 권한 여부 확인

diff --git a/src/main/java/com/gongjakso/server/global/exception/ErrorCode.java b/src/main/java/com/gongjakso/server/global/exception/ErrorCode.java
@@ -44,7 +44,7 @@ public enum ErrorCode {
     //5000: Post Error
     NOT_POST_EXCEPTION(HttpStatus.BAD_REQUEST,5000,"공고를 더 이상 생성할 수 없습니다"),
     POST_VALUE_EXCEPTION(HttpStatus.BAD_REQUEST,5001,"올바르지 않은 요청 값입니다."),
-    NOT_FOUNT_SCRAP_EXCEPTION(HttpStatus.NOT_FOUND,5002,"스크랩 정보가 존재하지 않습니다."),
+    NOT_FOUND_SCRAP_EXCEPTION(HttpStatus.NOT_FOUND,5002,"스크랩 정보가 존재하지 않습니다."),
     ALREADY_FINISH_EXCEPTION(HttpStatus.BAD_REQUEST, 5003, "이미 모집 기간이 마감된 공고입니다."),
     ILLEGAL_POST_EXCEPTION(HttpStatus.BAD_REQUEST, 5004, "파트별 인원수가 전체 인원수와 일치하지 않습니다.");
 

diff --git a/src/test/java/com/gongjakso/server/domain/member/util/MemberUtilTest.java b/src/test/java/com/gongjakso/server/domain/member/util/MemberUtilTest.java
@@ -20,6 +20,22 @@ public static Member buildMember() {
                 .build();
     }
 
+    public static Member buildMemberAndId(Long id) {
+        return new Member(
+                id,
+                "[email protected]",
+                "password123",
+                "공작소",
+                "010-1234-5678",
+                "http://example.com",
+                MemberType.GENERAL.toString(),
+                LoginType.KAKAO.toString(),
+                "상태",
+                "전공",
+                "직업"
+        );
+    }
+
     public static MemberReq buildMemberReq() {
         return MemberReq.builder()
                 .name("변경 공작소")

diff --git a/src/test/java/com/gongjakso/server/domain/post/controller/PaginationControllerTest.java b/src/test/java/com/gongjakso/server/domain/post/controller/PaginationControllerTest.java
@@ -0,0 +1,68 @@
+package com.gongjakso.server.domain.post.controller;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+
+@AutoConfigureMockMvc
+@ExtendWith(MockitoExtension.class)
+public class PaginationControllerTest {
+/*
+    MockMvc mockMvc;
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    @MockBean
+    private PostService postService;
+
+    @MockBean
+    private PostRepository postRepository;
+
+    @MockBean
+    private MemberRepository memberRepository;
+
+    @MockBean
+    private ApplyService applyService;
+
+    @MockBean
+    private TokenProvider tokenProvider;
+
+    @MockBean
+    private RedisClient redisClient;
+
+    @MockBean
+    private JwtFilter jwtFilter;
+
+    private Member member;
+    private PrincipalDetails principalDetails;
+
+    @BeforeEach
+    void setUp() {
+        member = MemberUtilTest.buildMemberAndId(1L);
+        principalDetails = new PrincipalDetails(member);
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+                principalDetails, null, principalDetails.getAuthorities());
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+    }
+
+    @Test
+    @DisplayName("공고 스크랩 저장 및 취소 기능")
+    void scrapPost() throws Exception {
+        //given
+        Post post = PostUtilTest.builderPost(1L, member);
+        PostScrapRes postScrapRes = PostScrapUtilTest.ScrapPostRes(post.getPostId(), member.getMemberId(), true);
+        given(postService.scrapPost(any(Member.class), anyLong())).willReturn(postScrapRes);
+        String resJson = objectMapper.writeValueAsString(postScrapRes);
+
+        mockMvc.perform(post("/api/v1/post/{id}", post.getPostId())
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .principal((Principal) principalDetails))
+                .andExpect(status().isOk())
+                .andExpect(content().json(resJson))
+                .andDo(print());
+
+        verify(postService).scrapPost(any(Member.class), any(Long.class));
+    }
+
+ */
+}
diff --git a/src/test/java/com/gongjakso/server/domain/post/domain/ScrapDomainTest.java b/src/test/java/com/gongjakso/server/domain/post/domain/ScrapDomainTest.java
@@ -0,0 +1,55 @@
+package com.gongjakso.server.domain.post.domain;
+
+
+import com.gongjakso.server.domain.member.entity.Member;
+import com.gongjakso.server.domain.member.util.MemberUtilTest;
+import com.gongjakso.server.domain.post.entity.Post;
+import com.gongjakso.server.domain.post.entity.PostScrap;
+import com.gongjakso.server.domain.post.util.PostScrapUtilTest;
+import com.gongjakso.server.domain.post.util.PostUtilTest;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@DisplayName("PostScrap 도메인 테스트")
+public class ScrapDomainTest{
+
+    private Post post;
+    private Member member;
+
+    @BeforeEach
+    public void setUp() {
+        member = MemberUtilTest.buildMemberAndId(1L);
+        post = PostUtilTest.builderPost(1L, member);
+    }
+
+    @Nested
+    @DisplayName("Builder테스트")
+    class BuilderTests {
+
+        @Test
+        @DisplayName("Id없이 빌드 되어야 함")
+        public void testPostScrapBuilder() {
+            PostScrap postScrap = PostScrapUtilTest.builderPostScrap(post, post.getMember());
+            System.out.println(postScrap.getMember());
+            System.out.println(member);
+            assertThat(postScrap.getPost()).isEqualTo(post);
+            assertThat(postScrap.getMember()).isEqualTo(member);
+            assertThat(postScrap.getScrapStatus()).isTrue();
+        }
+
+        @Test
+        @DisplayName("Id와 함께 빌드 되어야 함")
+        public void testPostScrapBuilderWithId() {
+            Long postScrapId = 1L;
+            PostScrap postScrap = PostScrapUtilTest.builderPostScrapWithPostAndMember(postScrapId, post, post.getMember());
+            assertThat(postScrap.getPostScrapId()).isEqualTo(postScrapId);
+            assertThat(postScrap.getPost()).isEqualTo(post);
+            assertThat(postScrap.getMember()).isEqualTo(member);
+            assertThat(postScrap.getScrapStatus()).isTrue();
+        }
+    }
+}