추가적인 수정

pknu-wap · Nov 29, 2023 · aeb866c · aeb866c
1 parent 7882a13
commit aeb866c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/server/src/main/java/com/project/Glog/repository/PostRepository.java b/server/src/main/java/com/project/Glog/repository/PostRepository.java
@@ -4,6 +4,7 @@
 import com.project.Glog.domain.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -26,7 +27,7 @@ public interface PostRepository extends JpaRepository<Post,Long> {
     @Query("SELECT p FROM Post p ORDER BY p.likesCount DESC")
     List<Post> findAllByOrderByLikesDesc();
 
-    Page<Post> findAll(Pageable pageable);
+    Page<Post> findByisPrivate(boolean isPrivate, Pageable pageable);
 
     @Query(value = "SELECT * FROM post ORDER BY RAND() LIMIT 8", nativeQuery = true)
     List<Post> findPostsByRandom();

diff --git a/server/src/main/java/com/project/Glog/security/oauth2/CustomOAuth2UserService.java b/server/src/main/java/com/project/Glog/security/oauth2/CustomOAuth2UserService.java
@@ -75,7 +75,7 @@ private User registerNewUser(OAuth2UserRequest oAuth2UserRequest, OAuth2UserInfo
         user.setProviderId(oAuth2UserInfo.getId());
         user.setNickname(oAuth2UserInfo.getName());
         user.setEmail(oAuth2UserInfo.getEmail());
-        user.setImageUrl(oAuth2UserInfo.getImageUrl());
+        user.setImageUrl("https://elasticbeanstalk-us-east-1-064991853848.s3.amazonaws.com/profile/defaultImages.jpg");
 
         if (registrationId.equalsIgnoreCase(AuthProvider.github.toString())) {
             user.setGithubID(oAuth2UserInfo.getName());
@@ -90,7 +90,6 @@ private User updateExistingUser(User existingUser, OAuth2UserInfo oAuth2UserInfo
         String registrationId = oAuth2UserRequest.getClientRegistration().getRegistrationId();
 
         existingUser.setNickname(oAuth2UserInfo.getName());
-        existingUser.setImageUrl(oAuth2UserInfo.getImageUrl());
         if (registrationId.equalsIgnoreCase(AuthProvider.github.toString())) {
             existingUser.setGithubID(oAuth2UserInfo.getName());
             existingUser.setGithubToken(token);

diff --git a/server/src/main/java/com/project/Glog/service/BlogService.java b/server/src/main/java/com/project/Glog/service/BlogService.java
@@ -38,7 +38,7 @@ public String registerBlog(UserPrincipal userPrincipal, UserCreateRequest userCr
         blog.setBlogName(userCreateRequest.getBlogName());
         blog.setBlogUrl(userCreateRequest.getBlogUrl());
         user.setNickname(userCreateRequest.getNickname());
-        user.setImageUrl("https://elasticbeanstalk-us-east-1-064991853848.s3.amazonaws.com/profile/defaultImages.jpg");
+//        user.setImageUrl("https://elasticbeanstalk-us-east-1-064991853848.s3.amazonaws.com/profile/defaultImages.jpg");
 
         Guestbook guestBook = new Guestbook();
         guestBook.setBlog(blog);

diff --git a/server/src/main/java/com/project/Glog/service/PostService.java b/server/src/main/java/com/project/Glog/service/PostService.java
@@ -222,14 +222,16 @@ public PostPreviewResponse getCollect(int page) {
     public PostPreviewDtos getPreviews(String kind, int page) {
         if (!kind.equals("randoms")) {
             PageRequest pageRequest = null;
+
             if (kind.equals("recent")) {
                 pageRequest = PageRequest.of(page, 8, Sort.by("id").descending());
             } else if (kind.equals("likes")) {
                 pageRequest = PageRequest.of(page, 8, Sort.by("likesCount").descending());
             } else if (kind.equals("views")) {
                 pageRequest = PageRequest.of(page, 8, Sort.by("viewsCount").descending());
             }
-            Page<Post> postsByPagination = postRepository.findAll(pageRequest);
+
+            Page<Post> postsByPagination = postRepository.findByisPrivate(false,pageRequest);
             return new PostPreviewDtos(postsByPagination.getContent(), postsByPagination.getTotalPages());
         } else if (kind.equals("randoms")) {
             List<Post> posts = postRepository.findPostsByRandom();