Merge pull request #16 from CarToi/dev

[Feat/refactor consume] 데이터 소비 로직 리팩토링 보완 1

Author: kimD0ngjun

build.gradle

@@ -53,6 +53,10 @@ dependencies {
 
     // discord
     implementation 'net.dv8tion:JDA:5.6.1'
+
+    // caffeine cache
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'com.github.ben-manes.caffeine:caffeine'
 }
 
 test {

src/main/java/org/jun/saemangeum/consume/controller/SurveyController.java

@@ -1,11 +1,10 @@
 package org.jun.saemangeum.consume.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.jun.saemangeum.consume.domain.dto.AverageRequest;
 import org.jun.saemangeum.consume.domain.dto.RecommendationResponse;
 import org.jun.saemangeum.consume.domain.dto.SurveyCreateRequest;
 import org.jun.saemangeum.consume.domain.dto.SurveyUpdateRequest;
-import org.jun.saemangeum.consume.service.SurveyRecommendationService;
+import org.jun.saemangeum.consume.service.application.SurveyRecommendationService;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -32,12 +31,4 @@ public List<RecommendationResponse> createSurvey(@RequestBody SurveyCreateReques
     public void updateSurvey(@RequestBody SurveyUpdateRequest request) {
         surveyRecommendationService.updateSurvey(request);
     }
-
-    /**
-     * 평균 사용자 설문 응답 확인 응답 데이터 리스트 반환
-     */
-    @GetMapping("/average")
-    public List<RecommendationResponse> readAverageSurvey(@RequestBody AverageRequest request) {
-        return surveyRecommendationService.calculateAverageSurvey(request);
-    }
 }

src/main/java/org/jun/saemangeum/consume/domain/entity/RecommendationLog.java

@@ -5,7 +5,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import org.jun.saemangeum.global.domain.Content;
+import org.jun.saemangeum.global.domain.IContent;
 
 @Entity
 @Builder
@@ -18,14 +18,14 @@ public class RecommendationLog {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "content_id")
-    private Long contentId;
+    @Column(name = "content_title")
+    private String contentTitle;
 
     @Column(name = "survey_id")
     private Long surveyId;
 
-    public RecommendationLog(Content content, Survey survey) {
-        this.contentId = content.getId();
+    public RecommendationLog(IContent content, Survey survey) {
+        this.contentTitle = content.getTitle();
         this.surveyId = survey.getId();
     }
 }

src/main/java/org/jun/saemangeum/consume/domain/swap/ContentView.java

@@ -0,0 +1,52 @@
+package org.jun.saemangeum.consume.domain.swap;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+import org.jun.saemangeum.consume.domain.dto.RecommendationResponse;
+import org.jun.saemangeum.global.domain.Category;
+import org.jun.saemangeum.global.domain.CollectSource;
+import org.jun.saemangeum.global.domain.IContent;
+
+@Getter
+@Entity
+@Table(name = "contents_view")
+public class ContentView implements IContent {
+    @Id
+    private Long id;
+
+    @Column(nullable = false)
+    private String title;
+
+    @Column(nullable = false)
+    private String position;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
+    private Category category;
+
+    @Column
+    private String image;
+
+    @Column
+    private String url;
+
+    @Lob // MySQL 등에서는 TEXT 등으로
+    @Column(columnDefinition = "TEXT")
+    private String introduction;
+
+    @Column
+    private CollectSource collectSource;
+
+    @OneToOne(mappedBy = "contentView")
+    private VectorView vectorView;
+
+    @Override
+    public RecommendationResponse to() {
+        return new RecommendationResponse(title, position, category, image, url);
+    }
+
+    @Override
+    public String getTitle() {
+        return title;
+    }
+}

src/main/java/org/jun/saemangeum/consume/domain/swap/VectorView.java

@@ -0,0 +1,28 @@
+package org.jun.saemangeum.consume.domain.swap;
+
+import jakarta.persistence.*;
+import lombok.Getter;
+
+@Getter
+@Entity
+@Table(
+        name = "vectors_view",
+        indexes = @Index(name = "fk_vector_view", columnList = "content_id") // 외래키 제약조건 제거로 직접 인덱스 세팅
+)
+public class VectorView {
+    @Id
+    private Long id;
+
+    @Lob
+    @Column(columnDefinition = "BLOB")
+    private byte[] vector;
+
+    @OneToOne
+    @JoinColumn(
+            name = "content_id",
+            insertable = false,
+            updatable = false,
+            foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT) // 외래키 제약조건 제거
+    )
+    private ContentView contentView;
+}

…ository/RecommendationLogRepository.java …/entity/RecommendationLogRepository.javasrc/main/java/org/jun/saemangeum/consume/repository/RecommendationLogRepository.java renamed to src/main/java/org/jun/saemangeum/consume/repository/entity/RecommendationLogRepository.java src/main/java/org/jun/saemangeum/consume/repository/RecommendationLogRepository.java renamed to src/main/java/org/jun/saemangeum/consume/repository/entity/RecommendationLogRepository.java

@@ -1,4 +1,4 @@
-package org.jun.saemangeum.consume.repository;
+package org.jun.saemangeum.consume.repository.entity;
 
 import org.jun.saemangeum.consume.domain.entity.RecommendationLog;
 import org.springframework.data.jpa.repository.JpaRepository;

…consume/repository/SurveyRepository.java …/repository/entity/SurveyRepository.javasrc/main/java/org/jun/saemangeum/consume/repository/SurveyRepository.java renamed to src/main/java/org/jun/saemangeum/consume/repository/entity/SurveyRepository.java src/main/java/org/jun/saemangeum/consume/repository/SurveyRepository.java renamed to src/main/java/org/jun/saemangeum/consume/repository/entity/SurveyRepository.java

@@ -1,4 +1,4 @@
-package org.jun.saemangeum.consume.repository;
+package org.jun.saemangeum.consume.repository.entity;
 
 import org.jun.saemangeum.consume.domain.entity.Survey;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/org/jun/saemangeum/consume/repository/swap/ContentViewRepository.java

@@ -0,0 +1,9 @@
+package org.jun.saemangeum.consume.repository.swap;
+
+import org.jun.saemangeum.consume.domain.swap.ContentView;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ContentViewRepository extends JpaRepository<ContentView, Long> {
+}

src/main/java/org/jun/saemangeum/consume/repository/swap/VectorViewRepository.java

@@ -0,0 +1,14 @@
+package org.jun.saemangeum.consume.repository.swap;
+
+import org.jun.saemangeum.consume.domain.swap.VectorView;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface VectorViewRepository extends JpaRepository<VectorView, Long> {
+    @Query("SELECT v FROM VectorView v JOIN FETCH v.contentView")
+    List<VectorView> findAllWithContentView();
+}