Merge pull request #85 from eureca-final-capstone-project/develop

main 병합

Author: Jang-GO

build.gradle

@@ -50,6 +50,9 @@ dependencies {
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
     runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
 
+    // ElasticSearch
+    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
+
     // Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 

src/main/java/eureca/capstone/project/admin/report/service/impl/RestrictionServiceImpl.java

@@ -17,8 +17,10 @@
 import eureca.capstone.project.admin.report.repository.RestrictionAuthorityRepository;
 import eureca.capstone.project.admin.report.repository.RestrictionTargetRepository;
 import eureca.capstone.project.admin.report.service.RestrictionService;
+import eureca.capstone.project.admin.transaction_feed.document.TransactionFeedDocument;
 import eureca.capstone.project.admin.transaction_feed.entity.TransactionFeed;
 import eureca.capstone.project.admin.transaction_feed.repository.TransactionFeedRepository;
+import eureca.capstone.project.admin.transaction_feed.repository.TransactionFeedSearchRepository;
 import eureca.capstone.project.admin.user.entity.User;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +47,7 @@ public class RestrictionServiceImpl implements RestrictionService {
     private final TransactionFeedRepository transactionFeedRepository;
     private final StatusManager statusManager;
     private final UserAuthorityRepository userAuthorityRepository;
+    private final TransactionFeedSearchRepository transactionFeedSearchRepository;
     private final RedisService redisService;
 
     @Override
@@ -138,6 +141,16 @@ public void acceptRestrictions(Long restrictionTargetId) {
         transactionFeedRepository.saveAll(transactionFeedsToBlur);
         log.info("[acceptRestrictions] 연관된 게시글 {}건의 상태를 'BLURRED'로 변경했습니다.", transactionFeedsToBlur.size());
 
+        try {
+            List<TransactionFeedDocument> documentsToUpdate = transactionFeedsToBlur.stream()
+                    .map(TransactionFeedDocument::fromEntity) // TransactionFeed 엔티티를 Document로 변환
+                    .toList();
+            transactionFeedSearchRepository.saveAll(documentsToUpdate);
+            log.info("[acceptRestrictions] Elasticsearch의 게시글 문서 {}건을 동기화(BLURRED)했습니다.", documentsToUpdate.size());
+        } catch (Exception e) {
+            log.error("[acceptRestrictions] Elasticsearch 동기화 중 오류 발생: {}", e.getMessage());
+        }
+
         try {
             String key = "BlackListUser:" + user.getUserId();
             redisService.setValue(key, "restricted", 1, TimeUnit.HOURS);

src/main/java/eureca/capstone/project/admin/transaction_feed/document/TransactionFeedDocument.java

@@ -0,0 +1,87 @@
+package eureca.capstone.project.admin.transaction_feed.document;
+
+import eureca.capstone.project.admin.transaction_feed.entity.TransactionFeed;
+import jakarta.persistence.Id;
+import java.time.LocalDateTime;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+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.Setting;
+
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Document(indexName = "transaction_feed")
+@Setting(settingPath = "elasticsearch/analyzer-settings.json")
+public class TransactionFeedDocument {
+
+    @Id
+    private Long id;
+
+    @Field(type = FieldType.Text, analyzer = "nori")
+    private String title;
+
+    @Field(type = FieldType.Text, analyzer = "nori")
+    private String content;
+
+    @Field(type = FieldType.Long)
+    private Long salesPrice;
+
+    @Field(type = FieldType.Long)
+    private Long salesDataAmount;
+
+    @Field(type = FieldType.Keyword)
+    private Long sellerId;
+
+    @Field(type = FieldType.Keyword)
+    private String nickname;
+
+    @Field(type = FieldType.Keyword)
+    private Long telecomCompanyId;
+
+    @Field(type = FieldType.Text, analyzer = "nori")
+    private String telecomCompanyName; // 검색용
+
+    @Field(type = FieldType.Keyword)
+    private Long salesTypeId;
+
+    @Field(type = FieldType.Keyword)
+    private String status;
+
+    @Field(type = FieldType.Long)
+    private Long defaultImageNumber;
+
+    @Field(type = FieldType.Date, format = {}, pattern = "uuuu-MM-dd'T'HH:mm:ss.SSS")
+    private LocalDateTime createdAt;
+
+    @Field(type = FieldType.Date, format = {}, pattern = "uuuu-MM-dd'T'HH:mm:ss.SSS")
+    private LocalDateTime expiresAt;
+
+    @Field(type = FieldType.Boolean)
+    private boolean isDeleted;
+
+    public static TransactionFeedDocument fromEntity(TransactionFeed transactionFeed) {
+        return TransactionFeedDocument.builder()
+                .id(transactionFeed.getTransactionFeedId())
+                .title(transactionFeed.getTitle())
+                .content(transactionFeed.getContent())
+                .salesPrice(transactionFeed.getSalesPrice())
+                .salesDataAmount(transactionFeed.getSalesDataAmount())
+                .sellerId(transactionFeed.getUser().getUserId())
+                .nickname(transactionFeed.getUser().getNickname())
+                .telecomCompanyId(transactionFeed.getTelecomCompany().getTelecomCompanyId())
+                .telecomCompanyName(transactionFeed.getTelecomCompany().getName())
+                .salesTypeId(transactionFeed.getSalesType().getSalesTypeId())
+                .status(transactionFeed.getStatus().getCode())
+                .defaultImageNumber(transactionFeed.getDefaultImageNumber())
+                .createdAt(transactionFeed.getCreatedAt())
+                .expiresAt(transactionFeed.getExpiresAt())
+                .isDeleted(transactionFeed.isDeleted())
+                .build();
+    }
+}

src/main/java/eureca/capstone/project/admin/transaction_feed/repository/TransactionFeedSearchRepository.java

@@ -0,0 +1,7 @@
+package eureca.capstone.project.admin.transaction_feed.repository;
+
+import eureca.capstone.project.admin.transaction_feed.document.TransactionFeedDocument;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+
+public interface TransactionFeedSearchRepository extends ElasticsearchRepository<TransactionFeedDocument, Long> {
+}

src/main/resources/application.yml

@@ -23,6 +23,8 @@ spring:
       host: 13.124.223.23
       port: 6379
       password: ureca!#%!#
+  elasticsearch:
+    uris: http://13.124.136.141:9200
 
 springdoc:
   packages-to-scan: eureca.capstone.project.admin