From 7b4f21484562326ec6b4abe746dfaabbfa9e36b4 Mon Sep 17 00:00:00 2001 From: Soju06 Date: Tue, 19 Mar 2024 17:56:51 +0900 Subject: [PATCH] chore: compatible with core 1.1.12 --- Contracts/Services/IEoullimBalanceService.cs | 3 ++- Contracts/Services/IEoullimBoothService.cs | 3 ++- Controllers/EoullimBalanceController.cs | 1 + Controllers/EoullimBoothController.cs | 1 + Controllers/EoullimBoothController.user.cs | 1 + Controllers/EoullimExchangeController.cs | 1 + Hanum.Pay.csproj | 2 +- Models/DTO/Responses/APIResponse.cs | 2 +- Models/DTO/Responses/EoullimBoothPaymentResponse.cs | 2 +- Models/DTO/Responses/EoullimBoothRankResponse.cs | 2 +- Models/DTO/Responses/EoullimUserPaymentResponse.cs | 2 +- Services/EoullimBalanceService.cs | 7 ++++--- Services/EoullimBoothService.cs | 5 +++-- 13 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Contracts/Services/IEoullimBalanceService.cs b/Contracts/Services/IEoullimBalanceService.cs index 681660b..bfe759f 100644 --- a/Contracts/Services/IEoullimBalanceService.cs +++ b/Contracts/Services/IEoullimBalanceService.cs @@ -1,3 +1,4 @@ +using Hanum.Core.Models; using Hanum.Pay.Exceptions; using Hanum.Pay.Models.DTO.Requests; using Hanum.Pay.Models.DTO.Responses; @@ -24,7 +25,7 @@ public interface IEoullimBalanceService { /// 페이지 /// 페이지당 항목수 /// 사용자잔액상세조회응답 - public Task> GetPaymentsDetailAsync(ulong userId, int page = 1, int limit = 20); + public Task> GetPaymentsDetailAsync(ulong userId, int page = 1, int limit = 20); /// /// 한세어울림한마당 결제요청 /// diff --git a/Contracts/Services/IEoullimBoothService.cs b/Contracts/Services/IEoullimBoothService.cs index df8f566..984e1aa 100644 --- a/Contracts/Services/IEoullimBoothService.cs +++ b/Contracts/Services/IEoullimBoothService.cs @@ -1,4 +1,5 @@ +using Hanum.Core.Models; using Hanum.Pay.Exceptions; using Hanum.Pay.Models.DTO.Requests; using Hanum.Pay.Models.DTO.Responses; @@ -12,7 +13,7 @@ public interface IEoullimBoothService { /// 부스 고유번호 /// 페이지 /// 페이지 당 항목 수 - public Task> GetPaymentDetailAsync(ulong boothId, int page = 1, int limit = 20); + public Task> GetPaymentDetailAsync(ulong boothId, int page = 1, int limit = 20); /// /// 환불 /// diff --git a/Controllers/EoullimBalanceController.cs b/Controllers/EoullimBalanceController.cs index 15acf86..e14eddd 100644 --- a/Controllers/EoullimBalanceController.cs +++ b/Controllers/EoullimBalanceController.cs @@ -9,6 +9,7 @@ using Hanum.Core.Helpers; using System.ComponentModel.DataAnnotations; using Hanum.Pay.Exceptions; +using Hanum.Core.Models.DTO.Responses; namespace Hanum.Pay.Controllers; diff --git a/Controllers/EoullimBoothController.cs b/Controllers/EoullimBoothController.cs index 20e9fa1..f062e71 100644 --- a/Controllers/EoullimBoothController.cs +++ b/Controllers/EoullimBoothController.cs @@ -10,6 +10,7 @@ using Hanum.Pay.Exceptions; using Hanum.Core.Models; using System.ComponentModel.DataAnnotations; +using Hanum.Core.Models.DTO.Responses; namespace Hanum.Pay.Controllers; diff --git a/Controllers/EoullimBoothController.user.cs b/Controllers/EoullimBoothController.user.cs index 9bab530..3078be1 100644 --- a/Controllers/EoullimBoothController.user.cs +++ b/Controllers/EoullimBoothController.user.cs @@ -4,6 +4,7 @@ using Hanum.Core.Authentication; using Hanum.Core.Models; using Hanum.Pay.Models.DTO.Responses; +using Hanum.Core.Models.DTO.Responses; namespace Hanum.Pay.Controllers; diff --git a/Controllers/EoullimExchangeController.cs b/Controllers/EoullimExchangeController.cs index fc1953a..77e0a36 100644 --- a/Controllers/EoullimExchangeController.cs +++ b/Controllers/EoullimExchangeController.cs @@ -8,6 +8,7 @@ using Hanum.Pay.Exceptions; using Hanum.Pay.Models.DTO.Requests; using Hanum.Pay.Models.DTO.Responses; +using Hanum.Core.Models.DTO.Responses; namespace Hanum.Pay.Controllers; diff --git a/Hanum.Pay.csproj b/Hanum.Pay.csproj index 3fa6308..2c5fc38 100644 --- a/Hanum.Pay.csproj +++ b/Hanum.Pay.csproj @@ -21,7 +21,7 @@ - + diff --git a/Models/DTO/Responses/APIResponse.cs b/Models/DTO/Responses/APIResponse.cs index aee1e9d..cf88ab4 100644 --- a/Models/DTO/Responses/APIResponse.cs +++ b/Models/DTO/Responses/APIResponse.cs @@ -3,7 +3,7 @@ namespace Hanum.Pay.Models.DTO.Responses; /// /// API페이징응답 /// -public class APIPagenationResponse { +public class APIPaginationResponse { /// /// 페이지 /// diff --git a/Models/DTO/Responses/EoullimBoothPaymentResponse.cs b/Models/DTO/Responses/EoullimBoothPaymentResponse.cs index a623309..6bcc013 100644 --- a/Models/DTO/Responses/EoullimBoothPaymentResponse.cs +++ b/Models/DTO/Responses/EoullimBoothPaymentResponse.cs @@ -3,7 +3,7 @@ namespace Hanum.Pay.Models.DTO.Responses; /// /// 한세어울림한마당 부스결제내역 /// -public class EoullimBoothPaymentDetailResponse : APIPagenationResponse { +public class EoullimBoothPaymentDetailResponse : APIPaginationResponse { /// /// 부스정보 /// diff --git a/Models/DTO/Responses/EoullimBoothRankResponse.cs b/Models/DTO/Responses/EoullimBoothRankResponse.cs index c464c5c..affb51f 100644 --- a/Models/DTO/Responses/EoullimBoothRankResponse.cs +++ b/Models/DTO/Responses/EoullimBoothRankResponse.cs @@ -3,7 +3,7 @@ namespace Hanum.Pay.Models.DTO.Responses; /// /// 한세어울림한마당부스순위 /// -public class EoullimBoothRankResponse : APIPagenationResponse { +public class EoullimBoothRankResponse : APIPaginationResponse { /// /// 부스순위 /// diff --git a/Models/DTO/Responses/EoullimUserPaymentResponse.cs b/Models/DTO/Responses/EoullimUserPaymentResponse.cs index 841fb76..f8611cb 100644 --- a/Models/DTO/Responses/EoullimUserPaymentResponse.cs +++ b/Models/DTO/Responses/EoullimUserPaymentResponse.cs @@ -4,7 +4,7 @@ namespace Hanum.Pay.Models.DTO.Responses; /// /// 한세어울림한마당 사용자결제내역 /// -public class EoullimUserPaymentDetailResponse : APIPagenationResponse { +public class EoullimUserPaymentDetailResponse : APIPaginationResponse { /// /// 잔액 /// diff --git a/Services/EoullimBalanceService.cs b/Services/EoullimBalanceService.cs index 7729ea6..948092e 100644 --- a/Services/EoullimBalanceService.cs +++ b/Services/EoullimBalanceService.cs @@ -1,11 +1,12 @@ +using Microsoft.EntityFrameworkCore; using Hanum.Core.Helpers; +using Hanum.Core.Models; using Hanum.Pay.Contexts; using Hanum.Pay.Contracts.Services; using Hanum.Pay.Exceptions; using Hanum.Pay.Models.DTO.Requests; using Hanum.Pay.Models.DTO.Responses; -using Microsoft.EntityFrameworkCore; namespace Hanum.Pay.Services; @@ -52,10 +53,10 @@ select b.Amount ).FirstOrDefaultAsync(); } - public async Task> GetPaymentsDetailAsync(ulong userId, int page = 1, int limit = 20) { + public async Task> GetPaymentsDetailAsync(ulong userId, int page = 1, int limit = 20) { return await context.EoullimPayments.Where(p => p.UserId == userId) .OrderByDescending(p => p.Id) - .ToOffsetPagenation( + .ToOffsetPagination( p => new EoullimUserPayment { Id = p.Id, UserId = p.UserId, diff --git a/Services/EoullimBoothService.cs b/Services/EoullimBoothService.cs index 3629697..61f25fe 100644 --- a/Services/EoullimBoothService.cs +++ b/Services/EoullimBoothService.cs @@ -1,6 +1,7 @@ using Microsoft.EntityFrameworkCore; using Hanum.Core.Helpers; +using Hanum.Core.Models; using Hanum.Pay.Contexts; using Hanum.Pay.Contracts.Services; using Hanum.Pay.Exceptions; @@ -10,9 +11,9 @@ namespace Hanum.Pay.Services; public class EoullimBoothService(ILogger logger, HanumContext context) : IEoullimBoothService { - public async Task> GetPaymentDetailAsync(ulong boothId, int page = 1, int limit = 20) { + public async Task> GetPaymentDetailAsync(ulong boothId, int page = 1, int limit = 20) { return await context.EoullimPayments.Where(p => p.BoothId == boothId) - .ToOffsetPagenation( + .ToOffsetPagination( p => new EoullimBoothPayment { Id = p.Id, UserId = p.UserId,