Merge pull request #69 from BackEndSchoolPlus3th/SMS-83-feature-keywordnotES

add: keyword alarm with elastic search

Author: hohosznta

src/main/java/org/com/stocknote/domain/keyword/controller/KeywordController.java

@@ -7,6 +7,7 @@
 import org.com.stocknote.domain.keyword.dto.KeywordResponse;
 import org.com.stocknote.domain.keyword.service.KeywordService;
 import org.com.stocknote.domain.member.entity.Member;
+import org.com.stocknote.domain.searchDoc.service.KeywordDocService;
 import org.com.stocknote.oauth.entity.PrincipalDetails;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -19,6 +20,7 @@
 public class KeywordController {
 
     private final KeywordService keywordService;
+    private final KeywordDocService keywordDocService;
 
     // 키워드 전체 조회
     @GetMapping("/keywords")
@@ -40,6 +42,7 @@ public ResponseEntity<KeywordResponse> updateKeywords(
     ) {
         Member member = principalDetails.user();
         KeywordResponse response = keywordService.updateKeywords(member, request);
+        keywordDocService.save(member, request);
         return ResponseEntity.ok(response);
     }
 }

src/main/java/org/com/stocknote/domain/notification/controller/KeywordNotificationController.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.com.stocknote.domain.notification.dto.KeywordNotificationResponse;
+import org.com.stocknote.domain.notification.service.KeywordNotificationElasticService;
 import org.com.stocknote.domain.notification.service.KeywordNotificationService;
 import org.com.stocknote.oauth.entity.PrincipalDetails;
 import org.springframework.http.ResponseEntity;

src/main/java/org/com/stocknote/domain/notification/service/KeywordNotificationElasticService.java

@@ -1,20 +1,18 @@
 package org.com.stocknote.domain.notification.service;
 
 import lombok.RequiredArgsConstructor;
-import org.com.stocknote.domain.hashtag.service.HashtagService;
 import org.com.stocknote.domain.keyword.entity.Keyword;
 import org.com.stocknote.domain.keyword.repository.KeywordRepository;
 import org.com.stocknote.domain.notification.dto.KeywordNotificationResponse;
 import org.com.stocknote.domain.notification.entity.KeywordNotification;
 import org.com.stocknote.domain.notification.repository.KeywordNotificationRepository;
-import org.com.stocknote.domain.post.entity.Post;
 import org.com.stocknote.domain.post.entity.PostCategory;
+import org.com.stocknote.domain.searchDoc.document.KeywordDoc;
 import org.com.stocknote.domain.searchDoc.document.PostDoc;
+import org.com.stocknote.domain.searchDoc.repository.KeywordDocRepository;
 import org.com.stocknote.domain.searchDoc.repository.PostDocRepository;
 import org.com.stocknote.global.error.ErrorCode;
 import org.com.stocknote.global.exception.CustomException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -26,64 +24,52 @@
 @RequiredArgsConstructor
 public class KeywordNotificationElasticService {
     private final KeywordRepository keywordRepository;
+    private final KeywordDocRepository keywordDocRepository;
     private final KeywordNotificationRepository keywordNotificationRepository;
     private final SseEmitterService sseEmitterService;
     private final PostDocRepository postDocRepository;
 
     @Transactional
     public void createKeywordNotification(PostDoc postDoc) {
-        // 카테고리에 맞는 키워드 구독자 조회
-        List<Keyword> keywords;
-        if (postDoc.getCategory() == PostCategory.ALL) {
-            keywords = keywordRepository.findAll();
-        } else {
-            keywords = keywordRepository.findAllByPostCategory(postDoc.getCategory());
-        }
+        // Elasticsearch로 매칭되는 키워드 한 번에 조회
+        System.out.println("postDoc = " + postDoc);
+        System.out.println("postCategory = " + postDoc.getCategory());
+        System.out.println("postDoc = " + postDoc.getHashtags());
 
-        // 각 키워드별로 매칭 확인
-        keywords.forEach(keyword -> {
-            if (postDocRepository.existsByTitleOrHashtagsContaining(keyword.getKeyword())) {
-                KeywordNotification keywordNotification = KeywordNotification.builder()
-                    .memberId(keyword.getMemberId())
+        List<KeywordDoc> matchingKeywords = keywordDocRepository.findMatchingKeywords(
+                postDoc.getCategory(),
+                postDoc.getTitle(),
+                String.join(" ", postDoc.getHashtags())
+        );
+
+        System.out.println("matchingKeywords = " + matchingKeywords);
+
+        // 매칭된 키워드에 대해 알림 생성
+        matchingKeywords.forEach(keywordDoc -> {
+            KeywordNotification notification = KeywordNotification.builder()
+                    .memberId(keywordDoc.getMemberId())
                     .relatedPostId(Long.valueOf(postDoc.getId()))
-                    .keyword(keyword.getKeyword())
-                    .postCategory(keyword.getPostCategory())
+                    .keyword(keywordDoc.getKeyword())
+                    .postCategory(keywordDoc.getPostCategory())
                     .isRead(false)
-                    .content(createNotificationContent(postDoc, keyword.getKeyword()))
+                    .content(createNotificationContent(postDoc, keywordDoc.getKeyword()))
                     .build();
 
-                keywordNotificationRepository.save(keywordNotification);
+            keywordNotificationRepository.save(notification);
 
-                // SSE로 실시간 알림 전송
-                sseEmitterService.sendKeywordNotification(
-                    keyword.getMemberId().toString(),
-                    KeywordNotificationResponse.from(keywordNotification)
-                );
-            }
+            // SSE로 실시간 알림 전송
+            sseEmitterService.sendKeywordNotification(
+                    keywordDoc.getMemberId().toString(),
+                    KeywordNotificationResponse.from(notification)
+            );
         });
     }
 
     private String createNotificationContent(PostDoc postDoc, String keyword) {
         return String.format("'%s' 키워드와 관련된 게시글이 등록되었습니다: %s",
-            keyword,
-            postDoc.getTitle()
+                keyword,
+                postDoc.getTitle()
         );
     }
 
-    public List<KeywordNotificationResponse> getNotificationsByMember(Long memberId) {
-        LocalDateTime startDate = LocalDateTime.now().minusDays(30);
-        return keywordNotificationRepository.findByMemberIdAndIsReadFalseAndCreatedAtAfterOrderByCreatedAtDesc(
-                memberId,
-                startDate
-            )
-            .stream()
-            .map(KeywordNotificationResponse::from)
-            .collect(Collectors.toList());
-    }
-
-    public void markAsRead(Long notificationId) {
-        KeywordNotification keywordNotification = keywordNotificationRepository.findById(notificationId)
-            .orElseThrow(() -> new CustomException(ErrorCode.ENTITY_NOT_FOUND));
-        keywordNotification.markAsRead();
-    }
 }

src/main/java/org/com/stocknote/domain/post/controller/PostController.java

@@ -2,18 +2,20 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.transaction.Transactional;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.com.stocknote.domain.member.entity.Member;
 import org.com.stocknote.domain.notification.service.KeywordNotificationElasticService;
 import org.com.stocknote.domain.notification.service.KeywordNotificationService;
-import org.com.stocknote.domain.post.dto.PostCreateDto;
 import org.com.stocknote.domain.post.dto.PostModifyDto;
 import org.com.stocknote.domain.post.dto.PostResponseDto;
 import org.com.stocknote.domain.post.entity.Post;
 import org.com.stocknote.domain.post.dto.PostSearchConditionDto;
 import org.com.stocknote.domain.post.entity.PostCategory;
 import org.com.stocknote.domain.post.service.PostService;
+import org.com.stocknote.domain.searchDoc.document.PostDoc;
+import org.com.stocknote.domain.searchDoc.service.SearchDocService;
 import org.com.stocknote.global.dto.GlobalResponse;
 import org.com.stocknote.oauth.entity.PrincipalDetails;
 import org.springframework.data.domain.Page;
@@ -23,7 +25,6 @@
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
-import static org.com.stocknote.domain.post.entity.QPost.post;
 
 @RestController
 @RequestMapping("/api/v1/posts")
@@ -32,18 +33,21 @@
 public class PostController {
 
     private final PostService postService;
+    private final SearchDocService searchDocService;
     private final KeywordNotificationService keywordNotificationService;
     private final KeywordNotificationElasticService keywordNotificationElasticService;
 
+    @Transactional
     @PostMapping
     @Operation(summary = "게시글 작성")
     public GlobalResponse<Long> createPost(
-            @Valid @RequestBody PostCreateDto postCreateDto,
+            @Valid @RequestBody PostResponseDto postResponseDto,
             @AuthenticationPrincipal PrincipalDetails principalDetails
     ) {
         Member member = principalDetails.user();
-        Post post = postService.createPost(postCreateDto, member);
-        keywordNotificationService.createKeywordNotification(post);
+        Post post = postService.createPost(postResponseDto, member);
+        PostDoc postDoc= searchDocService.savePostDoc(post);
+        keywordNotificationElasticService.createKeywordNotification(postDoc);
         return GlobalResponse.success(post.getId());
     }
 

src/main/java/org/com/stocknote/domain/post/dto/PostCreateDto.java

@@ -3,6 +3,7 @@
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
+import org.com.stocknote.domain.comment.entity.Comment;
 import org.com.stocknote.domain.member.entity.Member;
 import org.com.stocknote.domain.post.entity.Post;
 import org.com.stocknote.domain.post.entity.PostCategory;

src/main/java/org/com/stocknote/domain/post/dto/PostModifyDto.java

@@ -1,11 +1,13 @@
 package org.com.stocknote.domain.post.dto;
 
 import org.com.stocknote.domain.comment.dto.CommentDetailResponse;
+import org.com.stocknote.domain.member.entity.Member;
 import org.com.stocknote.domain.post.entity.Post;
 import org.com.stocknote.domain.post.entity.PostCategory;
 import org.com.stocknote.domain.searchDoc.document.PostDoc;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 public record PostResponseDto(
@@ -59,4 +61,16 @@ public static PostResponseDto fromPost(PostDoc postDoc) {
             postDoc.getCommentCount()
         );
     }
+
+    public Post toEntity(Member member) {
+        return Post.builder()
+                .title(this.title)
+                .body(this.body)
+                .category(this.category)
+                .member(member)       // 연관관계 설정
+                .comments(new ArrayList<>())  // 빈 리스트로 초기화
+                .likes(new ArrayList<>())     // 빈 리스트로 초기화
+                .build();
+    }
+
 }

src/main/java/org/com/stocknote/domain/post/dto/PostResponseDto.java

@@ -7,7 +7,6 @@
 import org.com.stocknote.domain.member.entity.Member;
 import org.com.stocknote.domain.notification.repository.CommentNotificationRepository;
 import org.com.stocknote.domain.notification.repository.KeywordNotificationRepository;
-import org.com.stocknote.domain.post.dto.PostCreateDto;
 import org.com.stocknote.domain.post.dto.PostModifyDto;
 import org.com.stocknote.domain.post.dto.PostResponseDto;
 import org.com.stocknote.domain.post.dto.PostSearchConditionDto;
@@ -38,12 +37,12 @@ public class PostService {
 
 
     @Transactional
-    public Post createPost(PostCreateDto postCreateDto, Member member) {
+    public Post createPost(PostResponseDto postResponseDto, Member member) {
 
-        Post post = postCreateDto.toEntity(member);
+        Post post = postResponseDto.toEntity(member);
         Post savedPost = postRepository.save(post);
 
-        hashtagService.createHashtags(savedPost.getId(), postCreateDto.getHashtags());
+        hashtagService.createHashtags(savedPost.getId(), postResponseDto.hashtags());
         return post;
     }
 

src/main/java/org/com/stocknote/domain/post/service/PostService.java

@@ -0,0 +1,37 @@
+package org.com.stocknote.domain.searchDoc.document;
+
+import lombok.*;
+import org.springframework.data.annotation.Id;
+import org.com.stocknote.domain.keyword.entity.Keyword;
+import org.com.stocknote.domain.post.entity.PostCategory;
+import org.springframework.data.elasticsearch.annotations.*;
+
+@Document(indexName = "stocknote_keyword")
+@Getter
+@Setter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class KeywordDoc {
+    @Id
+    private String id;
+
+    @Field(type = FieldType.Text)
+    private String keyword;
+
+    @Field(type = FieldType.Long, name = "member_id")
+    private Long memberId;
+
+    @Field(type = FieldType.Keyword, name="post_category")
+    private PostCategory postCategory;
+
+    public static KeywordDoc from(Keyword keyword) {
+        return KeywordDoc.builder()
+                .id(String.valueOf(keyword.getId()))
+                .keyword(keyword.getKeyword())
+                .memberId(keyword.getMemberId())
+                .postCategory(keyword.getPostCategory())
+                .build();
+    }
+}
+

src/main/java/org/com/stocknote/domain/searchDoc/document/KeywordDoc.java

@@ -0,0 +1,41 @@
+package org.com.stocknote.domain.searchDoc.repository;
+
+import org.com.stocknote.domain.post.entity.PostCategory;
+import org.com.stocknote.domain.searchDoc.document.KeywordDoc;
+import org.springframework.data.elasticsearch.annotations.Query;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+
+public interface KeywordDocRepository extends ElasticsearchRepository<KeywordDoc, String> {
+    @Query("""
+    {
+      "bool": {
+        "must": [
+          {
+            "bool": {
+              "should": [
+                {"match": {"post_category": "#{#postCategory}"}},
+                {"match": {"post_category": "ALL"}}
+              ]
+            }
+          },
+          {
+            "bool": {
+              "should": [
+                {"match": {"keyword": "#{#title}"}},
+                {"match": {"keyword": "#{#hashtags}"}}
+              ]
+            }
+          }
+        ]
+      }
+    }
+    """)
+    List<KeywordDoc> findMatchingKeywords(
+            @Param("postCategory") PostCategory postCategory,
+            @Param("title") String title,
+            @Param("hashtags") String hashtags
+    );
+}