diff --git a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt index 2c13e94b..cb1c02fb 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/business/AdminService.kt @@ -1,7 +1,7 @@ package com.sangdol.roomescape.admin.business -import com.sangdol.roomescape.admin.business.dto.AdminLoginCredentials -import com.sangdol.roomescape.admin.business.dto.toCredentials +import com.sangdol.roomescape.admin.dto.AdminLoginCredentials +import com.sangdol.roomescape.admin.mapper.toCredentials import com.sangdol.roomescape.admin.exception.AdminErrorCode import com.sangdol.roomescape.admin.exception.AdminException import com.sangdol.roomescape.admin.infrastructure.persistence.AdminRepository diff --git a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/dto/AdminLoginDTO.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/dto/AdminLoginDTO.kt similarity index 69% rename from service/src/main/kotlin/com/sangdol/roomescape/admin/business/dto/AdminLoginDTO.kt rename to service/src/main/kotlin/com/sangdol/roomescape/admin/dto/AdminLoginDTO.kt index d9d6c4f7..aa81c332 100644 --- a/service/src/main/kotlin/com/sangdol/roomescape/admin/business/dto/AdminLoginDTO.kt +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/dto/AdminLoginDTO.kt @@ -1,6 +1,5 @@ -package com.sangdol.roomescape.admin.business.dto +package com.sangdol.roomescape.admin.dto -import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity import com.sangdol.roomescape.admin.infrastructure.persistence.AdminPermissionLevel import com.sangdol.roomescape.admin.infrastructure.persistence.AdminType import com.sangdol.roomescape.auth.web.LoginCredentials @@ -22,18 +21,9 @@ data class AdminLoginCredentials( ) } -fun AdminEntity.toCredentials() = AdminLoginCredentials( - id = this.id, - password = this.password, - name = this.name, - type = this.type, - storeId = this.storeId, - permissionLevel = this.permissionLevel -) - data class AdminLoginSuccessResponse( override val accessToken: String, override val name: String, val type: AdminType, val storeId: Long?, -) : LoginSuccessResponse() \ No newline at end of file +) : LoginSuccessResponse() diff --git a/service/src/main/kotlin/com/sangdol/roomescape/admin/mapper/AdminMappingExtensions.kt b/service/src/main/kotlin/com/sangdol/roomescape/admin/mapper/AdminMappingExtensions.kt new file mode 100644 index 00000000..8341d624 --- /dev/null +++ b/service/src/main/kotlin/com/sangdol/roomescape/admin/mapper/AdminMappingExtensions.kt @@ -0,0 +1,13 @@ +package com.sangdol.roomescape.admin.mapper + +import com.sangdol.roomescape.admin.dto.AdminLoginCredentials +import com.sangdol.roomescape.admin.infrastructure.persistence.AdminEntity + +fun AdminEntity.toCredentials() = AdminLoginCredentials( + id = this.id, + password = this.password, + name = this.name, + type = this.type, + storeId = this.storeId, + permissionLevel = this.permissionLevel +)