From 749a3fa48656b1806d98f79df8e1a78a13f48721 Mon Sep 17 00:00:00 2001 From: sbhong Date: Wed, 1 Jun 2022 08:40:14 +0900 Subject: [PATCH 1/5] hotfix: fix get post lists service --- .../kr/or/cola/backend/post/post/domain/PostRepository.java | 2 +- .../kr/or/cola/backend/post/post/service/PostService.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/kr/or/cola/backend/post/post/domain/PostRepository.java b/src/main/java/kr/or/cola/backend/post/post/domain/PostRepository.java index 7a62b3f..b34c9f3 100644 --- a/src/main/java/kr/or/cola/backend/post/post/domain/PostRepository.java +++ b/src/main/java/kr/or/cola/backend/post/post/domain/PostRepository.java @@ -6,7 +6,7 @@ public interface PostRepository extends JpaRepository { - Page findByPostType(PostType postType, Pageable pageable); + Page findAllByPostType(PostType postType, Pageable pageable); Page findAllByTitleContainsOrContentContains(String titleKeyword, String contentKeyword, Pageable pageable); diff --git a/src/main/java/kr/or/cola/backend/post/post/service/PostService.java b/src/main/java/kr/or/cola/backend/post/post/service/PostService.java index 3b6787a..c281510 100644 --- a/src/main/java/kr/or/cola/backend/post/post/service/PostService.java +++ b/src/main/java/kr/or/cola/backend/post/post/service/PostService.java @@ -105,7 +105,9 @@ public void deletePost(Long postId) { public Page findAllPostByPostType(Long userId, PostType postType, Pageable pageable) { - Page posts = postRepository.findByPostType(postType, pageable); + Page posts = postType == null + ? postRepository.findAll(pageable) + : postRepository.findAllByPostType(postType, pageable); Map favorMap = new HashMap<>(); posts.forEach(post -> { favorMap.put( From 2daf2a28d41805e698554c145a4bd01c0f8efa62 Mon Sep 17 00:00:00 2001 From: sbhong Date: Wed, 1 Jun 2022 08:50:15 +0900 Subject: [PATCH 2/5] chore: fix build.gradle --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index f3f8eaf..86b1e12 100644 --- a/build.gradle +++ b/build.gradle @@ -12,6 +12,11 @@ repositories { mavenCentral() } +jar { + enabled = false +} + + dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' From 32fee3df16f5807b17c547bf65f00ea2b4df9ca7 Mon Sep 17 00:00:00 2001 From: sbhong Date: Wed, 1 Jun 2022 08:55:15 +0900 Subject: [PATCH 3/5] fix: change post type nullable in get post lists service --- .../or/cola/backend/post/post/presentation/PostController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java b/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java index 7a55b4f..0707553 100644 --- a/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java +++ b/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java @@ -15,6 +15,7 @@ import org.springframework.data.domain.Sort; import org.springframework.data.web.PageableDefault; import org.springframework.http.ResponseEntity; +import org.springframework.lang.Nullable; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; @@ -52,7 +53,7 @@ public ResponseEntity updatePost( @GetMapping("") public ResponseEntity> getPosts( @LoginUser SessionUser sessionUser, - @RequestParam(value = "category") PostType postType, + @RequestParam(value = "category") @Nullable PostType postType, @PageableDefault( size = 12, sort = "id", From e4b39c7dcee7270207a775e5fdd667cd0d8be891 Mon Sep 17 00:00:00 2001 From: sbhong Date: Wed, 1 Jun 2022 10:18:09 +0900 Subject: [PATCH 4/5] hotfix: fix api path --- .../or/cola/backend/post/post/presentation/PostController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java b/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java index 0707553..10fdc3c 100644 --- a/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java +++ b/src/main/java/kr/or/cola/backend/post/post/presentation/PostController.java @@ -84,7 +84,7 @@ public ResponseEntity getPost( return ResponseEntity.ok(postResponse); } - @GetMapping("/{keyword}") + @GetMapping("/search/{keyword}") public ResponseEntity> searchPosts( @LoginUser SessionUser sessionUser, @PathVariable String keyword, From 90eff3f2ec3e41b9fbaa4ce8dbfcdd429f645ce7 Mon Sep 17 00:00:00 2001 From: kevindec18 Date: Fri, 10 Jun 2022 00:49:02 +0900 Subject: [PATCH 5/5] fix: mailsender --- src/main/java/kr/or/cola/backend/util/CustomMailSender.java | 3 ++- src/main/resources/application.properties | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/kr/or/cola/backend/util/CustomMailSender.java b/src/main/java/kr/or/cola/backend/util/CustomMailSender.java index 38dc54e..83d5141 100644 --- a/src/main/java/kr/or/cola/backend/util/CustomMailSender.java +++ b/src/main/java/kr/or/cola/backend/util/CustomMailSender.java @@ -10,6 +10,7 @@ import org.thymeleaf.context.Context; import org.thymeleaf.spring5.SpringTemplateEngine; +import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; @@ -28,7 +29,7 @@ public void sendAuthenticationToken(String authToken, String receiverEmail) { mailMessage.setTo(receiverEmail); mailMessage.setSubject("회원가입 이메일 인증"); mailMessage.setText(authToken); - + mailMessage.setFrom(managerEmail); sendEmail(mailMessage); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 18a2463..77103c9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -32,6 +32,8 @@ spring.mail.properties.mail.smtp.auth=true spring.mail.properties.mail.smtp.connectiontimeout=5000 spring.mail.properties.mail.smtp.timeout=5000 spring.mail.properties.mail.smtp.writetimeout=5000 +spring.mail.properties.mail.ssl.enable=true +spring.mail.properties.mail.ssl.trust=true spring.data.web.pageable.default-page-size=12