♻️ Refactor - 요구사항에 맞게 AI Report 저장형식을 변경한다

oOccasio · web-flow · commit 3b5e2fb0e81b · 2026-03-19T02:46:57.000+09:00
diff --git a/src/main/java/sopt/comfit/report/domain/AIReport.java b/src/main/java/sopt/comfit/report/domain/AIReport.java
@@ -8,7 +8,6 @@
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
 import sopt.comfit.company.domain.Company;
-import sopt.comfit.experience.domain.Experience;
 import sopt.comfit.global.base.BaseTimeEntity;
 
 @Entity
@@ -20,6 +19,24 @@ public class AIReport extends BaseTimeEntity {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(name = "user_id", nullable = false)
+    private Long userId;
+
+    @Column(name = "experience_title", nullable = false)
+    private String experienceTitle;
+
+    @Column(name = "situation", nullable = false, columnDefinition = "TEXT")
+    private String situation;
+
+    @Column(name = "task", nullable = false, columnDefinition = "TEXT")
+    private String task;
+
+    @Column(name = "action", nullable = false, columnDefinition = "TEXT")
+    private String action;
+
+    @Column(name = "result", nullable = false, columnDefinition = "TEXT")
+    private String result;
+
     @Column(name = "job_description", nullable = false, columnDefinition = "TEXT")
     private String jobDescription;
 
@@ -41,52 +58,68 @@ public class AIReport extends BaseTimeEntity {
     @Column(name = "guidance", nullable = false, columnDefinition = "TEXT")
     private String guidance;
 
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "experience_id", nullable = false)
-    private Experience experience;
-
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "company_id", nullable = false)
     private Company company;
 
     @Builder(access = AccessLevel.PROTECTED)
     private AIReport(
+                     final Long userId,
+                     final String experienceTitle,
+                     final String situation,
+                     final String task,
+                     final String action,
+                     final String result,
                      final String jobDescription,
                      final String perspectives,
                      final String density,
                      final String appealPoint,
                      final String suggestion,
                      final String guidance,
-                     final Experience experience,
                      final Company company) {
+        this.userId = userId;
+        this.experienceTitle = experienceTitle;
+        this.situation = situation;
+        this.task = task;
+        this.action = action;
+        this.result = result;
         this.jobDescription = jobDescription;
         this.perspectives = perspectives;
         this.density = density;
         this.appealPoint = appealPoint;
         this.suggestion = suggestion;
         this.guidance = guidance;
-        this.experience = experience;
         this.company = company;
     }
 
     public static AIReport create(
+            final Long userId,
+            final String experienceTitle,
+            final String situation,
+            final String task,
+            final String action,
+            final String result,
             final String jobDescription,
             final String perspectives,
             final String density,
             final String appealPoint,
             final String suggestion,
             final String guidance,
-            final Experience experience,
             final Company company) {
 
         return AIReport.builder()
+                .userId(userId)
+                .experienceTitle(experienceTitle)
+                .situation(situation)
+                .task(task)
+                .action(action)
+                .result(result)
                 .jobDescription(jobDescription)
                 .perspectives(perspectives)
                 .density(density)
                 .appealPoint(appealPoint)
                 .suggestion(suggestion)
                 .guidance(guidance)
-                .experience(experience)
                 .company(company)
                 .build();
     }
diff --git a/src/main/java/sopt/comfit/report/domain/AIReportRepository.java b/src/main/java/sopt/comfit/report/domain/AIReportRepository.java
@@ -9,25 +9,24 @@
 import java.util.Optional;
 
 public interface AIReportRepository extends JpaRepository<AIReport, Long> {
-    Page<AIReport> findByExperienceUserId(Long experienceUserId, Pageable pageable);
+    Page<AIReport> findByUserId(Long userId, Pageable pageable);
+
     @Query("""
         SELECT ar FROM AIReport ar
-        JOIN ar.experience e
         JOIN ar.company c
-        WHERE e.user.id = :userId
+        WHERE ar.userId = :userId
         AND (c.name LIKE %:keyword%)
         """)
-    Page<AIReport> findByExperienceUserIdAndKeyword(
+    Page<AIReport> findByUserIdAndKeyword(
             @Param("userId") Long userId,
             @Param("keyword") String keyword,
             Pageable pageable
     );
 
     @Query("SELECT a FROM AIReport a " +
             "JOIN FETCH a.company " +
-            "JOIN FETCH a.experience " +
-            "WHERE a.experience.user.id = :userId AND a.id = :id")
-    Optional<AIReport> findByExperienceUserIdAndId(@Param("userId") Long userId, @Param("id") Long id);
+            "WHERE a.userId = :userId AND a.id = :id")
+    Optional<AIReport> findByUserIdAndId(@Param("userId") Long userId, @Param("id") Long id);
 
-    boolean existsByCompanyIdAndExperienceUserId(Long companyId, Long userId);
+    boolean existsByCompanyIdAndUserId(Long companyId, Long userId);
 }
diff --git a/src/main/java/sopt/comfit/report/dto/response/AIReportResponseDto.java b/src/main/java/sopt/comfit/report/dto/response/AIReportResponseDto.java
@@ -16,6 +16,14 @@ public record AIReportResponseDto(
 
         String experienceTitle,
 
+        String situation,
+
+        String task,
+
+        String action,
+
+        String result,
+
         String jobDescription,
 
         List<Perspective> perspectives,
@@ -38,7 +46,11 @@ public static AIReportResponseDto from(AIReport report) {
             return new AIReportResponseDto(
                     report.getId(),
                     report.getCompany().getName(),
-                    report.getExperience().getTitle(),
+                    report.getExperienceTitle(),
+                    report.getSituation(),
+                    report.getTask(),
+                    report.getAction(),
+                    report.getResult(),
                     report.getJobDescription(),
                     fromJson(report.getPerspectives(), new TypeReference<List<Perspective>>() {}),
                     fromJson(report.getDensity(), new TypeReference<List<Density>>() {}),
diff --git a/src/main/java/sopt/comfit/report/dto/response/GetReportSummaryResponseDto.java b/src/main/java/sopt/comfit/report/dto/response/GetReportSummaryResponseDto.java
@@ -17,7 +17,7 @@ public static GetReportSummaryResponseDto from(AIReport aiRepot) {
         return new GetReportSummaryResponseDto(
                 aiRepot.getId(),
                 aiRepot.getCompany().getName(),
-                aiRepot.getExperience().getTitle(),
+                aiRepot.getExperienceTitle(),
                 aiRepot.getCreatedAt().toLocalDate()
                 );
     }
diff --git a/src/main/java/sopt/comfit/report/service/AIReportCommandService.java b/src/main/java/sopt/comfit/report/service/AIReportCommandService.java
@@ -43,13 +43,18 @@ public AIReport parseAndSave(String content, Experience experience, Company comp
                     json.get("appealPoint").size());
 
             AIReport report = AIReport.create(
+                    experience.getUser().getId(),
+                    experience.getTitle(),
+                    experience.getSituation(),
+                    experience.getTask(),
+                    experience.getAction(),
+                    experience.getResult(),
                     jobDescription,
                     json.get("perspectives").toString(),
                     json.get("density").toString(),
                     json.get("appealPoint").toString(),
                     json.get("suggestion").asText(),
                     json.get("guidance").asText(),
-                    experience,
                     company
             );
 
diff --git a/src/main/java/sopt/comfit/report/service/AIReportQueryService.java b/src/main/java/sopt/comfit/report/service/AIReportQueryService.java
@@ -43,17 +43,17 @@ public PageDto<GetReportSummaryResponseDto> getReportList(Long userId, Pageable
         Page<AIReport> reports;
 
         if (keyword != null && !keyword.trim().isEmpty()) {
-            reports = aIReportRepository.findByExperienceUserIdAndKeyword(userId, keyword, pageable);
+            reports = aIReportRepository.findByUserIdAndKeyword(userId, keyword, pageable);
         } else {
-            reports = aIReportRepository.findByExperienceUserId(userId, pageable);
+            reports = aIReportRepository.findByUserId(userId, pageable);
         }
 
         return PageDto.from(reports.map(GetReportSummaryResponseDto::from));
     }
 
     @Transactional(readOnly = true)
     public AIReportResponseDto getReport(Long userId, Long reportId) {
-        AIReport aiReport = aIReportRepository.findByExperienceUserIdAndId(userId, reportId)
+        AIReport aiReport = aIReportRepository.findByUserIdAndId(userId, reportId)
                 .orElseThrow(() -> BaseException.type(AIReportErrorCode.AI_REPORT_NOT_FOUND));
 
         return AIReportResponseDto.from(aiReport);
diff --git a/src/main/java/sopt/comfit/user/service/UserService.java b/src/main/java/sopt/comfit/user/service/UserService.java
@@ -50,7 +50,7 @@ public Long addBookmark(Long userId, Long companyId) {
         Company company = companyRepository.findById(companyId)
                 .orElseThrow(() -> BaseException.type(CompanyErrorCode.COMPANY_NOT_FOUND));
 
-        boolean isConnected = aIReportRepository.existsByCompanyIdAndExperienceUserId(companyId, userId);
+        boolean isConnected = aIReportRepository.existsByCompanyIdAndUserId(companyId, userId);
         UserCompany userCompany = userCompanyRepository.save(UserCompany.create(user, company, isConnected));
         return userCompany.getId();
     }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static GetReportSummaryResponseDto from(AIReport aiRepot) {`
`17`	`17`	`return new GetReportSummaryResponseDto(`
`18`	`18`	`aiRepot.getId(),`
`19`	`19`	`aiRepot.getCompany().getName(),`
`20`		`- aiRepot.getExperience().getTitle(),`
	`20`	`+ aiRepot.getExperienceTitle(),`
`21`	`21`	`aiRepot.getCreatedAt().toLocalDate()`
`22`	`22`	`);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public Long addBookmark(Long userId, Long companyId) {`
`50`	`50`	`Company company = companyRepository.findById(companyId)`
`51`	`51`	`.orElseThrow(() -> BaseException.type(CompanyErrorCode.COMPANY_NOT_FOUND));`
`52`	`52`
`53`		`- boolean isConnected = aIReportRepository.existsByCompanyIdAndExperienceUserId(companyId, userId);`
	`53`	`+ boolean isConnected = aIReportRepository.existsByCompanyIdAndUserId(companyId, userId);`
`54`	`54`	`UserCompany userCompany = userCompanyRepository.save(UserCompany.create(user, company, isConnected));`
`55`	`55`	`return userCompany.getId();`
`56`	`56`	`}`