[FIX] 메인페이지, 태그 모아보기 수정

Author: youngseo22

src/main/java/com/example/FixLog/controller/MainPageController.java

@@ -15,15 +15,17 @@ public MainPageController(MainPageService mainPageService){
     }
 
     @GetMapping
-    public Response<Object> mainPageView(@RequestParam("sort") int sort){
-        MainPageResponseDto mainPageView = mainPageService.mainPageView(sort);
+    public Response<Object> mainPageView(@RequestParam(value = "sort", defaultValue = "0") int sort,
+                                         @RequestParam(value = "page", defaultValue = "12") int size){
+        MainPageResponseDto mainPageView = mainPageService.mainPageView(sort, size);
         return Response.success("메인페이지 불러오기 성공", mainPageView);
     }
 
     @GetMapping("/full")
-    public Response<Object> mainPageFullView(@RequestParam("sort") int sort,
-                                             @RequestParam("page") int page){
-        MainPageResponseDto mainPageFullView = mainPageService.mainPageFullView(sort, page);
+    public Response<Object> mainPageFullView(@RequestParam(value = "sort", defaultValue = "0") int sort,
+                                             @RequestParam(value = "page", defaultValue = "1") int page,
+                                             @RequestParam(value = "page", defaultValue = "12") int size){
+        MainPageResponseDto mainPageFullView = mainPageService.mainPageFullView(sort, page, size);
         return Response.success("메인페이지 전체보기 성공", mainPageFullView);
     }
 }

src/main/java/com/example/FixLog/controller/TagController.java

@@ -15,8 +15,9 @@ public TagController(TagService tagService){
     }
 
     @GetMapping
-    public Response<Object> viewTags(@RequestParam("page") int page){
-        TagResponseDto tags = tagService.viewTags(page);
+    public Response<Object> viewTags(@RequestParam("page") int page,
+                                     @RequestParam("size") int size){
+        TagResponseDto tags = tagService.viewTags(page, size);
         return Response.success("태그 모아보기 성공", tags);
     }
 }

src/main/java/com/example/FixLog/service/MainPageService.java

@@ -10,6 +10,7 @@
 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 java.util.List;
@@ -34,22 +35,26 @@ public String getDefaultImage(String image){
     }
 
     // 메인페이지 보기
-    public MainPageResponseDto mainPageView(int sort){
+    public MainPageResponseDto mainPageView(int sort, int size){
         // 사용자 정보 불러오기
         Member member = memberService.getCurrentMemberInfo();
         String imageUrl = member.getProfileImageUrl();
         String profileImageUrl = getDefaultImage(imageUrl);
 
         // 페이지 (글 12개) 불러오기
-        List<Post> posts;
+        Page<Post> posts;
+        Sort sortOption;
 
         if (sort == 0) { // 최신순 정렬
-            posts = postRepository.findTop12ByOrderByCreatedAtDesc();
+            sortOption = Sort.by(Sort.Direction.DESC, "createdAt");
         } else if (sort == 1) { // 인기순 정렬
-            posts = postRepository.findTop12ByOrderByPostLikesDesc();
+            sortOption = Sort.by(Sort.Direction.DESC, "postLikes");
         } else
             throw new CustomException(ErrorCode.SORT_NOT_EXIST);
 
+        Pageable pageable = PageRequest.of(0, size, sortOption);
+        posts = postRepository.findAll(pageable);
+
         List<MainPagePostResponseDto> postList = posts.stream()
                 .map(post -> new MainPagePostResponseDto(
                         post.getPostTitle(),
@@ -68,14 +73,14 @@ public MainPageResponseDto mainPageView(int sort){
     }
 
     // 메인페이지 전체보기
-    public MainPageResponseDto mainPageFullView(int sort, int page){
+    public MainPageResponseDto mainPageFullView(int sort, int page, int size){
         // 사용자 정보 불러오기
         Member member = memberService.getCurrentMemberInfo();
         String imageUrl = member.getProfileImageUrl();
         String profileImageUrl = getDefaultImage(imageUrl);
 
         // 페이지 설정 (한 페이지당 12개)
-        Pageable pageable = PageRequest.of(page - 1, 12);
+        Pageable pageable = PageRequest.of(page - 1, size);
         Page<Post> postPage;
 
         if (sort == 0) { // 최신순 정렬

src/main/java/com/example/FixLog/service/TagService.java

@@ -1,12 +1,8 @@
 package com.example.FixLog.service;
 
-import com.example.FixLog.domain.member.Member;
 import com.example.FixLog.domain.tag.Tag;
 import com.example.FixLog.dto.tag.TagDto;
 import com.example.FixLog.dto.tag.TagResponseDto;
-import com.example.FixLog.exception.CustomException;
-import com.example.FixLog.exception.ErrorCode;
-import com.example.FixLog.repository.MemberRepository;
 import com.example.FixLog.repository.tag.TagRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -25,8 +21,8 @@ public TagService(TagRepository tagRepository){
     }
 
     // 태그 모음 보기
-    public TagResponseDto viewTags(int page){
-        Pageable pageable = PageRequest.of(page - 1, 12);
+    public TagResponseDto viewTags(int page, int size){
+        Pageable pageable = PageRequest.of(page - 1, size);
 
         Page<Tag> tags = tagRepository.findAll(pageable);
 

src/main/resources/application.properties

@@ -11,7 +11,7 @@ spring.datasource.username=sa
 spring.datasource.password=
 
 spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=create
+spring.jpa.hibernate.ddl-auto=update
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect
 
 # JWT