Compare commits
No commits in common. "c3c60605fdb9b0906a0954127a78c9fd7017d6a3" and "238f704b224b5ba0710250291689cc4a3f58d8d8" have entirely different histories.
c3c60605fd
...
238f704b22
|
@ -2,7 +2,6 @@ package kr.co.vividnext.sodalive.admin.member
|
||||||
|
|
||||||
import kr.co.vividnext.sodalive.common.SodaException
|
import kr.co.vividnext.sodalive.common.SodaException
|
||||||
import kr.co.vividnext.sodalive.member.Member
|
import kr.co.vividnext.sodalive.member.Member
|
||||||
import kr.co.vividnext.sodalive.member.MemberProvider
|
|
||||||
import kr.co.vividnext.sodalive.member.MemberRole
|
import kr.co.vividnext.sodalive.member.MemberRole
|
||||||
import org.springframework.beans.factory.annotation.Value
|
import org.springframework.beans.factory.annotation.Value
|
||||||
import org.springframework.data.domain.Pageable
|
import org.springframework.data.domain.Pageable
|
||||||
|
@ -99,13 +98,6 @@ class AdminMemberService(
|
||||||
MemberRole.BOT -> "봇"
|
MemberRole.BOT -> "봇"
|
||||||
}
|
}
|
||||||
|
|
||||||
val loginType = when (it.provider) {
|
|
||||||
MemberProvider.EMAIL -> "이메일"
|
|
||||||
MemberProvider.KAKAO -> "카카오"
|
|
||||||
MemberProvider.GOOGLE -> "구글"
|
|
||||||
MemberProvider.APPLE -> "애플"
|
|
||||||
}
|
|
||||||
|
|
||||||
val signUpDate = it.createdAt!!
|
val signUpDate = it.createdAt!!
|
||||||
.atZone(ZoneId.of("UTC"))
|
.atZone(ZoneId.of("UTC"))
|
||||||
.withZoneSameInstant(ZoneId.of("Asia/Seoul"))
|
.withZoneSameInstant(ZoneId.of("Asia/Seoul"))
|
||||||
|
@ -130,7 +122,6 @@ class AdminMemberService(
|
||||||
"$cloudFrontHost/profile/default-profile.png"
|
"$cloudFrontHost/profile/default-profile.png"
|
||||||
},
|
},
|
||||||
userType = userType,
|
userType = userType,
|
||||||
loginType = loginType,
|
|
||||||
container = it.container,
|
container = it.container,
|
||||||
auth = it.auth != null,
|
auth = it.auth != null,
|
||||||
signUpDate = signUpDate,
|
signUpDate = signUpDate,
|
||||||
|
|
|
@ -11,7 +11,6 @@ data class GetAdminMemberListResponseItem(
|
||||||
val nickname: String,
|
val nickname: String,
|
||||||
val profileUrl: String,
|
val profileUrl: String,
|
||||||
val userType: String,
|
val userType: String,
|
||||||
val loginType: String,
|
|
||||||
val container: String,
|
val container: String,
|
||||||
val auth: Boolean,
|
val auth: Boolean,
|
||||||
val signUpDate: String,
|
val signUpDate: String,
|
||||||
|
|
Loading…
Reference in New Issue