Skip to content

Commit 5c30e18

Browse files
leebs0521leebs0521
committed
refactor(recruit-board): volunteerType -> VolunteerCategory
1 parent 4449b23 commit 5c30e18

26 files changed

+128
-126
lines changed

‎src/main/java/com/somemore/recruitboard/controller/RecruitBoardQueryApiController.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import com.somemore.global.common.response.ApiResponse;
66
import com.somemore.recruitboard.domain.RecruitStatus;
7-
import com.somemore.recruitboard.domain.VolunteerType;
7+
import com.somemore.recruitboard.domain.VolunteerCategory;
88
import com.somemore.recruitboard.dto.condition.RecruitBoardNearByCondition;
99
import com.somemore.recruitboard.dto.condition.RecruitBoardSearchCondition;
1010
import com.somemore.recruitboard.dto.response.RecruitBoardDetailResponseDto;
@@ -67,14 +67,14 @@ public ApiResponse<Page<RecruitBoardWithCenterResponseDto>> getAll(
6767
public ApiResponse<Page<RecruitBoardWithCenterResponseDto>> getAllBySearch(
6868
@PageableDefault(sort = "created_at", direction = DESC) Pageable pageable,
6969
@RequestParam(required = false) String keyword,
70-
@RequestParam(required = false) VolunteerType type,
70+
@RequestParam(required = false) VolunteerCategory category,
7171
@RequestParam(required = false) String region,
7272
@RequestParam(required = false) Boolean admitted,
7373
@RequestParam(required = false) RecruitStatus status
7474
) {
7575
RecruitBoardSearchCondition condition = RecruitBoardSearchCondition.builder()
7676
.keyword(keyword)
77-
.type(type)
77+
.category(category)
7878
.region(region)
7979
.admitted(admitted)
8080
.status(status)
@@ -118,14 +118,14 @@ public ApiResponse<Page<RecruitBoardResponseDto>> getRecruitBoardsByCenterId(
118118
@PathVariable UUID centerId,
119119
@PageableDefault(sort = "created_at", direction = DESC) Pageable pageable,
120120
@RequestParam(required = false) String keyword,
121-
@RequestParam(required = false) VolunteerType type,
121+
@RequestParam(required = false) VolunteerCategory category,
122122
@RequestParam(required = false) String region,
123123
@RequestParam(required = false) Boolean admitted,
124124
@RequestParam(required = false) RecruitStatus status
125125
) {
126126
RecruitBoardSearchCondition condition = RecruitBoardSearchCondition.builder()
127127
.keyword(keyword)
128-
.type(type)
128+
.category(category)
129129
.region(region)
130130
.admitted(admitted)
131131
.status(status)

‎src/main/java/com/somemore/recruitboard/domain/RecruitBoard.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void changeRecruitStatus(RecruitStatus newStatus, LocalDateTime currentDa
9595
private void updateRecruitmentInfo(RecruitBoardUpdateRequestDto dto) {
9696
recruitmentInfo.updateWith(
9797
dto.recruitmentCount(),
98-
dto.volunteerType(),
98+
dto.volunteerCategory(),
9999
dto.volunteerStartDateTime(),
100100
dto.volunteerEndDateTime(),
101101
dto.admitted()

‎src/main/java/com/somemore/recruitboard/domain/RecruitmentInfo.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,24 @@ public class RecruitmentInfo {
3232
private LocalDateTime volunteerEndDateTime;
3333

3434
@Enumerated(value = STRING)
35-
@Column(name = "volunteer_type", nullable = false, length = 30)
36-
private VolunteerType volunteerType;
35+
@Column(name = "volunteer_category", nullable = false, length = 30)
36+
private VolunteerCategory volunteerCategory;
3737

3838
@Column(name = "admitted", nullable = false)
3939
private Boolean admitted;
4040

4141
@Builder
4242
public RecruitmentInfo(String region, Integer recruitmentCount,
4343
LocalDateTime volunteerStartDateTime, LocalDateTime volunteerEndDateTime,
44-
VolunteerType volunteerType, Boolean admitted) {
44+
VolunteerCategory volunteerCategory, Boolean admitted) {
4545

4646
validateVolunteerDateTime(volunteerStartDateTime, volunteerEndDateTime);
4747

4848
this.region = region;
4949
this.recruitmentCount = recruitmentCount;
5050
this.volunteerStartDateTime = volunteerStartDateTime.truncatedTo(MINUTES);
5151
this.volunteerEndDateTime = volunteerEndDateTime.truncatedTo(MINUTES);
52-
this.volunteerType = volunteerType;
52+
this.volunteerCategory = volunteerCategory;
5353
this.admitted = admitted;
5454
}
5555

@@ -62,14 +62,14 @@ public LocalTime calculateVolunteerTime() {
6262
return LocalTime.of((int) hours, (int) minutes);
6363
}
6464

65-
public void updateWith(Integer recruitmentCount, VolunteerType volunteerType,
65+
public void updateWith(Integer recruitmentCount, VolunteerCategory volunteerCategory,
6666
LocalDateTime volunteerStartDateTime, LocalDateTime volunteerEndDateTime,
6767
Boolean admitted) {
6868

6969
validateVolunteerDateTime(volunteerStartDateTime, volunteerEndDateTime);
7070

7171
this.recruitmentCount = recruitmentCount;
72-
this.volunteerType = volunteerType;
72+
this.volunteerCategory = volunteerCategory;
7373
this.volunteerStartDateTime = volunteerStartDateTime.truncatedTo(MINUTES);
7474
this.volunteerEndDateTime = volunteerEndDateTime.truncatedTo(MINUTES);
7575
this.admitted = admitted;

‎src/main/java/com/somemore/recruitboard/domain/VolunteerType.java‎ renamed to ‎src/main/java/com/somemore/recruitboard/domain/VolunteerCategory.java‎

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

66
@Getter
77
@RequiredArgsConstructor
8-
public enum VolunteerType {
8+
public enum VolunteerCategory {
99

1010
LIVING_SUPPORT("생활편의지원"),
1111
HOUSING_ENVIRONMENT("주거환경"),

‎src/main/java/com/somemore/recruitboard/dto/condition/RecruitBoardSearchCondition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.somemore.recruitboard.dto.condition;
22

33
import com.somemore.recruitboard.domain.RecruitStatus;
4-
import com.somemore.recruitboard.domain.VolunteerType;
4+
import com.somemore.recruitboard.domain.VolunteerCategory;
55
import lombok.Builder;
66
import org.springframework.data.domain.Pageable;
77

88
@Builder
99
public record RecruitBoardSearchCondition(
1010
String keyword,
11-
VolunteerType type,
11+
VolunteerCategory category,
1212
String region,
1313
Boolean admitted,
1414
RecruitStatus status,

‎src/main/java/com/somemore/recruitboard/dto/request/RecruitBoardCreateRequestDto.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.somemore.location.dto.request.LocationCreateRequestDto;
66
import com.somemore.recruitboard.domain.RecruitBoard;
77
import com.somemore.recruitboard.domain.RecruitmentInfo;
8-
import com.somemore.recruitboard.domain.VolunteerType;
8+
import com.somemore.recruitboard.domain.VolunteerCategory;
99
import io.swagger.v3.oas.annotations.media.Schema;
1010
import jakarta.validation.constraints.NotBlank;
1111
import jakarta.validation.constraints.NotNull;
@@ -36,7 +36,7 @@ public record RecruitBoardCreateRequestDto(
3636
LocalDateTime volunteerEndDateTime,
3737
@Schema(description = "봉사 활동 유형", example = "ENVIRONMENTAL_PROTECTION")
3838
@NotNull(message = "봉사 활동 유형은 필수 값입니다.")
39-
VolunteerType volunteerType,
39+
VolunteerCategory volunteerCategory,
4040
@Schema(description = "봉사 시간 인정 여부", example = "true")
4141
@NotNull(message = "시간 인정 여부는 필수 값입니다.")
4242
Boolean admitted,
@@ -50,7 +50,7 @@ public RecruitBoard toEntity(UUID centerId, Long locationId, String imgUrl) {
5050
.recruitmentCount(recruitmentCount)
5151
.volunteerStartDateTime(volunteerStartDateTime)
5252
.volunteerEndDateTime(volunteerEndDateTime)
53-
.volunteerType(volunteerType)
53+
.volunteerCategory(volunteerCategory)
5454
.admitted(admitted)
5555
.build();
5656

‎src/main/java/com/somemore/recruitboard/dto/request/RecruitBoardUpdateRequestDto.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
44
import com.fasterxml.jackson.databind.annotation.JsonNaming;
5-
import com.somemore.recruitboard.domain.VolunteerType;
5+
import com.somemore.recruitboard.domain.VolunteerCategory;
66
import io.swagger.v3.oas.annotations.media.Schema;
77
import jakarta.validation.constraints.NotBlank;
88
import jakarta.validation.constraints.NotNull;
@@ -29,7 +29,7 @@ public record RecruitBoardUpdateRequestDto(
2929
LocalDateTime volunteerEndDateTime,
3030
@Schema(description = "봉사 활동 유형", example = "ENVIRONMENTAL_PROTECTION")
3131
@NotNull(message = "봉사 활동 유형은 필수 값입니다.")
32-
VolunteerType volunteerType,
32+
VolunteerCategory volunteerCategory,
3333
@Schema(description = "봉사 시간 인정 여부", example = "true")
3434
@NotNull(message = "시간 인정 여부는 필수 값입니다.")
3535
Boolean admitted

‎src/main/java/com/somemore/recruitboard/dto/response/RecruitBoardDetailResponseDto.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.somemore.recruitboard.domain.RecruitBoard;
88
import com.somemore.recruitboard.domain.RecruitStatus;
99
import com.somemore.recruitboard.domain.RecruitmentInfo;
10-
import com.somemore.recruitboard.domain.VolunteerType;
10+
import com.somemore.recruitboard.domain.VolunteerCategory;
1111
import com.somemore.recruitboard.repository.mapper.RecruitBoardDetail;
1212
import io.swagger.v3.oas.annotations.media.Schema;
1313
import java.time.LocalDateTime;
@@ -40,7 +40,7 @@ public record RecruitBoardDetailResponseDto(
4040
@Schema(description = "봉사 종료 일시", example = "2024-12-01T13:00:00")
4141
LocalDateTime volunteerEndDateTime,
4242
@Schema(description = "봉사 유형", example = "LIVING_SUPPORT")
43-
VolunteerType volunteerType,
43+
VolunteerCategory volunteerCategory,
4444
@Schema(description = "봉사 시간", example = "04:00:00")
4545
LocalTime volunteerTime,
4646
@Schema(description = "시간 인정 여부", example = "true")
@@ -73,7 +73,7 @@ public static RecruitBoardDetailResponseDto from(RecruitBoardDetail recruitBoard
7373
.recruitmentCount(info.getRecruitmentCount())
7474
.volunteerStartDateTime(info.getVolunteerStartDateTime())
7575
.volunteerEndDateTime(info.getVolunteerEndDateTime())
76-
.volunteerType(info.getVolunteerType())
76+
.volunteerCategory(info.getVolunteerCategory())
7777
.volunteerTime(info.calculateVolunteerTime())
7878
.admitted(info.getAdmitted())
7979
.imgUrl(board.getImgUrl())

‎src/main/java/com/somemore/recruitboard/dto/response/RecruitBoardResponseDto.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.somemore.recruitboard.domain.RecruitBoard;
66
import com.somemore.recruitboard.domain.RecruitStatus;
77
import com.somemore.recruitboard.domain.RecruitmentInfo;
8-
import com.somemore.recruitboard.domain.VolunteerType;
8+
import com.somemore.recruitboard.domain.VolunteerCategory;
99
import io.swagger.v3.oas.annotations.media.Schema;
1010
import java.time.LocalDateTime;
1111
import java.time.LocalTime;
@@ -41,7 +41,7 @@ public record RecruitBoardResponseDto(
4141
@Schema(description = "봉사 종료 일시", example = "2024-12-01T13:00:00")
4242
LocalDateTime volunteerEndDateTime,
4343
@Schema(description = "봉사 유형", example = "LIVING_SUPPORT")
44-
VolunteerType volunteerType,
44+
VolunteerCategory volunteerCategory,
4545
@Schema(description = "봉사 시간", example = "04:00:00")
4646
LocalTime volunteerTime,
4747
@Schema(description = "시간 인정 여부", example = "true")
@@ -65,7 +65,7 @@ public static RecruitBoardResponseDto from(RecruitBoard board) {
6565
.recruitmentCount(info.getRecruitmentCount())
6666
.volunteerStartDateTime(info.getVolunteerStartDateTime())
6767
.volunteerEndDateTime(info.getVolunteerEndDateTime())
68-
.volunteerType(info.getVolunteerType())
68+
.volunteerCategory(info.getVolunteerCategory())
6969
.volunteerTime(info.calculateVolunteerTime())
7070
.admitted(info.getAdmitted())
7171
.imgUrl(board.getImgUrl())

‎src/main/java/com/somemore/recruitboard/dto/response/RecruitBoardWithCenterResponseDto.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import com.somemore.recruitboard.domain.RecruitBoard;
77
import com.somemore.recruitboard.domain.RecruitStatus;
88
import com.somemore.recruitboard.domain.RecruitmentInfo;
9-
import com.somemore.recruitboard.domain.VolunteerType;
9+
import com.somemore.recruitboard.domain.VolunteerCategory;
1010
import com.somemore.recruitboard.repository.mapper.RecruitBoardWithCenter;
1111
import io.swagger.v3.oas.annotations.media.Schema;
1212
import java.time.LocalDateTime;
@@ -40,7 +40,7 @@ public record RecruitBoardWithCenterResponseDto(
4040
@Schema(description = "봉사 종료 일시", example = "2024-12-01T13:00:00")
4141
LocalDateTime volunteerEndDateTime,
4242
@Schema(description = "봉사 유형", example = "LIVING_SUPPORT")
43-
VolunteerType volunteerType,
43+
VolunteerCategory volunteerCategory,
4444
@Schema(description = "봉사 시간", example = "04:00:00")
4545
LocalTime volunteerTime,
4646
@Schema(description = "시간 인정 여부", example = "true")
@@ -68,7 +68,7 @@ public static RecruitBoardWithCenterResponseDto from(
6868
.recruitmentCount(info.getRecruitmentCount())
6969
.volunteerStartDateTime(info.getVolunteerStartDateTime())
7070
.volunteerEndDateTime(info.getVolunteerEndDateTime())
71-
.volunteerType(info.getVolunteerType())
71+
.volunteerCategory(info.getVolunteerCategory())
7272
.volunteerTime(info.calculateVolunteerTime())
7373
.admitted(info.getAdmitted())
7474
.imgUrl(board.getImgUrl())

0 commit comments

Comments
 (0)