From 562550880cd88e547164dded739074efe94c8b1f Mon Sep 17 00:00:00 2001 From: Klaus Date: Wed, 9 Apr 2025 19:07:04 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=ED=9A=8C?= =?UTF-8?q?=EC=9B=90=EB=A6=AC=EC=8A=A4=ED=8A=B8,=20=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=97=90=EC=9D=B4=ED=84=B0=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20-?= =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=83=80=EC=9E=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(=EC=86=8C=EC=85=9C=EB=A1=9C=EA=B7=B8=EC=9D=B8,=20?= =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EB=A1=9C=EA=B7=B8=EC=9D=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/admin/member/AdminMemberService.kt | 9 +++++++++ .../sodalive/admin/member/GetAdminMemberListResponse.kt | 1 + 2 files changed, 10 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminMemberService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminMemberService.kt index 7cccc74..3946cbe 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminMemberService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/AdminMemberService.kt @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.admin.member import kr.co.vividnext.sodalive.common.SodaException import kr.co.vividnext.sodalive.member.Member +import kr.co.vividnext.sodalive.member.MemberProvider import kr.co.vividnext.sodalive.member.MemberRole import org.springframework.beans.factory.annotation.Value import org.springframework.data.domain.Pageable @@ -98,6 +99,13 @@ class AdminMemberService( MemberRole.BOT -> "봇" } + val loginType = when (it.provider) { + MemberProvider.EMAIL -> "이메일" + MemberProvider.KAKAO -> "카카오" + MemberProvider.GOOGLE -> "구글" + MemberProvider.APPLE -> "애플" + } + val signUpDate = it.createdAt!! .atZone(ZoneId.of("UTC")) .withZoneSameInstant(ZoneId.of("Asia/Seoul")) @@ -122,6 +130,7 @@ class AdminMemberService( "$cloudFrontHost/profile/default-profile.png" }, userType = userType, + loginType = loginType, container = it.container, auth = it.auth != null, signUpDate = signUpDate, diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/GetAdminMemberListResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/GetAdminMemberListResponse.kt index 1fd1c47..5830eef 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/GetAdminMemberListResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/member/GetAdminMemberListResponse.kt @@ -11,6 +11,7 @@ data class GetAdminMemberListResponseItem( val nickname: String, val profileUrl: String, val userType: String, + val loginType: String, val container: String, val auth: Boolean, val signUpDate: String,