Skip to content

Commit

Permalink
chore: compatible with core 1.1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
Soju06 committed Mar 19, 2024
1 parent f9e5ae7 commit 7b4f214
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 12 deletions.
3 changes: 2 additions & 1 deletion Contracts/Services/IEoullimBalanceService.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using Hanum.Core.Models;
using Hanum.Pay.Exceptions;
using Hanum.Pay.Models.DTO.Requests;
using Hanum.Pay.Models.DTO.Responses;
Expand All @@ -24,7 +25,7 @@ public interface IEoullimBalanceService {
/// <param name="page">페이지</param>
/// <param name="limit">페이지당 항목수</param>
/// <returns>사용자잔액상세조회응답</returns>
public Task<DbOffsetBasedPagenationResult<EoullimUserPayment>> GetPaymentsDetailAsync(ulong userId, int page = 1, int limit = 20);
public Task<DbOffsetBasedPaginationResult<EoullimUserPayment>> GetPaymentsDetailAsync(ulong userId, int page = 1, int limit = 20);
/// <summary>
/// 한세어울림한마당 결제요청
/// </summary>
Expand Down
3 changes: 2 additions & 1 deletion Contracts/Services/IEoullimBoothService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

using Hanum.Core.Models;
using Hanum.Pay.Exceptions;
using Hanum.Pay.Models.DTO.Requests;
using Hanum.Pay.Models.DTO.Responses;
Expand All @@ -12,7 +13,7 @@ public interface IEoullimBoothService {
/// <param name="boothId">부스 고유번호</param>
/// <param name="page">페이지</param>
/// <param name="limit">페이지 당 항목 수</param>
public Task<DbOffsetBasedPagenationResult<EoullimBoothPayment>> GetPaymentDetailAsync(ulong boothId, int page = 1, int limit = 20);
public Task<DbOffsetBasedPaginationResult<EoullimBoothPayment>> GetPaymentDetailAsync(ulong boothId, int page = 1, int limit = 20);
/// <summary>
/// 환불
/// </summary>
Expand Down
1 change: 1 addition & 0 deletions Controllers/EoullimBalanceController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions Controllers/EoullimBoothController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions Controllers/EoullimBoothController.user.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 1 addition & 0 deletions Controllers/EoullimExchangeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion Hanum.Pay.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hanum.Core" Version="1.1.9" GeneratePathProperty="true" />
<PackageReference Include="Hanum.Core" Version="1.1.12" GeneratePathProperty="true" />

<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
Expand Down
2 changes: 1 addition & 1 deletion Models/DTO/Responses/APIResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Hanum.Pay.Models.DTO.Responses;
/// <summary>
/// API페이징응답
/// </summary>
public class APIPagenationResponse {
public class APIPaginationResponse {
/// <summary>
/// 페이지
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion Models/DTO/Responses/EoullimBoothPaymentResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Hanum.Pay.Models.DTO.Responses;
/// <summary>
/// 한세어울림한마당 부스결제내역
/// </summary>
public class EoullimBoothPaymentDetailResponse : APIPagenationResponse {
public class EoullimBoothPaymentDetailResponse : APIPaginationResponse {
/// <summary>
/// 부스정보
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion Models/DTO/Responses/EoullimBoothRankResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ namespace Hanum.Pay.Models.DTO.Responses;
/// <summary>
/// 한세어울림한마당부스순위
/// </summary>
public class EoullimBoothRankResponse : APIPagenationResponse {
public class EoullimBoothRankResponse : APIPaginationResponse {
/// <summary>
/// 부스순위
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion Models/DTO/Responses/EoullimUserPaymentResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ namespace Hanum.Pay.Models.DTO.Responses;
/// <summary>
/// 한세어울림한마당 사용자결제내역
/// </summary>
public class EoullimUserPaymentDetailResponse : APIPagenationResponse {
public class EoullimUserPaymentDetailResponse : APIPaginationResponse {
/// <summary>
/// 잔액
/// </summary>
Expand Down
7 changes: 4 additions & 3 deletions Services/EoullimBalanceService.cs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -52,10 +53,10 @@ select b.Amount
).FirstOrDefaultAsync();
}

public async Task<DbOffsetBasedPagenationResult<EoullimUserPayment>> GetPaymentsDetailAsync(ulong userId, int page = 1, int limit = 20) {
public async Task<DbOffsetBasedPaginationResult<EoullimUserPayment>> 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,
Expand Down
5 changes: 3 additions & 2 deletions Services/EoullimBoothService.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -10,9 +11,9 @@
namespace Hanum.Pay.Services;

public class EoullimBoothService(ILogger<EoullimBoothService> logger, HanumContext context) : IEoullimBoothService {
public async Task<DbOffsetBasedPagenationResult<EoullimBoothPayment>> GetPaymentDetailAsync(ulong boothId, int page = 1, int limit = 20) {
public async Task<DbOffsetBasedPaginationResult<EoullimBoothPayment>> 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,
Expand Down

0 comments on commit 7b4f214

Please sign in to comment.