fix: 센터 별 매칭 결과 정보 dto 수정

src/main/java/com/example/springserver/domain/caregiver/converter/CaregiverConverter.java

@@ -102,4 +102,12 @@ public static RequestsListRes toRequestListRes(List<WorkRequest> list) {
                 .list(list)
                 .build();
     }
+
+    public static MatchCaregiverResponseDto toMatchCaregiverDto(Caregiver caregiver) {
+        return MatchCaregiverResponseDto.builder()
+                .careGiverId(caregiver.getId())
+                .useranme(caregiver.getName())
+                .img(caregiver.getImg())
+                .build();
+    }
 }

src/main/java/com/example/springserver/domain/caregiver/dto/response/CaregiverResponseDto.java

@@ -2,11 +2,9 @@
 
 import com.example.springserver.domain.caregiver.entity.enums.CertType;
 import com.example.springserver.domain.caregiver.entity.enums.Level;
-import com.example.springserver.domain.caregiver.entity.enums.ScheduleAvailability;
 import com.example.springserver.domain.caregiver.entity.enums.Sexual;
 import com.example.springserver.domain.center.entity.enums.CareType;
 import com.example.springserver.domain.center.entity.enums.ElderRate;
-import com.example.springserver.domain.center.entity.enums.Week;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -117,6 +115,11 @@ public static class WorkRequest{
 
     }
 
-
-
+    @Getter
+    @Builder
+    public static class MatchCaregiverResponseDto{
+        Long careGiverId;
+        String useranme;
+        String img;
+    }
 }

src/main/java/com/example/springserver/domain/center/converter/ElderConverter.java

@@ -1,15 +1,12 @@
 package com.example.springserver.domain.center.converter;
 
+import com.example.springserver.domain.center.dto.request.ElderRequestDto.CreateRequestDto;
 import com.example.springserver.domain.center.dto.request.ElderRequestDto.RequestDto;
 import com.example.springserver.domain.center.dto.request.ElderRequestDto.UpdateRequestDto;
-import com.example.springserver.domain.center.dto.response.ElderResponseDto.DeleteResponseDto;
-import com.example.springserver.domain.center.dto.response.ElderResponseDto.UpdateResponseDto;
+import com.example.springserver.domain.center.dto.response.ElderResponseDto.*;
 import com.example.springserver.domain.center.entity.Care;
 import com.example.springserver.domain.center.entity.Center;
 import com.example.springserver.domain.center.entity.Elder;
-import com.example.springserver.domain.center.dto.request.ElderRequestDto.CreateRequestDto;
-import com.example.springserver.domain.center.dto.response.ElderResponseDto.CreateDto;
-import com.example.springserver.domain.center.dto.response.ElderResponseDto.ResponseDto;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -140,4 +137,12 @@ public static List<ResponseDto> toListDto(List<Elder> elderList) {
                 .map(ElderConverter::toResponseDto)  // ElderEntity를 ResponseDto로 변환
                 .collect(Collectors.toList());
     }
+
+    public static MatchElderResponseDto toMatchElderDto(Elder elder) {
+        return MatchElderResponseDto.builder()
+                .elderId(elder.getElderId())
+                .name(elder.getName())
+                .imgUrl(elder.getImgUrl())
+                .build();
+    }
 }

src/main/java/com/example/springserver/domain/center/dto/response/ElderResponseDto.java

@@ -75,4 +75,14 @@ public static class DeleteResponseDto {
         private String name;
     }
 
+    @Builder
+    @Getter
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class MatchElderResponseDto {
+        private Long elderId;
+        private String name;
+        private String imgUrl;
+    }
+
 }

src/main/java/com/example/springserver/domain/match/converter/MatchConverter.java

@@ -1,12 +1,14 @@
 package com.example.springserver.domain.match.converter;
 
+import com.example.springserver.domain.caregiver.converter.CaregiverConverter;
+import com.example.springserver.domain.caregiver.converter.JobConditionConverter;
+import com.example.springserver.domain.center.converter.ElderConverter;
+import com.example.springserver.domain.center.converter.RecruitConverter;
 import com.example.springserver.domain.center.entity.Elder;
 import com.example.springserver.domain.center.entity.RecruitCondition;
 import com.example.springserver.domain.center.entity.RecruitTime;
 import com.example.springserver.domain.center.entity.enums.CareType;
 import com.example.springserver.domain.center.entity.enums.Inmate;
-import com.example.springserver.domain.caregiver.converter.JobConditionConverter;
-import com.example.springserver.domain.center.converter.RecruitConverter;
 import com.example.springserver.domain.match.dto.response.MatchResponseDto;
 import com.example.springserver.domain.match.dto.response.MatchResponseDto.*;
 import com.example.springserver.domain.match.entity.Match;
@@ -96,6 +98,8 @@ public static MatchDto toMatchDto(Match match) {
                 .jobCondition(
                         JobConditionConverter.toJobConditionResponseDto(match.getJobCondition())
                         )
+                .elderInfoDto(ElderConverter.toMatchElderDto(match.getRequirementCondition().getElder())) // elder -> dto 변환 필요
+                .careGiverInfoDto(CaregiverConverter.toMatchCaregiverDto(match.getJobCondition().getCaregiver())) // careGiver -> dto 변환 필요
                 .deletedAt(match.getDeletedAt())
                 .version(match.getVersion())
                 .build();

src/main/java/com/example/springserver/domain/match/dto/response/MatchResponseDto.java

@@ -1,22 +1,19 @@
 package com.example.springserver.domain.match.dto.response;
 
 import com.example.springserver.domain.caregiver.dto.response.CaregiverResponseDto;
+import com.example.springserver.domain.caregiver.dto.response.CaregiverResponseDto.MatchCaregiverResponseDto;
 import com.example.springserver.domain.caregiver.dto.response.JobConditionResponseDto;
+import com.example.springserver.domain.caregiver.dto.response.JobConditionResponseDto.JobConditionResponseDTO;
 import com.example.springserver.domain.caregiver.entity.Caregiver;
 import com.example.springserver.domain.caregiver.entity.JobCondition;
-import com.example.springserver.domain.caregiver.entity.enums.CertType;
-import com.example.springserver.domain.caregiver.entity.enums.Level;
 import com.example.springserver.domain.caregiver.entity.enums.ScheduleAvailability;
 import com.example.springserver.domain.caregiver.entity.enums.Sexual;
-import com.example.springserver.domain.center.converter.enums.CareTypeEnumListConverter;
 import com.example.springserver.domain.center.dto.response.ElderResponseDto;
+import com.example.springserver.domain.center.dto.response.ElderResponseDto.MatchElderResponseDto;
 import com.example.springserver.domain.center.dto.response.RecruitResponseDto;
+import com.example.springserver.domain.center.dto.response.RecruitResponseDto.ResponseDto;
 import com.example.springserver.domain.center.entity.Elder;
 import com.example.springserver.domain.center.entity.RecruitCondition;
-import com.example.springserver.domain.caregiver.dto.response.JobConditionResponseDto.JobConditionResponseDTO;
-import com.example.springserver.domain.caregiver.entity.enums.ScheduleAvailability;
-import com.example.springserver.domain.caregiver.entity.enums.Sexual;
-import com.example.springserver.domain.center.dto.response.RecruitResponseDto.ResponseDto;
 import com.example.springserver.domain.center.entity.RecruitTime;
 import com.example.springserver.domain.center.entity.enums.CareType;
 import com.example.springserver.domain.center.entity.enums.ElderRate;
@@ -423,6 +420,10 @@ public static class MatchDto {
 
         private JobConditionResponseDTO jobCondition;
 
+        private MatchElderResponseDto elderInfoDto;
+
+        private MatchCaregiverResponseDto careGiverInfoDto;
+
         private LocalDateTime deletedAt;
 
         private Integer version;