Skip to content

Commit

Permalink
feat(#53): converted user dto v1 classes java to kotlin
Browse files Browse the repository at this point in the history
  • Loading branch information
KimDoubleB committed Jan 18, 2023
1 parent 5f8c0fc commit 19b594b
Show file tree
Hide file tree
Showing 10 changed files with 107 additions and 144 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package site.archive.dto.v1.user

import site.archive.common.dateTimeFormatter
import site.archive.domain.user.BaseUser
import site.archive.domain.user.UserRole
import java.time.LocalDateTime

data class BaseUserDtoV1(
val userId: Long,
val mailAddress: String,
val userRole: UserRole,
val profileImage: String,
val nickname: String,
private val createdAt: LocalDateTime
) {

fun getCreatedAt(): String {
return dateTimeFormatter.format(createdAt)
}

companion object {
@JvmStatic
fun from(baseUser: BaseUser): BaseUserDtoV1 {
return BaseUserDtoV1(
userId = baseUser.id,
mailAddress = baseUser.mailAddress,
userRole = baseUser.role,
createdAt = baseUser.createdAt,
profileImage = baseUser.profileImage,
nickname = baseUser.nickname
)
}
}

}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package site.archive.dto.v1.user

import com.fasterxml.jackson.annotation.JsonProperty

data class OAuthRegisterRequestDtoV1(
val provider: String,
@field: JsonProperty("providerAccessToken") val token: String
)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package site.archive.dto.v1.user

import site.archive.common.dateTimeFormatter
import site.archive.domain.user.BaseUser
import site.archive.domain.user.UserRole

data class SpecificUserDtoV1(
val userId: Long,
val mailAddress: String,
val userRole: UserRole,
val createdAt: String,
val profileImage: String,
val nickname: String,
val userType: String
) {

companion object {
@JvmStatic
fun from(baseUser: BaseUser) : SpecificUserDtoV1 {
val createdAt = dateTimeFormatter.format(baseUser.createdAt)
return SpecificUserDtoV1(
userId = baseUser.id,
mailAddress = baseUser.mailAddress,
userRole = baseUser.role,
createdAt = createdAt,
profileImage = baseUser.profileImage,
nickname = baseUser.nickname,
userType = baseUser.userType
)
}
}

}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package site.archive.dto.v1.user

import jakarta.validation.constraints.Email
import jakarta.validation.constraints.NotBlank

data class UserEmailRequestDtoV1(
@field: NotBlank(message = "์ด๋ฉ”์ผ์€ ํ•„์ˆ˜ ์ž…๋ ฅ ํ•ญ๋ชฉ์ž…๋‹ˆ๋‹ค.")
@field: Email(message = "์˜ฌ๋ฐ”๋ฅธ ์ด๋ฉ”์ผ์„ ์ž…๋ ฅํ•ด ์ฃผ์„ธ์š”.")
val email: String
)

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package site.archive.dto.v1.user

import jakarta.validation.constraints.Email
import jakarta.validation.constraints.NotBlank
import jakarta.validation.constraints.Pattern

data class UserPasswordResetRequestDtoV1(
@field: NotBlank(message = "์ด๋ฉ”์ผ์€ ํ•„์ˆ˜ ์ž…๋ ฅ ํ•ญ๋ชฉ์ž…๋‹ˆ๋‹ค.")
@field: Email(message = "์˜ฌ๋ฐ”๋ฅธ ์ด๋ฉ”์ผ์„ ์ž…๋ ฅํ•ด ์ฃผ์„ธ์š”.")
val email: String,

@field: NotBlank(message = "ํ˜„์žฌ ๋น„๋ฐ€๋ฒˆํ˜ธ๋Š” ํ•„์ˆ˜ ์ž…๋ ฅ ํ•ญ๋ชฉ์ž…๋‹ˆ๋‹ค.")
val currentPassword: String,

@field: NotBlank(message = "์ƒˆ๋กœ์šด ๋น„๋ฐ€๋ฒˆํ˜ธ๋Š” ํ•„์ˆ˜ ์ž…๋ ฅ ํ•ญ๋ชฉ์ž…๋‹ˆ๋‹ค.")
@field: Pattern(
regexp = "(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9@$!%*#?&]{8,20}$",
message = "๋น„๋ฐ€๋ฒˆํ˜ธ๋Š” ์˜๋ฌธ/์ˆซ์ž ๋ฅผ ๊ผญ ํฌํ•จํ•˜์—ฌ 8~20์ž๋ฆฌ๋กœ ์ž…๋ ฅํ•ด ์ฃผ์„ธ์š”."
)
val newPassword: String
)

0 comments on commit 19b594b

Please sign in to comment.