[CMAT-58] feat: RecruitScrap 엔티티에 jobName 필드 추가

src/main/java/UMC/career_mate/domain/recruit/converter/RecruitConverter.java

@@ -60,13 +60,13 @@ public static RecommendRecruitsDTO toRecommendRecruitsDTO(Member member, List<Re
             .build();
     }
 
-    public static RecruitThumbNailInfoDTO toRecruitThumbNailInfoDTO(Recruit recruit, boolean isScraped) {
+    public static RecruitThumbNailInfoDTO toRecruitThumbNailInfoDTO(Recruit recruit, boolean isScrapped) {
         return RecruitThumbNailInfoDTO.builder()
             .recruitId(recruit.getId())
             .companyName(recruit.getCompanyName())
             .title(recruit.getTitle())
             .deadLine(formatDeadLine(recruit))
-            .isScraped(isScraped)
+            .isScrapped(isScrapped)
             .experienceLevelCode(recruit.getExperienceLevelCode())
             .experienceLevelMin(recruit.getExperienceLevelMin())
             .experienceLevelMax(recruit.getExperienceLevelMax())

src/main/java/UMC/career_mate/domain/recruit/dto/response/RecommendRecruitsDTO.java

@@ -16,7 +16,7 @@ public record RecruitThumbNailInfoDTO(
         String companyName,
         String title,
         String deadLine,
-        boolean isScraped,
+        boolean isScrapped,
 
         /**
          * TODO: 아래로는 (필터링, 정렬) 잘 되는지 확인용 데이터, 나중에 삭제 예정

src/main/java/UMC/career_mate/domain/recruit/service/RecruitQueryService.java

@@ -267,12 +267,12 @@ private boolean isEmptyContentBuilder(StringBuilder contentBuilder, int projectE
     }
 
     private PageResponseDTO<RecommendRecruitsDTO> createPageResponseDTO(Page<Recruit> findRecruitPage, Member member) {
-        Set<Long> scrapedRecruitIds = recruitScrapRepository.findRecruitIdsByMember(member);
+        Set<Long> scrappedRecruitIds = recruitScrapRepository.findRecruitIdsByMember(member);
 
         RecommendRecruitsDTO recommendRecruitsDTO = RecruitConverter.toRecommendRecruitsDTO(member,
             findRecruitPage.stream()
                 .map(recruit -> RecruitConverter.toRecruitThumbNailInfoDTO(recruit,
-                    scrapedRecruitIds.contains(recruit.getId())))
+                    scrappedRecruitIds.contains(recruit.getId())))
                 .toList());
 
         return PageResponseDTO.<RecommendRecruitsDTO>builder()

src/main/java/UMC/career_mate/domain/recruitScrap/RecruitScrap.java

@@ -28,4 +28,6 @@ public class RecruitScrap extends BaseEntity {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "recruit_id")
     private Recruit recruit;
+
+    private String jobName;
 }

src/main/java/UMC/career_mate/domain/recruitScrap/controller/RecruitScrapController.java

@@ -7,8 +7,6 @@
 import UMC.career_mate.global.annotation.LoginMember;
 import UMC.career_mate.global.response.ApiResponse;
 import io.swagger.v3.oas.annotations.Operation;
-import java.util.List;
-
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -60,9 +58,7 @@ public ApiResponse<String> deleteRecruitScrap(@LoginMember Member member,
             로그인 인증만을 요구합니다.
             """)
     @GetMapping
-    public ApiResponse<List<RecruitScrapResponseDTO>> getRecruitScrapList(
-        @LoginMember Member member) {
+    public ApiResponse<RecruitScrapResponseDTO> getRecruitScrapList(@LoginMember Member member) {
         return ApiResponse.onSuccess(recruitScrapQueryService.findRecruitScrapList(member));
     }
-
 }

src/main/java/UMC/career_mate/domain/recruitScrap/converter/RecruitScrapConverter.java

@@ -1,31 +1,47 @@
 package UMC.career_mate.domain.recruitScrap.converter;
 
+import UMC.career_mate.domain.job.Job;
 import UMC.career_mate.domain.member.Member;
 import UMC.career_mate.domain.recruit.Recruit;
 import UMC.career_mate.domain.recruitScrap.RecruitScrap;
 import UMC.career_mate.domain.recruitScrap.dto.response.RecruitScrapResponseDTO;
+import UMC.career_mate.domain.recruitScrap.dto.response.RecruitScrapResponseDTO.RecruitScrapThumbNailInfoDTO;
 import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
 
 public class RecruitScrapConverter {
 
     public static RecruitScrap toEntity(Member member, Recruit recruit) {
         return RecruitScrap.builder()
             .member(member)
             .recruit(recruit)
+            .jobName(member.getJob().getName())
             .build();
     }
 
-    public static RecruitScrapResponseDTO toRecruitScrapResponseDTO(Recruit recruit, String jobName) {
+    public static RecruitScrapResponseDTO toRecruitScrapResponseDTO(Job job,
+        List<RecruitScrapThumbNailInfoDTO> recruitScrapThumbNailInfoDTOList) {
         return RecruitScrapResponseDTO.builder()
-            .recruitId(recruit.getId())
-            .companyName(recruit.getCompanyName())
-            .title(recruit.getTitle())
-            .deadLine(formatDeadLine(recruit))
-            .isScraped(true)
-            .companyInfoUrl(recruit.getCompanyInfoUrl())
-            .recruitUrl(recruit.getRecruitUrl())
-            .jobName(jobName)
+            .jobName(job.getName())
+            .recruitScrapThumbNailInfoDTOList(recruitScrapThumbNailInfoDTOList)
+            .build();
+    }
+
+    public static RecruitScrapThumbNailInfoDTO toRecruitScrapThumbNailInfoDTO(RecruitScrap recruitScrap) {
+        return RecruitScrapThumbNailInfoDTO.builder()
+            .recruitId(recruitScrap.getRecruit().getId())
+            .companyName(recruitScrap.getRecruit().getCompanyName())
+            .title(recruitScrap.getRecruit().getTitle())
+            .deadLine(formatDeadLine(recruitScrap.getRecruit()))
+            .isScrapped(true)
+            .build();
+    }
+
+    public static RecruitScrapResponseDTO toEmptyRecruitScrapResponseDTO(Job job) {
+        return RecruitScrapResponseDTO.builder()
+            .jobName(job.getName())
+            .recruitScrapThumbNailInfoDTOList(List.of())
             .build();
     }
 

src/main/java/UMC/career_mate/domain/recruitScrap/dto/response/RecruitScrapResponseDTO.java

@@ -1,18 +1,21 @@
 package UMC.career_mate.domain.recruitScrap.dto.response;
 
-import java.time.LocalDateTime;
+import java.util.List;
 import lombok.Builder;
 
 @Builder
 public record RecruitScrapResponseDTO(
-    Long recruitId,
-    String companyName,
-    String title,
-    String deadLine,
-    boolean isScraped,
-    String companyInfoUrl,
-    String recruitUrl,
-    String jobName
+    String jobName,
+    List<RecruitScrapThumbNailInfoDTO> recruitScrapThumbNailInfoDTOList
 ) {
 
+    @Builder
+    public record RecruitScrapThumbNailInfoDTO(
+        Long recruitId,
+        String companyName,
+        String title,
+        String deadLine,
+        boolean isScrapped
+        ){
+    }
 }

src/main/java/UMC/career_mate/domain/recruitScrap/repository/RecruitScrapRepository.java

@@ -16,8 +16,8 @@ public interface RecruitScrapRepository extends JpaRepository<RecruitScrap, Long
 
     Optional<RecruitScrap> findByMemberAndRecruitId(Member member, Long recruitId);
 
-    @Query("select rs from RecruitScrap rs join fetch rs.recruit where rs.member = :member")
-    List<RecruitScrap> findByMember(@Param("member") Member member);
+    @Query("select rs from RecruitScrap rs join fetch rs.recruit where rs.member = :member and rs.jobName = :jobName")
+    List<RecruitScrap> findByMemberAndJobName(@Param("member") Member member, @Param("jobName") String jobName);
 
     @Query("select rs.recruit.id from RecruitScrap rs where rs.member = :member")
     Set<Long> findRecruitIdsByMember(@Param("member") Member member);

src/main/java/UMC/career_mate/domain/recruitScrap/service/RecruitScrapQueryService.java

@@ -1,9 +1,11 @@
 package UMC.career_mate.domain.recruitScrap.service;
 
+import UMC.career_mate.domain.job.Job;
 import UMC.career_mate.domain.member.Member;
 import UMC.career_mate.domain.recruitScrap.RecruitScrap;
 import UMC.career_mate.domain.recruitScrap.converter.RecruitScrapConverter;
 import UMC.career_mate.domain.recruitScrap.dto.response.RecruitScrapResponseDTO;
+import UMC.career_mate.domain.recruitScrap.dto.response.RecruitScrapResponseDTO.RecruitScrapThumbNailInfoDTO;
 import UMC.career_mate.domain.recruitScrap.repository.RecruitScrapRepository;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -17,17 +19,20 @@ public class RecruitScrapQueryService {
 
     private final RecruitScrapRepository recruitScrapRepository;
 
-    public List<RecruitScrapResponseDTO> findRecruitScrapList(Member member) {
-        List<RecruitScrap> recruitScrapList = recruitScrapRepository.findByMember(member);
+    public RecruitScrapResponseDTO findRecruitScrapList(Member member) {
+        Job job = member.getJob();
+        List<RecruitScrap> recruitScrapList = recruitScrapRepository.findByMemberAndJobName(member,
+            job.getName());
 
         if (recruitScrapList.isEmpty()) {
-            return List.of();
+            return RecruitScrapConverter.toEmptyRecruitScrapResponseDTO(job);
         }
 
-        return recruitScrapList.stream()
-            .map(RecruitScrap::getRecruit)
-            .map(recruit -> RecruitScrapConverter.toRecruitScrapResponseDTO(recruit,
-                member.getJob().getName()))
+        List<RecruitScrapThumbNailInfoDTO> recruitScrapThumbNailInfoDTOList = recruitScrapList.stream()
+            .map(RecruitScrapConverter::toRecruitScrapThumbNailInfoDTO)
             .toList();
+
+        return RecruitScrapConverter.toRecruitScrapResponseDTO(job,
+            recruitScrapThumbNailInfoDTOList);
     }
 }