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' 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 a881b84..c66cd6e 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 findByUserId(Long userId, Pageable pageable); 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..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 @@ -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", @@ -83,7 +84,7 @@ public ResponseEntity getPost( return ResponseEntity.ok(postResponse); } - @GetMapping("/{keyword}") + @GetMapping("/search/{keyword}") public ResponseEntity> searchPosts( @LoginUser SessionUser sessionUser, @PathVariable String keyword, 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 72e56bf..6ddfaa2 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( 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