fix: defense nullpointexception

42organization · Aug 2, 2024 · b7d9af2 · b7d9af2
1 parent 1502090
commit b7d9af2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/...da-api/src/main/java/gg/agenda/api/user/agenda/controller/request/AgendaCreateReqDto.java b/...da-api/src/main/java/gg/agenda/api/user/agenda/controller/request/AgendaCreateReqDto.java
@@ -1,5 +1,6 @@
 package gg.agenda.api.user.agenda.controller.request;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import java.time.LocalDateTime;
 
 import javax.validation.constraints.Future;
@@ -21,6 +22,7 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
 
 @Getter
 @AgendaCapacityValid
@@ -34,15 +36,15 @@ public class AgendaCreateReqDto {
 	@NotBlank
 	private String agendaContent;
 
-	@NotNull
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
 	@Future(message = "마감일은 현재 시간 이후여야 합니다.")
 	private LocalDateTime agendaDeadLine;
 
-	@NotNull
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
 	@Future(message = "시작 시간은 현재 시간 이후여야 합니다.")
 	private LocalDateTime agendaStartTime;
 
-	@NotNull
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
 	@Future(message = "종료 시간은 현재 시간 이후여야 합니다.")
 	private LocalDateTime agendaEndTime;
 

diff --git a/.../java/gg/agenda/api/user/agenda/controller/request/validator/AgendaScheduleValidator.java b/.../java/gg/agenda/api/user/agenda/controller/request/validator/AgendaScheduleValidator.java
@@ -19,6 +19,11 @@ public boolean isValid(AgendaCreateReqDto value, ConstraintValidatorContext cont
 		if (Objects.isNull(value)) {
 			return true;
 		}
+		if (Objects.isNull(value.getAgendaDeadLine())
+			|| Objects.isNull(value.getAgendaStartTime())
+			|| Objects.isNull(value.getAgendaEndTime())) {
+			return false;
+		}
 		return mustHaveValidSchedule(value);
 	}