Skip to content

Commit c8d4669

Browse files
committed
HOT FIX : 프로그램 상세뷰 분기 기준값 DTO 에 추가
1 parent 7c4dde1 commit c8d4669

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@ public record VolunteerDetail(
1616
@JsonProperty("hour")
1717
int hour,
1818
@JsonProperty("isApply")
19-
boolean isApply
19+
boolean isApply,
20+
@JsonProperty("programType")
21+
String type
2022
) {
2123
}
2224

@@ -32,7 +34,9 @@ public record EmploymentDetail(
3234
@JsonProperty("salary")
3335
int salary,
3436
@JsonProperty("isApply")
35-
boolean isApply
37+
boolean isApply,
38+
@JsonProperty("programType")
39+
String type
3640
) {
3741
}
3842
}

src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ public record ProgramListResponse(
1010
String registerAt,
1111
String imageUrl,
1212
String status,
13-
String Region
13+
String Region,
14+
String type
1415
) {
1516

1617
}

src/main/java/org/sopt/sopkerton/program/service/ProgramService.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public List<ProgramListResponse> getProgramListByProgramType(String programType)
3636
formatToLocalDate(program.getRegisterAt()),
3737
program.getImageUrl(),
3838
program.getStatus().getValue(),
39-
program.getRegion()
39+
program.getRegion(),
40+
program.getType()
4041
))
4142
.collect(Collectors.toList());
4243
return programListResponses;
@@ -52,7 +53,8 @@ public List<ProgramListResponse> getStatusDoneProgramList() {
5253
formatToLocalDate(program.getRegisterAt()),
5354
program.getImageUrl(),
5455
program.getStatus().getValue(),
55-
program.getRegion()
56+
program.getRegion(),
57+
program.getType()
5658
))
5759
.collect(Collectors.toList());
5860
return programListResponses;
@@ -70,7 +72,8 @@ public Object getProgramDetail(Long userId, Long programId) {
7072
program.getOrganizationName(),
7173
formatToLocalDate(program.getRegisterAt()),
7274
program.getVolunteerHours(),
73-
isApply
75+
isApply,
76+
program.getType()
7477
);
7578
}
7679
if (program.getType().equals(EMPLOYMENT_TYPE)){
@@ -80,7 +83,8 @@ public Object getProgramDetail(Long userId, Long programId) {
8083
program.getOrganizationName(),
8184
formatToLocalDate(program.getRegisterAt()),
8285
program.getSalary(),
83-
isApply
86+
isApply,
87+
program.getType()
8488
);
8589
}
8690
return null;

src/main/java/org/sopt/sopkerton/user/controller/UserController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import lombok.RequiredArgsConstructor;
44
import org.sopt.sopkerton.common.response.ApiResponse;
5-
import org.sopt.sopkerton.user.domain.exception.UserSuccess;
5+
import org.sopt.sopkerton.user.domain.exception.user.UserSuccess;
66
import org.sopt.sopkerton.user.dto.response.DetailView;
77
import org.sopt.sopkerton.user.dto.response.MainView;
88
import org.sopt.sopkerton.user.service.UserService;

0 commit comments

Comments
 (0)