From aa4af439be34d86d390094a989e364aa647a9550 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 30 Mar 2024 01:48:25 +0900 Subject: [PATCH 1/4] test --- .../kr/co/vividnext/sodalive/content/AudioContentController.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt index f631261..66efa77 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt @@ -111,6 +111,8 @@ class AudioContentController(private val service: AudioContentService) { ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") + print("test") + ApiResponse.ok( service.getAudioContentList( creatorId = creatorId, -- 2.40.1 From b3b7ef90e82b0739670cb0cc1112e68d988f0ac1 Mon Sep 17 00:00:00 2001 From: Klaus Date: Sat, 30 Mar 2024 02:34:51 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20prin?= =?UTF-8?q?t=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kr/co/vividnext/sodalive/content/AudioContentController.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt index 66efa77..f631261 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/content/AudioContentController.kt @@ -111,8 +111,6 @@ class AudioContentController(private val service: AudioContentService) { ) = run { if (member == null) throw SodaException("로그인 정보를 확인해주세요.") - print("test") - ApiResponse.ok( service.getAudioContentList( creatorId = creatorId, -- 2.40.1 From 67457967c045ad50dd4d00e3f72e570a4d1a0b41 Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 1 Apr 2024 18:41:13 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=BA=94?= =?UTF-8?q?=20=EC=B6=A9=EC=A0=84=ED=98=84=ED=99=A9=20-=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=EA=B0=92=EC=97=90=20=ED=99=94=ED=8F=90=20locale=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/admin/charge/AdminChargeStatusQueryRepository.kt | 1 + .../vividnext/sodalive/admin/charge/AdminChargeStatusService.kt | 1 + .../sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt | 1 + .../sodalive/admin/charge/GetChargeStatusDetailResponse.kt | 1 + 4 files changed, 4 insertions(+) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt index 54e57f0..1d626a9 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt @@ -76,6 +76,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory payment.method.coalesce(""), payment.price, can1.price, + payment.locale, formattedDate ) ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt index f54b847..fef1205 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusService.kt @@ -82,6 +82,7 @@ class AdminChargeStatusService(val repository: AdminChargeStatusQueryRepository) nickname = it.nickname, method = it.method, amount = it.appleChargeAmount.toInt(), + locale = it.locale, datetime = it.datetime ) } diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt index fcfa0d9..d4b5e91 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailQueryDto.kt @@ -8,5 +8,6 @@ data class GetChargeStatusDetailQueryDto @QueryProjection constructor( val method: String, val appleChargeAmount: Double, val pgChargeAmount: Int, + val locale: String, val datetime: String ) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt index 430b6f8..6e03036 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/GetChargeStatusDetailResponse.kt @@ -5,5 +5,6 @@ data class GetChargeStatusDetailResponse( val nickname: String, val method: String, val amount: Int, + val locale: String, val datetime: String ) -- 2.40.1 From f8b02e596456bebd2b8d22ee3be6d91d9cd2d88b Mon Sep 17 00:00:00 2001 From: Klaus Date: Mon, 1 Apr 2024 19:07:18 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20-=20=EC=BA=94?= =?UTF-8?q?=20=EC=B6=A9=EC=A0=84=ED=98=84=ED=99=A9=20-=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=EA=B0=92=EC=97=90=20=ED=99=94=ED=8F=90=20locale=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/admin/charge/AdminChargeStatusQueryRepository.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt index 1d626a9..dc61d83 100644 --- a/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt +++ b/src/main/kotlin/kr/co/vividnext/sodalive/admin/charge/AdminChargeStatusQueryRepository.kt @@ -76,7 +76,7 @@ class AdminChargeStatusQueryRepository(private val queryFactory: JPAQueryFactory payment.method.coalesce(""), payment.price, can1.price, - payment.locale, + payment.locale.coalesce(""), formattedDate ) ) -- 2.40.1