Fix: 엘라스틱 수정

Author: kknaks

src/main/java/org/com/stocknote/domain/portfolio/note/controller/NoteController.java

@@ -26,7 +26,17 @@ public GlobalResponse<List<NoteResponse>> getNote(@PathVariable("portfolio_no")
   }
 
   @GetMapping("/allNote")
-  public GlobalResponse<List<NoteResponse>> getNoteList() {
+  public GlobalResponse<List<NoteResponse>> getNoteList(
+
+  ) {
+    List<Note> noteList = noteService.getNoteList();
+    List<NoteResponse> response = noteList.stream().map(NoteResponse::from).collect(Collectors.toList());
+    return GlobalResponse.success(response);
+  }
+
+  @GetMapping("/allNote/forTest")
+  public GlobalResponse<List<NoteResponse>> getAllNoteList(
+  ) {
     List<Note> noteList = noteService.getNoteList();
     List<NoteResponse> response = noteList.stream().map(NoteResponse::from).collect(Collectors.toList());
     return GlobalResponse.success(response);

src/main/java/org/com/stocknote/domain/portfolio/portfolioStock/controller/PfStockController.java

@@ -14,8 +14,6 @@
 public class PfStockController {
   private final PfStockService pfStockService;
 
-
-
   @PostMapping("/AddStock")
   public GlobalResponse<String> addPortfolioStock(@PathVariable("portfolio_no") Long portfolioNo,
       @RequestBody PfStockRequest pfStockRequest) {

src/main/java/org/com/stocknote/domain/post/repository/PostSearchRepositoryImpl.java

@@ -8,13 +8,16 @@
 import org.com.stocknote.domain.member.entity.QMember;
 import org.com.stocknote.domain.post.dto.PostSearchConditionDto;
 import org.com.stocknote.domain.post.entity.Post;
+import org.com.stocknote.domain.post.entity.PostCategory;
 import org.com.stocknote.domain.post.entity.QPost;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;
 
+import java.util.Locale;
+
 @Repository
 @RequiredArgsConstructor
 public class PostSearchRepositoryImpl implements PostSearchRepository {
@@ -28,9 +31,17 @@ public Page<Post> search(PostSearchConditionDto condition, Pageable pageable) {
 
         BooleanBuilder builder = new BooleanBuilder();
 
-//        if (condition.getCategory() != null) {
-//            builder.and(post.category.eq(condition.getCategory()));
-//        }
+        if (condition.getCategory() != null) {
+            try {
+                PostCategory categoryEnum = PostCategory.valueOf(condition.getCategory());
+                builder.and(post.category.eq(categoryEnum));
+            } catch (IllegalArgumentException e) {
+                // 잘못된 카테고리 문자열이 들어온 경우의 처리
+                // 1. 무시하고 지나가거나
+                // 2. 예외를 던지거나
+                // 3. 기본 카테고리로 설정하는 등의 처리가 가능
+            }
+        }
 
         if (StringUtils.hasText(condition.getKeyword())) {
             switch (condition.getSearchType()) {

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

@@ -5,14 +5,14 @@
 import jakarta.persistence.Id;
 import lombok.*;
 import org.com.stocknote.domain.post.entity.PostCategory;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.*;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
 @Document(indexName = "stocknote_post", createIndex = true)
+@Setting(settingPath = "/elasticsearch/settings.json")
+@Mapping(mappingPath = "/elasticsearch/mappings.json")
 @Getter
 @Setter
 @Builder

src/main/java/org/com/stocknote/domain/stock/entity/Stock.java

@@ -20,6 +20,10 @@
 public class Stock {
     @Id
     private String code;
+
+    @Column(name = "stock_index")
+    private Long stockIndex;  // AUTO_INCREMENT는 DB에서 관리
+
     private String name;
     private String market;
 

src/main/resources/elasticsearch/logstash/config/keyword.conf

@@ -0,0 +1,47 @@
+input {
+  jdbc {
+    jdbc_driver_library => "/usr/share/logstash/logstash-core/lib/jars/mysql-connector-j-9.2.0.jar"
+    jdbc_driver_class => "com.mysql.cj.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mysql://43.203.126.129:3306/default_db"
+    jdbc_user => "root"
+    jdbc_password => "1234"
+    schedule => "* * * * *"
+    sql_log_level => "debug"
+    tracking_column => "id"
+    use_column_value => true
+    record_last_run => true
+    last_run_metadata_path => "/usr/share/logstash/metadata/keyword_last_run"
+    statement => "SELECT id, member_id, keyword, post_category FROM keyword"
+    type => "keyword"
+    clean_run => false
+    jdbc_validate_connection => true
+  }
+}
+
+filter {
+  if [type] == "keyword" {
+    mutate {
+      remove_field => ["@version", "@timestamp", "jdbc_connection_string", "jdbc_user", "jdbc_password"]
+
+      # Convert post_category to uppercase to match enum
+      convert => {
+        "post_category" => "uppercase"
+      }
+    }
+  }
+}
+
+output {
+  elasticsearch {
+    hosts => ["elasticsearch:9200"]
+    index => "stocknote_keyword"
+    document_id => "%{id}"
+    retry_on_conflict => 3
+  }
+
+  stdout {
+    codec => rubydebug {
+      metadata => true
+    }
+  }
+}

src/main/resources/elasticsearch/logstash/config/member.conf

@@ -0,0 +1,40 @@
+input {
+  jdbc {
+    jdbc_driver_library => "/usr/share/logstash/logstash-core/lib/jars/mysql-connector-j-9.2.0.jar"
+    jdbc_driver_class => "com.mysql.cj.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mysql://43.203.126.129:3306/default_db"
+    jdbc_user => "root"
+    jdbc_password => "1234"
+    schedule => "*/10 * * * * *"
+    sql_log_level => "debug"
+    tracking_column => "id"
+    use_column_value => true
+    record_last_run => true
+    last_run_metadata_path => "/usr/share/logstash/metadata/member_last_run"
+    statement => "SELECT id, email, name, profile, provider, provider_id FROM member"
+    type => "member"
+    clean_run => false
+    jdbc_validate_connection => true
+  }
+}
+
+filter {
+  if [type] == "member" {
+    mutate {
+      remove_field => ["@version", "@timestamp","jdbc_connection_string", "jdbc_user", "jdbc_password"]
+    }
+  }
+}
+
+output {
+  elasticsearch {
+    hosts => ["elasticsearch:9200"]
+    index => "stocknote_member"
+    document_id => "%{id}"
+    retry_on_conflict => 3
+  }
+
+  stdout {
+    codec => rubydebug { metadata => true }
+  }
+}

src/main/resources/elasticsearch/logstash/config/pfstock.conf

@@ -0,0 +1,64 @@
+input {
+  jdbc {
+    jdbc_driver_library => "/usr/share/logstash/logstash-core/lib/jars/mysql-connector-j-9.2.0.jar"
+    jdbc_driver_class => "com.mysql.cj.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mysql://43.203.126.129:3306/default_db"
+    jdbc_user => "root"
+    jdbc_password => "1234"
+    schedule => "*/10 * * * * *"
+    sql_log_level => "debug"
+    tracking_column => "id"
+    use_column_value => true
+    record_last_run => true
+    last_run_metadata_path => "/usr/share/logstash/metadata/pfstock_last_run"
+    statement => "
+      SELECT
+        pfs.id,
+        pfs.pfstock_count,
+        pfs.pfstock_price,
+        pfs.pfstock_total_price,
+        pfs.current_price,
+        pfs.idx_bztp_scls_cd_name,
+        p.member_id,
+        JSON_OBJECT(
+          'code', s.code,
+          'name', s.name,
+          'market', s.market
+        ) as stock_doc
+      FROM pf_stock pfs
+      JOIN portfolio p ON pfs.portfolio_id = p.id
+      JOIN stock s ON pfs.stock_code = s.code"
+    type => "pfstock"
+    clean_run => false
+    jdbc_validate_connection => true
+  }
+}
+
+filter {
+  if [type] == "pfstock" {
+    mutate {
+      remove_field => ["@version", "@timestamp", "jdbc_connection_string", "jdbc_user", "jdbc_password"]
+
+      convert => {
+        "pfstock_count" => "integer"
+        "pfstock_price" => "integer"
+        "pfstock_total_price" => "integer"
+        "current_price" => "integer"
+      }
+    }
+
+    json {
+      source => "stockDoc"
+      target => "stockDoc"
+    }
+  }
+}
+
+output {
+  elasticsearch {
+    hosts => ["elasticsearch:9200"]
+    index => "stocknote_pfstock"
+    document_id => "%{id}"
+    retry_on_conflict => 3
+  }
+}

src/main/resources/elasticsearch/logstash/config/portfolio.conf

@@ -0,0 +1,52 @@
+input {
+  jdbc {
+    jdbc_driver_library => "/usr/share/logstash/logstash-core/lib/jars/mysql-connector-j-9.2.0.jar"
+    jdbc_driver_class => "com.mysql.cj.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mysql://43.203.126.129:3306/default_db"
+    jdbc_user => "root"
+    jdbc_password => "1234"
+    schedule => "*/10 * * * * *"
+    sql_log_level => "debug"
+    tracking_column => "member_id"
+    use_column_value => true
+    record_last_run => true
+    last_run_metadata_path => "/usr/share/logstash/metadata/portfolio_last_run"
+    statement => "
+      SELECT
+        p.member_id,
+        SUM(p.total_asset) as total_asset,
+        SUM(p.cash) as total_cash,
+        SUM(p.total_profit) as total_profit,
+        SUM(p.total_stock) as total_stock
+      FROM portfolio p
+      GROUP BY p.member_id
+      "
+    type => "portfolio"
+    clean_run => false
+    jdbc_validate_connection => true
+  }
+}
+
+filter {
+  if [type] == "portfolio" {
+    mutate {
+      remove_field => ["@version", "@timestamp","jdbc_connection_string", "jdbc_user", "jdbc_password"]
+
+      convert => {
+        "total_asset" => "integer"
+        "total_cash" => "integer"
+        "total_profit" => "integer"
+        "total_stock" => "integer"
+      }
+    }
+  }
+}
+
+output {
+  elasticsearch {
+    hosts => ["elasticsearch:9200"]
+    index => "stocknote_portfolio"
+    document_id => "%{member_id}"
+    retry_on_conflict => 3
+  }
+}

src/main/resources/elasticsearch/logstash/config/post.conf

@@ -0,0 +1,62 @@
+input {
+  jdbc {
+    jdbc_driver_library => "/usr/share/logstash/logstash-core/lib/jars/mysql-connector-j-9.2.0.jar"
+    jdbc_driver_class => "com.mysql.cj.jdbc.Driver"
+    jdbc_connection_string => "jdbc:mysql://43.203.126.129:3306/default_db"
+    jdbc_user => "root"
+    jdbc_password => "1234"
+    schedule => "*/10 * * * * *"
+    sql_log_level => "debug"
+    tracking_column => "id"
+    use_column_value => true
+    record_last_run => true
+    last_run_metadata_path => "/usr/share/logstash/metadata/post_last_run"
+    statement => "
+        Select
+            p.id,
+            p.created_at,
+            p.modified_at,
+            p.body,
+            p.category,
+            p.title,
+            Json_object(
+                    'id', m.id,
+                    'email', m.email,
+                    'name', m.name,
+                    'provider', m.provider,
+                    'provider_id', m.provider_id,
+                    'profile', m.profile
+            ) as member_doc,
+            (SELECT JSON_ARRAYAGG(h.name)
+             FROM hashtags h
+             WHERE h.post_id = p.id) as hashtags,
+            (SELECT COUNT(*) FROM comment WHERE post_id = p.id) as comment_count,
+            (SELECT COUNT(*) FROM likes WHERE post_id = p.id) as like_count
+        From posts p
+        JOIN member m ON p.user_id = m.id"
+    type => "post"
+    clean_run => false
+    jdbc_validate_connection => true
+  }
+}
+
+filter {
+  if [type] == "post" {
+    mutate {
+      remove_field => ["@version", "@timestamp","jdbc_connection_string", "jdbc_user", "jdbc_password"]
+    }
+  }
+}
+
+output {
+  elasticsearch {
+    hosts => ["elasticsearch:9200"]
+    index => "stocknote_post"
+    document_id => "%{id}"
+    retry_on_conflict => 3
+  }
+
+  stdout {
+    codec => rubydebug { metadata => true }
+  }
+}