Skip to content

[Feature] 공고 날짜 조정 가능 여부 추가 #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyeong-hyeok merged 3 commits into from
Jul 27, 2025
Merged

[Feature] 공고 날짜 조정 가능 여부 추가 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ddffdf
feat: 날짜 조정 가능 여부 isAdjust 추가 (#256)
kyeong-hyeok Jun 28, 2025
0ffe75a
test: 테스트 코드 수정 (#256)
kyeong-hyeok Jun 28, 2025
4382406
chore: import.sql 수정 (#256)
kyeong-hyeok Jun 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .../connectdog/domain/application/dto/response/ApplicationIntermediaryCompletedResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ public record ApplicationIntermediaryCompletedResponse(Long postId, String mainI
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
String dogSize,
Boolean isKennel,
Long reviewId) {
public ApplicationIntermediaryCompletedResponse(Long postId, String mainImage, String dogName,
String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate, Boolean isAdjust,
String pickUpTime, DogSize dogSize, Boolean isKennel, Long reviewId) {
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, isAdjust, pickUpTime,
dogSize.getKey(), isKennel, reviewId);
}
}
5 changes: 3 additions & 2 deletions ...onnectdog/domain/application/dto/response/ApplicationIntermediaryProgressingResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,16 @@ public record ApplicationIntermediaryProgressingResponse(Long postId, String mai
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
String dogSize,
Boolean isKennel,
Long applicationId) {

public ApplicationIntermediaryProgressingResponse(Long postId, String mainImage, String dogName,
String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
String pickUpTime, DogSize dogSize, Boolean isKennel, Long applicationId) {
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
Boolean isAdjust, String pickUpTime, DogSize dogSize, Boolean isKennel, Long applicationId) {
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, isAdjust, pickUpTime,
dogSize.getKey(), isKennel, applicationId);
}
}
5 changes: 3 additions & 2 deletions ...hu/connectdog/domain/application/dto/response/ApplicationIntermediaryWaitingResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ public record ApplicationIntermediaryWaitingResponse(@JsonFormat(shape = JsonFor
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
String dogSize,
Boolean isKennel,
Long applicationId) {

public ApplicationIntermediaryWaitingResponse(LocalDateTime applicationTime, Long postId, String mainImage, String dogName,
String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate, Boolean isAdjust,
String pickUpTime, DogSize dogSize, Boolean isKennel, Long applicationId) {
this(applicationTime, postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
this(applicationTime, postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, isAdjust, pickUpTime,
dogSize.getKey(), isKennel, applicationId);
}
}
5 changes: 3 additions & 2 deletions ...thu/connectdog/domain/application/dto/response/ApplicationVolunteerCompletedResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ public record ApplicationVolunteerCompletedResponse(Long postId, String mainImag
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
String dogSize,
Boolean isKennel,
Long reviewId) {
public ApplicationVolunteerCompletedResponse(Long postId, String mainImage, String dogName, String departureLoc, String arrivalLoc,
LocalDate startDate, LocalDate endDate, String pickUpTime,
LocalDate startDate, LocalDate endDate, Boolean isAdjust, String pickUpTime,
DogSize dogSize, Boolean isKennel, Long reviewId) {
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, isAdjust, pickUpTime,
dogSize.getKey(), isKennel, reviewId);
}
}
5 changes: 3 additions & 2 deletions ...u/connectdog/domain/application/dto/response/ApplicationVolunteerProgressingResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ public record ApplicationVolunteerProgressingResponse(Long postId, String mainIm
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
String dogSize,
Boolean isKennel,
Long applicationId) {

public ApplicationVolunteerProgressingResponse(Long postId, String mainImage, String dogName, String departureLoc, String arrivalLoc,
LocalDate startDate, LocalDate endDate, String pickUpTime,
LocalDate startDate, LocalDate endDate, Boolean isAdjust, String pickUpTime,
DogSize dogSize, Boolean isKennel, Long applicationId) {
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, isAdjust, pickUpTime,
dogSize.getKey(), isKennel, applicationId);
}
}
9 changes: 5 additions & 4 deletions ...withu/connectdog/domain/application/dto/response/ApplicationVolunteerWaitingResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@

public record ApplicationVolunteerWaitingResponse(Long postId, String mainImage, String dogName, String departureLoc, String arrivalLoc,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate startDate,
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
String dogSize,
Boolean isKennel,
Long applicationId) {

public ApplicationVolunteerWaitingResponse(Long postId, String mainImage, String dogName, String departureLoc, String arrivalLoc,
LocalDate startDate, LocalDate endDate, String pickUpTime,
LocalDate startDate, LocalDate endDate, Boolean isAdjust, String pickUpTime,
DogSize dogSize, Boolean isKennel, Long applicationId) {
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, pickUpTime,
this(postId, mainImage, dogName, departureLoc, arrivalLoc, startDate, endDate, isAdjust, pickUpTime,
dogSize.getKey(), isKennel, applicationId);
}
}
12 changes: 6 additions & 6 deletions ...wwithu/connectdog/domain/application/repository/impl/CustomApplicationRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public List<ApplicationVolunteerWaitingResponse> getVolunteerWaitingApplications
return queryFactory
.select(Projections.constructor(ApplicationVolunteerWaitingResponse.class,
post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
post.startDate, post.endDate, post.pickUpTime,
post.startDate, post.endDate, post.isAdjust, post.pickUpTime,
dog.size, post.isKennel, application.id))
.from(application)
.join(application.post, post)
Expand All @@ -60,7 +60,7 @@ public List<ApplicationVolunteerProgressingResponse> getVolunteerProgressingAppl
return queryFactory
.select(Projections.constructor(ApplicationVolunteerProgressingResponse.class,
post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
post.startDate, post.endDate, post.pickUpTime,
post.startDate, post.endDate, post.isAdjust, post.pickUpTime,
dog.size, post.isKennel, application.id))
.from(application)
.join(application.post, post)
Expand Down Expand Up @@ -102,7 +102,7 @@ public List<ApplicationIntermediaryWaitingResponse> getIntermediaryWaitingApplic
return queryFactory
.select(Projections.constructor(ApplicationIntermediaryWaitingResponse.class,
application.createdDate, post.id, postImage.image, dog.name,
post.departureLoc, post.arrivalLoc, post.startDate, post.endDate, post.pickUpTime,
post.departureLoc, post.arrivalLoc, post.startDate, post.endDate, post.isAdjust, post.pickUpTime,
dog.size, post.isKennel, application.id))
.from(application)
.join(application.post, post)
Expand All @@ -121,7 +121,7 @@ public List<ApplicationIntermediaryProgressingResponse> getIntermediaryProgressi
return queryFactory
.select(Projections.constructor(ApplicationIntermediaryProgressingResponse.class,
post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
post.startDate, post.endDate, post.pickUpTime,
post.startDate, post.endDate, post.isAdjust, post.pickUpTime,
dog.size, post.isKennel, application.id))
.from(application)
.join(application.post, post)
Expand All @@ -140,7 +140,7 @@ public List<ApplicationVolunteerCompletedResponse> getVolunteerCompletedApplicat
return queryFactory
.select(Projections.constructor(ApplicationVolunteerCompletedResponse.class,
post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
post.startDate, post.endDate, post.pickUpTime,
post.startDate, post.endDate, post.isAdjust, post.pickUpTime,
dog.size, post.isKennel, review.id))
.from(application)
.join(application.post, post)
Expand All @@ -160,7 +160,7 @@ public List<ApplicationIntermediaryCompletedResponse> getIntermediaryCompletedAp
return queryFactory
.select(Projections.constructor(ApplicationIntermediaryCompletedResponse.class,
post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
post.startDate, post.endDate, post.pickUpTime,
post.startDate, post.endDate, post.isAdjust, post.pickUpTime,
dog.size, post.isKennel, review.id))
.from(application)
.join(application.post, post)
Expand Down
2 changes: 1 addition & 1 deletion ...java/com/pawwithu/connectdog/domain/bookmark/repository/CustomBookmarkRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public List<VolunteerGetMyBookmarkResponse> getMyBookmarks(Long volunteerId) {
return queryFactory
.select(Projections.constructor(VolunteerGetMyBookmarkResponse.class,
post.id, postImage.image, dog.name, post.departureLoc, post.arrivalLoc,
post.startDate, post.endDate, post.pickUpTime, dog.size, post.isKennel))
post.startDate, post.endDate, post.isAdjust, post.pickUpTime, dog.size, post.isKennel))
.from(post)
.join(post.mainImage, postImage)
.join(post.dog, dog)
Expand Down
5 changes: 3 additions & 2 deletions ...om/pawwithu/connectdog/domain/intermediary/dto/response/IntermediaryGetPostsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@ public record IntermediaryGetPostsResponse(Long postId, String mainImage, String
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
String dogSize,
Boolean isKennel) {

public IntermediaryGetPostsResponse(Long postId, String mainImage, String dogName,
String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate,
String departureLoc, String arrivalLoc, LocalDate startDate, LocalDate endDate, Boolean isAdjust,
String pickUpTime, DogSize dogSize, Boolean isKennel) {
this(postId, mainImage, dogName, departureLoc, arrivalLoc,
startDate, endDate, pickUpTime, dogSize.getKey(), isKennel);
startDate, endDate, isAdjust, pickUpTime, dogSize.getKey(), isKennel);
}
}
2 changes: 2 additions & 0 deletions src/main/java/com/pawwithu/connectdog/domain/post/dto/request/PostCreateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public record PostCreateRequest(@NotBlank(message = "출발 지역은 필수 입
@NotNull(message = "이동봉사가 필요한 날짜는 필수 입력 값입니다.")
@DateTimeFormat(pattern = "yyyy-MM-dd")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
@NotNull(message = "켄넬 제공 여부는 필수 입력 값입니다.")
Boolean isKennel,
Expand All @@ -40,6 +41,7 @@ public static Post postToEntity(PostCreateRequest request, Dog dog, Intermediary
.arrivalLoc(request.arrivalLoc)
.startDate(request.startDate)
.endDate(request.endDate)
.isAdjust(request.isAdjust)
.pickUpTime(request.pickUpTime)
.isKennel(request.isKennel)
.content(request.content)
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/pawwithu/connectdog/domain/post/dto/request/PostExtendRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ public record PostExtendRequest(@NotNull(message = "이동봉사가 필요한
@NotNull(message = "이동봉사가 필요한 날짜는 필수 입력 값입니다.")
@DateTimeFormat(pattern = "yyyy-MM-dd")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime) {

}
1 change: 1 addition & 0 deletions src/main/java/com/pawwithu/connectdog/domain/post/dto/request/PostUpdateRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public record PostUpdateRequest(@NotBlank(message = "출발 지역은 필수 입
@NotNull(message = "이동봉사가 필요한 날짜는 필수 입력 값입니다.")
@DateTimeFormat(pattern = "yyyy-MM-dd")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime,
@NotNull(message = "켄넬 제공 여부는 필수 입력 값입니다.")
Boolean isKennel,
Expand Down
1 change: 1 addition & 0 deletions src/main/java/com/pawwithu/connectdog/domain/post/dto/response/PostGetHomeResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ public record PostGetHomeResponse(Long postId, String mainImage, String dogName,
LocalDate startDate,
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul")
LocalDate endDate,
Boolean isAdjust,
String pickUpTime) {
}
Loading
Loading