Skip to content

Commit aeb866c

Browse files
committed
추가적인 수정
1 parent 7882a13 commit aeb866c

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

server/src/main/java/com/project/Glog/repository/PostRepository.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.project.Glog.domain.User;
55
import org.springframework.data.domain.Page;
66
import org.springframework.data.domain.Pageable;
7+
import org.springframework.data.jpa.domain.Specification;
78
import org.springframework.data.jpa.repository.JpaRepository;
89
import org.springframework.data.jpa.repository.Query;
910
import org.springframework.data.repository.query.Param;
@@ -26,7 +27,7 @@ public interface PostRepository extends JpaRepository<Post,Long> {
2627
@Query("SELECT p FROM Post p ORDER BY p.likesCount DESC")
2728
List<Post> findAllByOrderByLikesDesc();
2829

29-
Page<Post> findAll(Pageable pageable);
30+
Page<Post> findByisPrivate(boolean isPrivate, Pageable pageable);
3031

3132
@Query(value = "SELECT * FROM post ORDER BY RAND() LIMIT 8", nativeQuery = true)
3233
List<Post> findPostsByRandom();

server/src/main/java/com/project/Glog/security/oauth2/CustomOAuth2UserService.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ private User registerNewUser(OAuth2UserRequest oAuth2UserRequest, OAuth2UserInfo
7575
user.setProviderId(oAuth2UserInfo.getId());
7676
user.setNickname(oAuth2UserInfo.getName());
7777
user.setEmail(oAuth2UserInfo.getEmail());
78-
user.setImageUrl(oAuth2UserInfo.getImageUrl());
78+
user.setImageUrl("https://elasticbeanstalk-us-east-1-064991853848.s3.amazonaws.com/profile/defaultImages.jpg");
7979

8080
if (registrationId.equalsIgnoreCase(AuthProvider.github.toString())) {
8181
user.setGithubID(oAuth2UserInfo.getName());
@@ -90,7 +90,6 @@ private User updateExistingUser(User existingUser, OAuth2UserInfo oAuth2UserInfo
9090
String registrationId = oAuth2UserRequest.getClientRegistration().getRegistrationId();
9191

9292
existingUser.setNickname(oAuth2UserInfo.getName());
93-
existingUser.setImageUrl(oAuth2UserInfo.getImageUrl());
9493
if (registrationId.equalsIgnoreCase(AuthProvider.github.toString())) {
9594
existingUser.setGithubID(oAuth2UserInfo.getName());
9695
existingUser.setGithubToken(token);

server/src/main/java/com/project/Glog/service/BlogService.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public String registerBlog(UserPrincipal userPrincipal, UserCreateRequest userCr
3838
blog.setBlogName(userCreateRequest.getBlogName());
3939
blog.setBlogUrl(userCreateRequest.getBlogUrl());
4040
user.setNickname(userCreateRequest.getNickname());
41-
user.setImageUrl("https://elasticbeanstalk-us-east-1-064991853848.s3.amazonaws.com/profile/defaultImages.jpg");
41+
// user.setImageUrl("https://elasticbeanstalk-us-east-1-064991853848.s3.amazonaws.com/profile/defaultImages.jpg");
4242

4343
Guestbook guestBook = new Guestbook();
4444
guestBook.setBlog(blog);

server/src/main/java/com/project/Glog/service/PostService.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,16 @@ public PostPreviewResponse getCollect(int page) {
222222
public PostPreviewDtos getPreviews(String kind, int page) {
223223
if (!kind.equals("randoms")) {
224224
PageRequest pageRequest = null;
225+
225226
if (kind.equals("recent")) {
226227
pageRequest = PageRequest.of(page, 8, Sort.by("id").descending());
227228
} else if (kind.equals("likes")) {
228229
pageRequest = PageRequest.of(page, 8, Sort.by("likesCount").descending());
229230
} else if (kind.equals("views")) {
230231
pageRequest = PageRequest.of(page, 8, Sort.by("viewsCount").descending());
231232
}
232-
Page<Post> postsByPagination = postRepository.findAll(pageRequest);
233+
234+
Page<Post> postsByPagination = postRepository.findByisPrivate(false,pageRequest);
233235
return new PostPreviewDtos(postsByPagination.getContent(), postsByPagination.getTotalPages());
234236
} else if (kind.equals("randoms")) {
235237
List<Post> posts = postRepository.findPostsByRandom();

0 commit comments

Comments
 (0)