Skip to content
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

Jump to bottom

업데이트 반영 #417

Merged
merged 2 commits into from
Jul 21, 2023
Merged

업데이트 반영 #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0aae76
[Hotfix] 챌린지 참가 검증 문제 해결 (#415)
likelasttime Jul 21, 2023
8c5beec
[Refactor] 챌린지 기록 지출 평가 필수 값 -> 선택 값 (#416)
ParkJungYoon Jul 21, 2023
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
2 changes: 1 addition & 1 deletion 13th-1team-backend-private
Open in desktop
Submodule 13th-1team-backend-private updated from bc4142 to 5303e3
3 changes: 0 additions & 3 deletions Module-API/src/main/java/depromeet/api/domain/record/dto/request/CreateRecordRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package depromeet.api.domain.record.dto.request;


import depromeet.common.annotation.ValidEnum;
import depromeet.domain.record.domain.Evaluation;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
Expand Down Expand Up @@ -38,7 +37,5 @@ public class CreateRecordRequest {
private String imgUrl;

@Schema(description = "지출 평가, WELLDONE | REGRETFUL | CRAZY 중에서 선택 가능합니다.")
@NotNull(message = "지출 평가를 입력해주세요.")
@ValidEnum(enumClass = Evaluation.class, message = "유효하지 않은 Evaluation 파라미터입니다.")
private Evaluation evaluation;
}
8 changes: 2 additions & 6 deletions Module-API/src/main/java/depromeet/api/domain/record/dto/request/UpdateRecordRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package depromeet.api.domain.record.dto.request;


import depromeet.common.annotation.ValidEnum;
import depromeet.domain.record.domain.Evaluation;
import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.NotBlank;
Expand Down Expand Up @@ -29,9 +28,8 @@ public class UpdateRecordRequest {
@Size(min = 1, max = 16, message = "지출 명은 16자 이하입니다.")
private String title;

@Schema(minimum = "1", maximum = "80", example = "지출 내용")
@NotBlank(message = "내용을 입력해주세요.")
@Size(min = 1, max = 80, message = "내용은 80자 이하입니다.")
@Schema(minimum = "0", maximum = "80", example = "지출 내용")
@Size(max = 80, message = "내용은 최대 80자까지 입력할 수 있습니다.")
private String content;

@Schema(
Expand All @@ -41,7 +39,5 @@ public class UpdateRecordRequest {
private String imgUrl;

@Schema(description = "지출 평가, WELLDONE | REGRETFUL | CRAZY 중에서 선택 가능합니다.")
@NotNull(message = "지출 평가를 입력해주세요.")
@ValidEnum(enumClass = Evaluation.class, message = "유효하지 않은 Evaluation 파라미터입니다.")
private Evaluation evaluation;
}
2 changes: 1 addition & 1 deletion Module-Domain/src/main/java/depromeet/domain/challenge/domain/Challenge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public void validateInToChallenge(final LocalDate localDate) {
}

public boolean isRecruiting(final LocalDate localDate) {
if (isStarted(localDate)) return false;
if (isStarted(localDate.minusDays(1))) return false;
return true;
}

Expand Down
Loading