diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ChangePasswordRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ChangePasswordRequest.kt index 4891f34e..36a04174 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ChangePasswordRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ChangePasswordRequest.kt @@ -2,6 +2,7 @@ package team.comit.simtong.domain.common.dto import team.comit.simtong.domain.user.dto.request.ChangePasswordData import team.comit.simtong.domain.user.model.Password +import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern /** @@ -13,15 +14,18 @@ import javax.validation.constraints.Pattern * @version 1.2.5 **/ data class ChangePasswordRequest( + + @field:NotNull @field:Pattern(regexp = Password.PATTERN) - val password: String, + val password: String?, + @field:NotNull @field:Pattern(regexp = Password.PATTERN) - val newPassword: String + val newPassword: String? ) { fun toData() = ChangePasswordData( - password = password, - newPassword = newPassword + password = password!!, + newPassword = newPassword!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/FindEmployeeNumberRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/FindEmployeeNumberRequest.kt index ce14eb07..906d4982 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/FindEmployeeNumberRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/FindEmployeeNumberRequest.kt @@ -4,6 +4,7 @@ import team.comit.simtong.domain.user.dto.request.FindEmployeeNumberData import java.util.UUID import javax.validation.constraints.Email import javax.validation.constraints.NotBlank +import javax.validation.constraints.NotEmpty import javax.validation.constraints.NotNull /** @@ -15,20 +16,21 @@ import javax.validation.constraints.NotNull * @version 1.2.5 **/ data class FindEmployeeNumberRequest( + @field:NotBlank - val name: String, + val name: String?, @field:NotNull - val spotId: UUID, + val spotId: UUID?, - @field:NotBlank + @field:NotEmpty @field:Email - val email: String + val email: String? ) { fun toData() = FindEmployeeNumberData( - name = name, - spotId = spotId, - email = email + name = name!!, + spotId = spotId!!, + email = email!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ResetPasswordRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ResetPasswordRequest.kt index 78827a5e..efefd452 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ResetPasswordRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/common/dto/ResetPasswordRequest.kt @@ -5,7 +5,8 @@ import team.comit.simtong.domain.user.dto.request.ResetPasswordData import team.comit.simtong.domain.user.model.EmployeeNumber import team.comit.simtong.domain.user.model.Password import javax.validation.constraints.Email -import javax.validation.constraints.NotBlank +import javax.validation.constraints.NotEmpty +import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern /** @@ -17,20 +18,23 @@ import javax.validation.constraints.Pattern * @version 1.2.5 **/ data class ResetPasswordRequest( - @field:NotBlank + + @field:NotEmpty @field:Email - val email: String, + val email: String?, + @field:NotNull @field:Range(min = EmployeeNumber.MIN_VALUE, max = EmployeeNumber.MAX_VALUE) - val employeeNumber: Int, + val employeeNumber: Int?, + @field:NotNull @field:Pattern(regexp = Password.PATTERN) - val newPassword: String + val newPassword: String? ) { fun toData() = ResetPasswordData( - email = email, - employeeNumber = employeeNumber, - newPassword = newPassword + email = email!!, + employeeNumber = employeeNumber!!, + newPassword = newPassword!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/CheckAuthCodeRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/CheckAuthCodeRequest.kt index 697efc71..19b41389 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/CheckAuthCodeRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/CheckAuthCodeRequest.kt @@ -3,7 +3,8 @@ package team.comit.simtong.domain.email.dto import org.hibernate.validator.constraints.Length import team.comit.simtong.domain.auth.dto.request.CheckAuthCodeData import javax.validation.constraints.Email -import javax.validation.constraints.NotBlank +import javax.validation.constraints.NotEmpty +import javax.validation.constraints.NotNull /** * @@ -14,17 +15,18 @@ import javax.validation.constraints.NotBlank * @version 1.2.5 **/ data class CheckAuthCodeRequest( - @field:NotBlank + + @field:NotEmpty @field:Email - val email: String, + val email: String?, - @field:NotBlank + @field:NotNull @field:Length(min = 6, max = 6) - val code: String + val code: String? ) { fun toData() = CheckAuthCodeData( - email = email, - code = code + email = email!!, + code = code!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/SendAuthCodeRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/SendAuthCodeRequest.kt index 34a6266e..1c8f2998 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/SendAuthCodeRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/email/dto/SendAuthCodeRequest.kt @@ -3,6 +3,7 @@ package team.comit.simtong.domain.email.dto import team.comit.simtong.domain.auth.dto.request.SendAuthCodeData import javax.validation.constraints.Email import javax.validation.constraints.NotBlank +import javax.validation.constraints.NotEmpty /** * @@ -13,12 +14,13 @@ import javax.validation.constraints.NotBlank * @version 1.2.5 **/ data class SendAuthCodeRequest( - @field:NotBlank + + @field:NotEmpty @field:Email - val email: String + val email: String? ) { fun toData() = SendAuthCodeData( - email = email + email = email!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointAnnualRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointAnnualRequest.kt index d9bb49d1..6acf68f5 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointAnnualRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointAnnualRequest.kt @@ -2,6 +2,7 @@ package team.comit.simtong.domain.holiday.dto import team.comit.simtong.domain.holiday.dto.request.AppointAnnualData import java.time.LocalDate +import javax.validation.constraints.NotNull /** * @@ -12,10 +13,12 @@ import java.time.LocalDate * @version 1.2.5 **/ data class AppointAnnualRequest( - val date: LocalDate + + @field:NotNull + val date: LocalDate? ) { fun toData() = AppointAnnualData( - date = date + date = date!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayPeriodRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayPeriodRequest.kt index fe1b5253..6bfe3353 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayPeriodRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayPeriodRequest.kt @@ -14,25 +14,28 @@ import javax.validation.constraints.NotNull * @version 1.2.5 **/ data class AppointHolidayPeriodRequest( + @field:NotNull - val year: Int, + val year: Int?, @field:NotNull @field:Range( min = 1, max = 12 ) - val month: Int, + val month: Int?, - val startAt: LocalDate, + @field:NotNull + val startAt: LocalDate?, - val endAt: LocalDate + @field:NotNull + val endAt: LocalDate? ) { fun toData() = AppointHolidayPeriodData( - year = year, - month = month, - startAt = startAt, - endAt = endAt + year = year!!, + month = month!!, + startAt = startAt!!, + endAt = endAt!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayRequest.kt index ba90be37..32531f2a 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/AppointHolidayRequest.kt @@ -2,6 +2,7 @@ package team.comit.simtong.domain.holiday.dto import team.comit.simtong.domain.holiday.dto.request.AppointHolidayData import java.time.LocalDate +import javax.validation.constraints.NotNull /** * @@ -12,10 +13,12 @@ import java.time.LocalDate * @version 1.2.5 **/ data class AppointHolidayRequest( - val date: LocalDate + + @field:NotNull + val date: LocalDate? ) { fun toData() = AppointHolidayData( - date = date + date = date!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/CancelHolidayRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/CancelHolidayRequest.kt index 92fad470..37f00600 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/CancelHolidayRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/CancelHolidayRequest.kt @@ -2,6 +2,7 @@ package team.comit.simtong.domain.holiday.dto import team.comit.simtong.domain.holiday.dto.request.CancelHolidayData import java.time.LocalDate +import javax.validation.constraints.NotNull /** * @@ -13,10 +14,12 @@ import java.time.LocalDate * @version 1.2.5 **/ data class CancelHolidayRequest( - val date: LocalDate + + @field:NotNull + val date: LocalDate? ) { fun toData() = CancelHolidayData( - date = date + date = date!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ChangeEmployeeHolidayRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ChangeEmployeeHolidayRequest.kt index b2fef4c3..48d2c429 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ChangeEmployeeHolidayRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ChangeEmployeeHolidayRequest.kt @@ -3,6 +3,7 @@ package team.comit.simtong.domain.holiday.dto import team.comit.simtong.domain.holiday.dto.request.ChangeEmployeeHolidayData import java.time.LocalDate import java.util.UUID +import javax.validation.constraints.NotNull /** * @@ -14,16 +15,20 @@ import java.util.UUID * @version 1.2.5 **/ data class ChangeEmployeeHolidayRequest( - val beforeDate: LocalDate, - val userId: UUID, + @field:NotNull + val beforeDate: LocalDate?, - val afterDate: LocalDate + @field:NotNull + val userId: UUID?, + + @field:NotNull + val afterDate: LocalDate? ) { fun toData() = ChangeEmployeeHolidayData( - beforeDate = beforeDate, - userId = userId, - afterDate = afterDate + beforeDate = beforeDate!!, + userId = userId!!, + afterDate = afterDate!! ) } diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ShareHolidayRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ShareHolidayRequest.kt index 6f710207..c2a95b26 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ShareHolidayRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/holiday/dto/ShareHolidayRequest.kt @@ -15,14 +15,14 @@ import javax.validation.constraints.NotNull data class ShareHolidayRequest( @field:NotNull - val year: Int, + val year: Int?, @field:NotNull - val month: Int + val month: Int? ) { fun toData() = ShareHolidayData( - year = year, - month = month + year = year!!, + month = month!! ) } diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/menu/dto/SaveMenuRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/menu/dto/SaveMenuRequest.kt index bfc60297..724af70c 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/menu/dto/SaveMenuRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/menu/dto/SaveMenuRequest.kt @@ -14,18 +14,20 @@ import javax.validation.constraints.NotNull * @version 1.2.5 **/ data class SaveMenuRequest( - val file: MultipartFile, @field:NotNull - val year: Int, + val file: MultipartFile?, @field:NotNull - val month: Int + val year: Int?, + + @field:NotNull + val month: Int? ) { fun toData() = SaveMenuData( - file = file.let(ExcelFileConverter::transferTo), - year = year, - month = month + file = file!!.let(ExcelFileConverter::transferTo), + year = year!!, + month = month!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/notification/dto/SendNotificationRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/notification/dto/SendNotificationRequest.kt index 3f4019c1..2f1b23c7 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/notification/dto/SendNotificationRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/notification/dto/SendNotificationRequest.kt @@ -19,25 +19,25 @@ import javax.validation.constraints.NotNull data class SendNotificationRequest( @field:NotNull - val userId: UUID, + val userId: UUID?, @field:NotBlank - val title: String, + val title: String?, @field:NotBlank - val content: String, + val content: String?, @field:NotNull - val type: NotificationType, + val type: NotificationType?, val identify: UUID? ) { fun toData() = SendNotificationData( - userId = userId, - title = title, - content = content, - type = type, + userId = userId!!, + title = title!!, + content = content!!, + type = type!!, identify = identify ) } @@ -52,25 +52,27 @@ data class SendNotificationRequest( * @version 1.2.5 **/ data class SendMultiNotificationRequest( - val userIds: List, + + @field:NotNull + val userIds: List?, @field:NotBlank - val title: String, + val title: String?, @field:NotBlank - val content: String, + val content: String?, @field:NotNull - val type: NotificationType, + val type: NotificationType?, val identify: UUID? ) { fun toData() = SendMulticastNotificationData( - userIds = userIds, - title = title, - content = content, - type = type, + userIds = userIds!!, + title = title!!, + content = content!!, + type = type!!, identify = identify ) } diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddIndividualScheduleRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddIndividualScheduleRequest.kt index 81ee087f..85891b11 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddIndividualScheduleRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddIndividualScheduleRequest.kt @@ -19,22 +19,22 @@ data class AddIndividualScheduleRequest( @field:NotBlank @field:Length(max = 20) - val title: String, + val title: String?, @field:NotNull - val startAt: LocalDate, + val startAt: LocalDate?, // TODO 시작일, 종료일 검증 Resolver 구현 @field:NotNull - val endAt: LocalDate, + val endAt: LocalDate?, val alarm: LocalTime? ) { fun toData() = AddIndividualScheduleData( - title = title, - startAt = startAt, - endAt = endAt, + title = title!!, + startAt = startAt!!, + endAt = endAt!!, alarm = alarm ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddSpotScheduleRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddSpotScheduleRequest.kt index d6bb9502..132404ad 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddSpotScheduleRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/AddSpotScheduleRequest.kt @@ -18,19 +18,19 @@ data class AddSpotScheduleRequest( @field:NotBlank @field:Length(max = 20) - val title: String, + val title: String?, @field:NotNull - val startAt: LocalDate, + val startAt: LocalDate?, // TODO 시작일, 종료일 검증 Resolver 구현 @field:NotNull - val endAt: LocalDate + val endAt: LocalDate? ) { fun toData() = AddSpotScheduleData( - title = title, - startAt = startAt, - endAt = endAt, + title = title!!, + startAt = startAt!!, + endAt = endAt!!, ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeIndividualScheduleRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeIndividualScheduleRequest.kt index 9246de4f..d5a95cf5 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeIndividualScheduleRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeIndividualScheduleRequest.kt @@ -16,25 +16,26 @@ import javax.validation.constraints.NotNull * @version 1.2.5 **/ data class ChangeIndividualScheduleRequest( + @field:NotBlank @field:Length(max = 20) - val title: String, + val title: String?, @field:NotNull - val startAt: LocalDate, + val startAt: LocalDate?, // TODO 시작일, 종료일 검증 Resolver 구현 @field:NotNull - val endAt: LocalDate, + val endAt: LocalDate?, @field:NotNull - val alarm: LocalTime + val alarm: LocalTime? ) { fun toData() = ChangeIndividualScheduleData( - title = title, - startAt = startAt, - endAt = endAt, - alarm = alarm + title = title!!, + startAt = startAt!!, + endAt = endAt!!, + alarm = alarm!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeSpotScheduleRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeSpotScheduleRequest.kt index 6ec358dd..3759c9ad 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeSpotScheduleRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/schedule/dto/ChangeSpotScheduleRequest.kt @@ -15,21 +15,22 @@ import javax.validation.constraints.NotNull * @version 1.2.5 **/ data class ChangeSpotScheduleRequest( + @field:NotBlank @field:Length(max = 20) - val title: String, + val title: String?, @field:NotNull - val startAt: LocalDate, + val startAt: LocalDate?, // TODO 시작일, 종료일 검증 Resolver 구현 @field:NotNull - val endAt: LocalDate + val endAt: LocalDate? ) { fun toData() = ChangeSpotScheduleData( - title = title, - startAt = startAt, - endAt = endAt + title = title!!, + startAt = startAt!!, + endAt = endAt!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeEmailRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeEmailRequest.kt index 9afc89bb..a2b2de81 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeEmailRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeEmailRequest.kt @@ -2,7 +2,7 @@ package team.comit.simtong.domain.user.dto import team.comit.simtong.domain.user.dto.request.ChangeEmailData import javax.validation.constraints.Email -import javax.validation.constraints.NotBlank +import javax.validation.constraints.NotEmpty /** * @@ -13,12 +13,13 @@ import javax.validation.constraints.NotBlank * @version 1.0.0 **/ data class ChangeEmailRequest( - @field:NotBlank + + @field:NotEmpty @field:Email - val email: String + val email: String? ) { fun toData() = ChangeEmailData( - email = email + email = email!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeNicknameRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeNicknameRequest.kt index 20bdf052..5faaee46 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeNicknameRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeNicknameRequest.kt @@ -2,6 +2,7 @@ package team.comit.simtong.domain.user.dto import team.comit.simtong.domain.user.dto.request.ChangeNicknameData import team.comit.simtong.domain.user.model.NickName +import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern /** @@ -13,11 +14,13 @@ import javax.validation.constraints.Pattern * @version 1.2.3 **/ data class ChangeNicknameRequest( + + @field:NotNull @field:Pattern(regexp = NickName.PATTERN) - val nickname: String + val nickname: String? ) { fun toData() = ChangeNicknameData( - nickname = nickname + nickname = nickname!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeProfileImageRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeProfileImageRequest.kt index 5543167c..7f57de3e 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeProfileImageRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeProfileImageRequest.kt @@ -12,11 +12,12 @@ import javax.validation.constraints.NotBlank * @version 1.0.0 **/ data class ChangeProfileImageRequest( + @field:NotBlank - val profileImagePath: String + val profileImagePath: String? ) { fun toData() = ChangeProfileImageData( - profileImagePath = profileImagePath + profileImagePath = profileImagePath!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeSpotRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeSpotRequest.kt index 8c4f5c68..0341e616 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeSpotRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangeSpotRequest.kt @@ -13,11 +13,12 @@ import javax.validation.constraints.NotNull * @version 1.0.0 **/ data class ChangeSpotRequest( + @field:NotNull - val spotId: UUID + val spotId: UUID? ) { fun toData() = ChangeSpotData( - spotId = spotId + spotId = spotId!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/SignUpRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/SignUpRequest.kt index cd02ccc4..1f62003b 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/SignUpRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/SignUpRequest.kt @@ -7,6 +7,7 @@ import team.comit.simtong.domain.user.model.NickName import team.comit.simtong.domain.user.model.Password import javax.validation.constraints.Email import javax.validation.constraints.NotBlank +import javax.validation.constraints.NotEmpty import javax.validation.constraints.NotNull import javax.validation.constraints.Pattern @@ -21,36 +22,37 @@ import javax.validation.constraints.Pattern data class SignUpRequest( @field:NotBlank - val name: String, + val name: String?, - @field:NotBlank + @field:NotEmpty @field:Email - val email: String, + val email: String?, + @field:NotNull @field:Range(min = EmployeeNumber.MIN_VALUE, max = EmployeeNumber.MAX_VALUE) - val employeeNumber: Int, + val employeeNumber: Int?, @field:NotNull @field:Pattern(regexp = Password.PATTERN) - val password: String, + val password: String?, @field:NotNull @field:Pattern(regexp = NickName.PATTERN) - val nickname: String, + val nickname: String?, val profileImagePath: String?, @field:NotBlank - val deviceToken: String + val deviceToken: String? ) { fun toData() = SignUpData( - name = name, - email = email, - employeeNumber = employeeNumber, - password = password, - nickname = nickname, + name = name!!, + email = email!!, + employeeNumber = employeeNumber!!, + password = password!!, + nickname = nickname!!, profileImagePath = profileImagePath, - deviceToken = deviceToken + deviceToken = deviceToken!! ) } \ No newline at end of file diff --git a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/UserSignInRequest.kt b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/UserSignInRequest.kt index f94952e3..e25331fe 100644 --- a/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/UserSignInRequest.kt +++ b/simtong-presentation/src/main/kotlin/team/comit/simtong/domain/user/dto/UserSignInRequest.kt @@ -16,18 +16,18 @@ import javax.validation.constraints.NotNull data class UserSignInRequest( @field:NotNull - val employeeNumber: Int, + val employeeNumber: Int?, @field:NotBlank - val password: String, + val password: String?, @field:NotBlank - val deviceToken: String + val deviceToken: String? ) { fun toData() = UserSignInData( - employeeNumber = employeeNumber, - password = password, - deviceToken = deviceToken + employeeNumber = employeeNumber!!, + password = password!!, + deviceToken = deviceToken!! ) } \ No newline at end of file