Dev > Main 브랜치 병합

1. 프로젝트 상세 조회 Response에 지원자, 참여자 아이디가 보이는지 테스트 후 Main 브랜치에 병합합니다.

Author: NamDoHyeon2

src/main/java/hs/kr/backend/devpals/domain/project/dto/ProjectAllDto.java

@@ -80,8 +80,17 @@ public class ProjectAllDto {
     @Schema(description = "스킬 태그 정보", accessMode = Schema.AccessMode.READ_ONLY)
     private List<SkillTagResponse> skills;
 
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @Schema(description = "지원자 ID 목록", example = "[2, 3]", accessMode = Schema.AccessMode.READ_ONLY)
+    private List<Long> applicantIds;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @Schema(description = "참여자(수락된 지원자) ID 목록", example = "[2]", accessMode = Schema.AccessMode.READ_ONLY)
+    private List<Long> acceptedIds;
+
     public static ProjectAllDto fromEntity(ProjectEntity project, List<PositionTagResponse> positions,
-                                           List<SkillTagResponse> skills, MethodTypeResponse methodType, ProjectUserResponse user) {
+                                           List<SkillTagResponse> skills, MethodTypeResponse methodType, ProjectUserResponse user,
+                                           List<Long> applicantIds, List<Long> acceptedIds) {
         return ProjectAllDto.builder()
                 .id(project.getId())
                 .title(project.getTitle())
@@ -101,6 +110,8 @@ public static ProjectAllDto fromEntity(ProjectEntity project, List<PositionTagRe
                 .methodType(methodType)
                 .positions(positions)
                 .skills(skills)
+                .applicantIds(applicantIds)
+                .acceptedIds(acceptedIds)
                 .build();
     }
 }

src/main/java/hs/kr/backend/devpals/domain/project/service/ProjectService.java

@@ -117,7 +117,7 @@ public ResponseEntity<ApiResponse<ProjectAllDto>> updateProject(Long projectId,
         ProjectAllDto updatedProject = convertToDto(project);
         projectAllCache.put(projectId, updatedProject);
 
-        return ResponseEntity.ok(new ApiResponse<>(true, "프로젝트 업데이트 완료", updatedProject));
+        return ResponseEntity.ok(new ApiResponse<>(true, "프로젝트 업데이트 완료", null));
     }
 
     // 프로젝트 등록
@@ -131,7 +131,7 @@ public ResponseEntity<ApiResponse<ProjectAllDto>> projectSignup(ProjectAllDto re
         ProjectAllDto responseDto = convertToDto(savedProject);
         projectAllCache.put(savedProject.getId(), responseDto);
 
-        return ResponseEntity.ok(new ApiResponse<>(true, "프로젝트 등록 완료", responseDto));
+        return ResponseEntity.ok(new ApiResponse<>(true, "프로젝트 등록 완료", null));
     }
 
     // 특정 프로젝트 조회
@@ -235,14 +235,23 @@ private ProjectAllDto convertToDto(ProjectEntity project) {
         List<SkillTagResponse> skillResponses = userFacade.getSkillTagResponses(project.getSkillTagIds());
         List<PositionTagResponse> positionResponses = userFacade.getPositionTagResponses(project.getPositionTagIds());
         MethodTypeResponse methodTypeResponse = projectFacade.getMethodTypeResponse(project.getMethodTypeId());
+        List<ApplicantEntity> applicants = applicantRepository.findByProject(project);
+
+        List<Long> applicantIds = applicants.stream()
+                .map(applicant -> applicant.getUser().getId())
+                .toList();
 
+        List<Long> acceptedIds = applicants.stream()
+                .filter(ApplicantEntity::isAccepted)
+                .map(applicant -> applicant.getUser().getId())
+                .toList();
 
         UserEntity userEntity = userRepository.findById(project.getUserId())
                 .orElseThrow(() -> new CustomException(ErrorException.USER_NOT_FOUND));
 
         ProjectUserResponse user = ProjectUserResponse.fromEntity(userEntity);
 
-        return ProjectAllDto.fromEntity(project, positionResponses, skillResponses, methodTypeResponse, user);
+        return ProjectAllDto.fromEntity(project, positionResponses, skillResponses, methodTypeResponse, user, applicantIds, acceptedIds);
     }
 
 }