diff --git a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java index d4bdf3f..941ecb4 100644 --- a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java +++ b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java @@ -16,7 +16,9 @@ public record VolunteerDetail( @JsonProperty("hour") int hour, @JsonProperty("isApply") - boolean isApply + boolean isApply, + @JsonProperty("programType") + String type ) { } @@ -32,7 +34,9 @@ public record EmploymentDetail( @JsonProperty("salary") int salary, @JsonProperty("isApply") - boolean isApply + boolean isApply, + @JsonProperty("programType") + String type ) { } } diff --git a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java index 1e43bdb..3d1e432 100644 --- a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java +++ b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java @@ -10,7 +10,8 @@ public record ProgramListResponse( String registerAt, String imageUrl, String status, - String Region + String Region, + String type ) { } diff --git a/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java b/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java index dfbac68..cb437da 100644 --- a/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java +++ b/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java @@ -36,7 +36,8 @@ public List getProgramListByProgramType(String programType) formatToLocalDate(program.getRegisterAt()), program.getImageUrl(), program.getStatus().getValue(), - program.getRegion() + program.getRegion(), + program.getType() )) .collect(Collectors.toList()); return programListResponses; @@ -52,7 +53,8 @@ public List getStatusDoneProgramList() { formatToLocalDate(program.getRegisterAt()), program.getImageUrl(), program.getStatus().getValue(), - program.getRegion() + program.getRegion(), + program.getType() )) .collect(Collectors.toList()); return programListResponses; @@ -70,7 +72,8 @@ public Object getProgramDetail(Long userId, Long programId) { program.getOrganizationName(), formatToLocalDate(program.getRegisterAt()), program.getVolunteerHours(), - isApply + isApply, + program.getType() ); } if (program.getType().equals(EMPLOYMENT_TYPE)){ @@ -80,7 +83,8 @@ public Object getProgramDetail(Long userId, Long programId) { program.getOrganizationName(), formatToLocalDate(program.getRegisterAt()), program.getSalary(), - isApply + isApply, + program.getType() ); } return null; diff --git a/src/main/java/org/sopt/sopkerton/user/controller/UserController.java b/src/main/java/org/sopt/sopkerton/user/controller/UserController.java index 799e846..1ce013f 100644 --- a/src/main/java/org/sopt/sopkerton/user/controller/UserController.java +++ b/src/main/java/org/sopt/sopkerton/user/controller/UserController.java @@ -2,7 +2,7 @@ import lombok.RequiredArgsConstructor; import org.sopt.sopkerton.common.response.ApiResponse; -import org.sopt.sopkerton.user.domain.exception.UserSuccess; +import org.sopt.sopkerton.user.domain.exception.user.UserSuccess; import org.sopt.sopkerton.user.dto.response.DetailView; import org.sopt.sopkerton.user.dto.response.MainView; import org.sopt.sopkerton.user.service.UserService;