Merge pull request #49 from f-lab-edu/feature/offset_paging

[#48] 게시글 조회 API 구현
f-lab-edu · Jul 10, 2024 · e93372c · e93372c
2 parents 59142f9 + 482830c
commit e93372c
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 18 deletions.
diff --git a/group-service/src/main/java/me/kong/groupservice/controller/PostController.java b/group-service/src/main/java/me/kong/groupservice/controller/PostController.java
@@ -2,21 +2,26 @@
 
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import me.kong.commonlibrary.util.JwtReader;
+import me.kong.groupservice.domain.entity.State;
 import me.kong.groupservice.domain.entity.post.Post;
 import me.kong.groupservice.domain.entity.profile.Profile;
 import me.kong.groupservice.dto.request.SavePostRequestDto;
+import me.kong.groupservice.dto.response.PostListResponseDto;
 import me.kong.groupservice.dto.response.PostResponseDto;
 import me.kong.groupservice.mapper.PostMapper;
 import me.kong.groupservice.service.PostService;
 import me.kong.groupservice.service.ProfileService;
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import static me.kong.commonlibrary.constant.HttpStatusResponseEntity.RESPONSE_OK;
 
 
+@Slf4j
 @RestController
 @RequestMapping("/api/groups/{groupId}/posts")
 @RequiredArgsConstructor
@@ -27,6 +32,18 @@ public class PostController {
     private final ProfileService profileService;
     private final JwtReader jwtReader;
 
+    @GetMapping
+    public ResponseEntity<Page<PostListResponseDto>> getPostList(
+            @PathVariable Long groupId,
+            @RequestParam(required = false, defaultValue = "GENERAL") State state,
+            @RequestParam(required = false , defaultValue = "0") int page,
+            @RequestParam(required = false, defaultValue = "10") int size) {
+
+        Page<Post> posts = postService.getRecentPosts(groupId, state, page, size);
+
+        return new ResponseEntity<>(postMapper.toDto(posts), HttpStatus.OK);
+    }
+
     @PostMapping
     public ResponseEntity<HttpStatus> createNewPost(@PathVariable Long groupId,
                                                     @RequestBody SavePostRequestDto dto) {

diff --git a/group-service/src/main/java/me/kong/groupservice/domain/entity/group/Group.java b/group-service/src/main/java/me/kong/groupservice/domain/entity/group/Group.java
@@ -11,7 +11,8 @@
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity(name = "music_group")
+@Entity
+@Table(name = "music_group")
 public class Group extends BaseTimeEntity {
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -40,6 +41,8 @@ public class Group extends BaseTimeEntity {
     @Column(name = "profile_count")
     private Integer profileCount;
 
+
+
     @Builder
     public Group(String name, String description, Integer groupSize, JoinCondition joinCondition, GroupScope groupScope, State state, Long ownerUserId, Integer profileCount) {
         this.name = name;

diff --git a/group-service/src/main/java/me/kong/groupservice/domain/entity/post/Post.java b/group-service/src/main/java/me/kong/groupservice/domain/entity/post/Post.java
@@ -5,11 +5,14 @@
 import lombok.*;
 import me.kong.commonlibrary.entity.BaseTimeEntity;
 import me.kong.groupservice.domain.entity.State;
+import me.kong.groupservice.domain.entity.group.Group;
+import me.kong.groupservice.domain.entity.profile.Profile;
 
 
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@Entity(name = "posts")
+@Entity
+@Table(name = "posts")
 public class Post extends BaseTimeEntity {
 
     @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -27,17 +30,21 @@ public class Post extends BaseTimeEntity {
     @Enumerated(EnumType.STRING)
     private State state;
 
-    private Long groupId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "group_id")
+    private Group group;
 
-    private Long profileId;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "profile_id")
+    private Profile profile;
 
     @Builder
-    public Post(String title, String content, PostScope postScope, State state, Long groupId, Long profileId) {
+    public Post(String title, String content, PostScope postScope, State state, Group group, Profile profile) {
         this.title = title;
         this.content = content;
         this.postScope = postScope;
         this.state = state;
-        this.groupId = groupId;
-        this.profileId = profileId;
+        this.group = group;
+        this.profile = profile;
     }
 }
diff --git a/group-service/src/main/java/me/kong/groupservice/domain/repository/PostRepository.java b/group-service/src/main/java/me/kong/groupservice/domain/repository/PostRepository.java
@@ -1,10 +1,21 @@
 package me.kong.groupservice.domain.repository;
 
+import me.kong.groupservice.domain.entity.State;
 import me.kong.groupservice.domain.entity.post.Post;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 
 @Repository
 public interface PostRepository extends JpaRepository<Post, Long> {
+
+    @Query("select p from Post p " +
+            " join fetch p.group g" +
+            " join fetch p.profile pf" +
+            " where p.state = :state and g.id = :groupId")
+    Page<Post> findRecentPost(@Param("groupId") Long groupId, @Param("state") State state, Pageable pageable);
 }
diff --git a/group-service/src/main/java/me/kong/groupservice/dto/response/PostListResponseDto.java b/group-service/src/main/java/me/kong/groupservice/dto/response/PostListResponseDto.java
@@ -0,0 +1,19 @@
+package me.kong.groupservice.dto.response;
+
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+public class PostListResponseDto {
+    private Long id;
+    private String title;
+    private String content;
+    private Long groupId;
+    private Long profileId;
+    private String nickname;
+    private LocalDateTime updatedDate;
+}
diff --git a/group-service/src/main/java/me/kong/groupservice/mapper/PostMapper.java b/group-service/src/main/java/me/kong/groupservice/mapper/PostMapper.java
@@ -1,24 +1,27 @@
 package me.kong.groupservice.mapper;
 
 import me.kong.groupservice.domain.entity.State;
+import me.kong.groupservice.domain.entity.group.Group;
 import me.kong.groupservice.domain.entity.post.Post;
 import me.kong.groupservice.domain.entity.profile.Profile;
 import me.kong.groupservice.dto.request.SavePostRequestDto;
+import me.kong.groupservice.dto.response.PostListResponseDto;
 import me.kong.groupservice.dto.response.PostResponseDto;
+import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 
 
 @Component
 public class PostMapper {
 
-    public Post toEntity(SavePostRequestDto dto, Long groupId, Long profileId) {
+    public Post toEntity(SavePostRequestDto dto, Group group, Profile profile) {
         return Post.builder()
                 .title(dto.getTitle())
                 .content(dto.getContent())
                 .postScope(dto.getScope())
                 .state(State.GENERAL)
-                .groupId(groupId)
-                .profileId(profileId)
+                .group(group)
+                .profile(profile)
                 .build();
     }
 
@@ -29,8 +32,20 @@ public PostResponseDto toDto(Post post, Profile profile) {
                 .content(post.getContent())
                 .nickname(profile.getNickname())
                 .profileId(profile.getId())
-                .groupId(post.getGroupId())
+                .groupId(post.getGroup().getId())
                 .updatedDate(post.getUpdatedDate())
                 .build();
     }
+
+    public Page<PostListResponseDto> toDto(Page<Post> posts) {
+        return posts.map(p -> PostListResponseDto.builder()
+                .id(p.getId())
+                .title(p.getTitle())
+                .content(p.getContent())
+                .groupId(p.getGroup().getId())
+                .profileId(p.getProfile().getId())
+                .nickname(p.getProfile().getNickname())
+                .updatedDate(p.getUpdatedDate())
+                .build());
+    }
 }
diff --git a/group-service/src/main/java/me/kong/groupservice/service/AuthService.java b/group-service/src/main/java/me/kong/groupservice/service/AuthService.java
@@ -13,7 +13,7 @@ public class AuthService {
 
     public boolean isGroupMember(Group group, Profile profile) {
         return profile.getGroup().getId().equals(group.getId())
-                && profile.getState() != State.GENERAL;
+                && profile.getState() == State.GENERAL;
     }
 
     public boolean isGroupManager(Group group, Profile profile) {

diff --git a/group-service/src/main/java/me/kong/groupservice/service/PostService.java b/group-service/src/main/java/me/kong/groupservice/service/PostService.java
@@ -7,11 +7,16 @@
 import me.kong.groupservice.common.annotation.GroupOnly;
 import me.kong.groupservice.common.annotation.UserId;
 import me.kong.groupservice.domain.entity.State;
+import me.kong.groupservice.domain.entity.group.Group;
 import me.kong.groupservice.domain.entity.post.Post;
 import me.kong.groupservice.domain.entity.profile.Profile;
 import me.kong.groupservice.domain.repository.PostRepository;
 import me.kong.groupservice.dto.request.SavePostRequestDto;
 import me.kong.groupservice.mapper.PostMapper;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,14 +31,16 @@ public class PostService {
     private final PostRepository postRepository;
     private final PostMapper postMapper;
     private final ProfileService profileService;
+    private final GroupService groupService;
 
 
     @GroupOnly(role = MEMBER)
     @Transactional
     public void savePost(SavePostRequestDto dto, @UserId Long userId, @GroupId Long groupId) {
+        Group group = groupService.findGroupById(groupId);
         Profile profile = profileService.getLoggedInProfile(userId, groupId);
 
-        Post post = postMapper.toEntity(dto, groupId, profile.getId());
+        Post post = postMapper.toEntity(dto, group, profile);
 
         postRepository.save(post);
     }
@@ -56,4 +63,11 @@ public void deletePost(Long id, @UserId Long userId, @GroupId Long groupId) {
         Post post = findPost(id);
         post.setState(State.DELETED);
     }
+
+    @Transactional
+    public Page<Post> getRecentPosts(Long groupId, State state, int page, int size) {
+        Pageable pageable = PageRequest.of(page, size, Sort.by("id").descending());
+
+        return postRepository.findRecentPost(groupId, state, pageable);
+    }
 }
diff --git a/group-service/src/test/java/me/kong/groupservice/service/PostServiceTest.java b/group-service/src/test/java/me/kong/groupservice/service/PostServiceTest.java
@@ -1,6 +1,7 @@
 package me.kong.groupservice.service;
 
 import me.kong.groupservice.domain.entity.State;
+import me.kong.groupservice.domain.entity.group.Group;
 import me.kong.groupservice.domain.entity.post.Post;
 import me.kong.groupservice.domain.entity.post.PostScope;
 import me.kong.groupservice.domain.entity.profile.Profile;
@@ -35,20 +36,26 @@ class PostServiceTest {
     @Mock
     ProfileService profileService;
 
+    @Mock
+    GroupService groupService;
 
     SavePostRequestDto savePostRequestDto;
+    Group group;
     Profile profile;
     Post post;
 
     Long profileId = 1L;
     Long groupId = 2L;
     Long postId = 3L;
     Long userId = 4L;
+
     String title = "테스트 제목";
     String content = "테스트 내용";
+
     PostScope scope = PostScope.GROUP_ONLY;
 
 
+
     @Test
     void successToSavePost() {
         //given
@@ -59,7 +66,7 @@ void successToSavePost() {
 
         //then
         verify(profileService, times(1)).getLoggedInProfile(userId, groupId);
-        verify(postMapper, times(1)).toEntity(savePostRequestDto, groupId, profileId);
+        verify(postMapper, times(1)).toEntity(savePostRequestDto, group, profile);
         verify(postRepository, times(1)).save(post);
     }
 
@@ -110,12 +117,15 @@ void successToDeletePost() {
 
 
     private void savePostSetting(PostScope scope, State state) {
+        group = mock();
         profile = mock();
-        when(profile.getId()).thenReturn(profileId);
+
         savePostRequestDto = makeSavePostRequestDto(scope);
         post = makePost(state);
+
+        when(groupService.findGroupById(any())).thenReturn(group);
         when(profileService.getLoggedInProfile(userId, groupId)).thenReturn(profile);
-        when(postMapper.toEntity(savePostRequestDto, groupId, profile.getId())).thenReturn(post);
+        when(postMapper.toEntity(savePostRequestDto, group, profile)).thenReturn(post);
     }
 
     private SavePostRequestDto makeSavePostRequestDto(PostScope scope) {
@@ -132,8 +142,8 @@ private Post makePost(State state) {
                 .content(content)
                 .postScope(scope)
                 .state(state)
-                .groupId(groupId)
-                .profileId(profileId)
+                .group(group)
+                .profile(profile)
                 .build();
     }
 }