From 4e56dd1204927404931007ac1f05f6af837ffc41 Mon Sep 17 00:00:00 2001 From: MeysamMoghaddam <65253484+MeysamMoghaddam@users.noreply.github.com> Date: Mon, 13 Oct 2025 12:09:06 +0330 Subject: [PATCH] Generator Changes at 10/13/2025 12:07:53 PM --- .../Common/Mappings/TransactionProfile.cs | 10 + .../PaymentRequest/PaymentRequestCommand.cs | 21 + .../PaymentRequestCommandHandler.cs | 16 + .../PaymentRequestCommandValidator.cs | 24 ++ .../PaymentRequestResponseDto.cs | 7 + .../PaymentVerificationCommand.cs | 9 + .../PaymentVerificationCommandHandler.cs | 16 + .../PaymentVerificationCommandValidator.cs | 18 + .../PaymentVerificationResponseDto.cs | 17 + .../GetAllTransactionByFilterQuery.cs | 55 +++ .../GetAllTransactionByFilterQueryHandler.cs | 16 + ...GetAllTransactionByFilterQueryValidator.cs | 14 + .../GetAllTransactionByFilterResponseDto.cs | 53 +++ .../GetTransaction/GetTransactionQuery.cs | 9 + .../GetTransactionQueryHandler.cs | 16 + .../GetTransactionQueryValidator.cs | 14 + .../GetTransactionResponseDto.cs | 47 +++ .../CreateNewUserOrderCommand.cs | 2 - .../CreateNewUserOrderCommandValidator.cs | 2 - .../UpdateUserOrder/UpdateUserOrderCommand.cs | 10 - .../UpdateUserOrderCommandValidator.cs | 8 - .../Common/Mappings/TransactionProfile.cs | 11 + .../Services/TransactionService.cs | 32 ++ .../ConfigureServices.cs | 14 + ...rontOffice.BFF.Transaction.Protobuf.csproj | 27 ++ .../Protos/google/api/annotations.proto | 31 ++ .../Protos/google/api/http.proto | 377 ++++++++++++++++++ .../Protos/transaction.proto | 218 ++++++++++ ...tAllTransactionByFilterRequestValidator.cs | 17 + .../GetTransactionRequestValidator.cs | 17 + .../PaymentRequestRequestValidator.cs | 27 ++ .../PaymentVerificationRequestValidator.cs | 21 + .../Protos/userorder.proto | 10 +- .../CreateNewUserOrderRequestValidator.cs | 2 - .../UpdateUserOrderRequestValidator.cs | 8 - 35 files changed, 1156 insertions(+), 40 deletions(-) create mode 100644 src/FrontOffice.BFF.Application/Common/Mappings/TransactionProfile.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommand.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandHandler.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandValidator.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestResponseDto.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommand.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandHandler.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandValidator.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationResponseDto.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQuery.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryHandler.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryValidator.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterResponseDto.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQuery.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryHandler.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryValidator.cs create mode 100644 src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionResponseDto.cs create mode 100644 src/FrontOffice.BFF.WebApi/Common/Mappings/TransactionProfile.cs create mode 100644 src/FrontOffice.BFF.WebApi/Services/TransactionService.cs create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/ConfigureServices.cs create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/FrontOffice.BFF.Transaction.Protobuf.csproj create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/annotations.proto create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/http.proto create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/transaction.proto create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetAllTransactionByFilterRequestValidator.cs create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetTransactionRequestValidator.cs create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentRequestRequestValidator.cs create mode 100644 src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentVerificationRequestValidator.cs diff --git a/src/FrontOffice.BFF.Application/Common/Mappings/TransactionProfile.cs b/src/FrontOffice.BFF.Application/Common/Mappings/TransactionProfile.cs new file mode 100644 index 0000000..59a4511 --- /dev/null +++ b/src/FrontOffice.BFF.Application/Common/Mappings/TransactionProfile.cs @@ -0,0 +1,10 @@ +namespace FrontOffice.BFF.Application.Common.Mappings; + +public class TransactionProfile : IRegister +{ + void IRegister.Register(TypeAdapterConfig config) + { + //config.NewConfig() + // .Map(dest => dest.FullName, src => $"{src.Firstname} {src.Lastname}"); + } +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommand.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommand.cs new file mode 100644 index 0000000..8272943 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommand.cs @@ -0,0 +1,21 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentRequest; +public record PaymentRequestCommand : IRequest +{ + //مقدار + public long Amount { get; init; } + //آدرس اینترنتی بازگشت + public string CallbackUrl { get; init; } + //توضیحات + public string? Description { get; init; } + //موبایل + public string? Mobile { get; init; } + //ایمیل + public string? Email { get; init; } + //واحد پولی + public CurrencyEnum Currency { get; init; } + //نوع تراکنش + public TransactionTypeEnum Type { get; init; } + //شناسه سفارش + public string? OrderId { get; init; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandHandler.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandHandler.cs new file mode 100644 index 0000000..f9fc104 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandHandler.cs @@ -0,0 +1,16 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentRequest; +public class PaymentRequestCommandHandler : IRequestHandler +{ + private readonly IApplicationContractContext _context; + + public PaymentRequestCommandHandler(IApplicationContractContext context) + { + _context = context; + } + + public async Task Handle(PaymentRequestCommand request, CancellationToken cancellationToken) + { + //TODO: Implement your business logic + return new PaymentRequestResponseDto(); + } +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandValidator.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandValidator.cs new file mode 100644 index 0000000..b39c68f --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestCommandValidator.cs @@ -0,0 +1,24 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentRequest; +public class PaymentRequestCommandValidator : AbstractValidator +{ + public PaymentRequestCommandValidator() + { + RuleFor(model => model.Amount) + .NotNull(); + RuleFor(model => model.CallbackUrl) + .NotEmpty(); + RuleFor(model => model.Currency) + .IsInEnum() + .NotNull(); + RuleFor(model => model.Type) + .IsInEnum() + .NotNull(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((PaymentRequestCommand)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestResponseDto.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestResponseDto.cs new file mode 100644 index 0000000..5f8650c --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentRequest/PaymentRequestResponseDto.cs @@ -0,0 +1,7 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentRequest; +public class PaymentRequestResponseDto +{ + //آدرس اینترنتی درگاه پرداخت + public string PaymentGWUrl { get; set; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommand.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommand.cs new file mode 100644 index 0000000..4175310 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommand.cs @@ -0,0 +1,9 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentVerification; +public record PaymentVerificationCommand : IRequest +{ + //آتوریتی + public string Authority { get; init; } + //وضعیت + public string Status { get; init; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandHandler.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandHandler.cs new file mode 100644 index 0000000..902b0de --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandHandler.cs @@ -0,0 +1,16 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentVerification; +public class PaymentVerificationCommandHandler : IRequestHandler +{ + private readonly IApplicationContractContext _context; + + public PaymentVerificationCommandHandler(IApplicationContractContext context) + { + _context = context; + } + + public async Task Handle(PaymentVerificationCommand request, CancellationToken cancellationToken) + { + //TODO: Implement your business logic + return new PaymentVerificationResponseDto(); + } +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandValidator.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandValidator.cs new file mode 100644 index 0000000..31e442a --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationCommandValidator.cs @@ -0,0 +1,18 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentVerification; +public class PaymentVerificationCommandValidator : AbstractValidator +{ + public PaymentVerificationCommandValidator() + { + RuleFor(model => model.Authority) + .NotEmpty(); + RuleFor(model => model.Status) + .NotEmpty(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((PaymentVerificationCommand)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationResponseDto.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationResponseDto.cs new file mode 100644 index 0000000..5e25e7e --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Commands/PaymentVerification/PaymentVerificationResponseDto.cs @@ -0,0 +1,17 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentVerification; +public class PaymentVerificationResponseDto +{ + //شناسه + public long Id { get; set; } + //وضعیت پرداخت + public bool PaymentStatus { get; set; } + //پیام + public string Message { get; set; } + //شناسه پرداخت + public string? RefId { get; set; } + //شناسه سفارش + public string? OrderId { get; set; } + //کد وضعیت فعال سازی + public int? VerificationStatusCode { get; set; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQuery.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQuery.cs new file mode 100644 index 0000000..6fbc705 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQuery.cs @@ -0,0 +1,55 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetAllTransactionByFilter; +public record GetAllTransactionByFilterQuery : IRequest +{ + //موقعیت صفحه بندی + public PaginationState? PaginationState { get; init; } + //مرتب سازی بر اساس + public string? SortBy { get; init; } + //فیلتر + public GetAllTransactionByFilterFilter? Filter { get; init; } + +}public class GetAllTransactionByFilterFilter +{ + //شناسه + public long? Id { get; set; } + //شناسه بازرگانی + public string? MerchantId { get; set; } + //مقدار + public long? Amount { get; set; } + //آدرس اینترنتی برگشت به تماس + public string? CallbackUrl { get; set; } + //توضیحات + public string? Description { get; set; } + //موبایل + public string? Mobile { get; set; } + //ایمیل + public string? Email { get; set; } + //کد وضعیت درخواست + public int? RequestStatusCode { get; set; } + //پیام وضعیت درخواست + public string? RequestStatusMessage { get; set; } + //اتوریتی-اختیار + public string? Authority { get; set; } + //نوع کارمزد + public string? FeeType { get; set; } + //کارمزد + public long? Fee { get; set; } + //واحد پولی + public CurrencyEnum? Currency { get; set; } + //وضعیت پرداخت + public bool? PaymentStatus { get; set; } + //کد وضعیت فعال سازی + public int? VerificationStatusCode { get; set; } + //پیام وضعیت فعال سازی + public string? VerificationStatusMessage { get; set; } + //هش کارت + public string? CardHash { get; set; } + //شماره کارت + public string? CardPan { get; set; } + //شماره تراکنش + public string? RefId { get; set; } + //شناسه سفارش + public string? OrderId { get; set; } + //نوع تراکنش + public TransactionTypeEnum? Type { get; set; } +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryHandler.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryHandler.cs new file mode 100644 index 0000000..ee6c004 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryHandler.cs @@ -0,0 +1,16 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetAllTransactionByFilter; +public class GetAllTransactionByFilterQueryHandler : IRequestHandler +{ + private readonly IApplicationContractContext _context; + + public GetAllTransactionByFilterQueryHandler(IApplicationContractContext context) + { + _context = context; + } + + public async Task Handle(GetAllTransactionByFilterQuery request, CancellationToken cancellationToken) + { + //TODO: Implement your business logic + return new GetAllTransactionByFilterResponseDto(); + } +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryValidator.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryValidator.cs new file mode 100644 index 0000000..ce900cb --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterQueryValidator.cs @@ -0,0 +1,14 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetAllTransactionByFilter; +public class GetAllTransactionByFilterQueryValidator : AbstractValidator +{ + public GetAllTransactionByFilterQueryValidator() + { + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetAllTransactionByFilterQuery)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterResponseDto.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterResponseDto.cs new file mode 100644 index 0000000..50118e6 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetAllTransactionByFilter/GetAllTransactionByFilterResponseDto.cs @@ -0,0 +1,53 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetAllTransactionByFilter; +public class GetAllTransactionByFilterResponseDto +{ + //متادیتا + public MetaData MetaData { get; set; } + //مدل خروجی + public List? Models { get; set; } + +}public class GetAllTransactionByFilterResponseModel +{ + //شناسه + public long Id { get; set; } + //شناسه بازرگانی + public string MerchantId { get; set; } + //مقدار + public long Amount { get; set; } + //آدرس اینترنتی برگشت به تماس + public string CallbackUrl { get; set; } + //توضیحات + public string Description { get; set; } + //موبایل + public string? Mobile { get; set; } + //ایمیل + public string? Email { get; set; } + //کد وضعیت درخواست + public int? RequestStatusCode { get; set; } + //پیام وضعیت درخواست + public string? RequestStatusMessage { get; set; } + //اتوریتی-اختیار + public string? Authority { get; set; } + //نوع کارمزد + public string? FeeType { get; set; } + //کارمزد + public long? Fee { get; set; } + //واحد پولی + public CurrencyEnum? Currency { get; set; } + //وضعیت پرداخت + public bool PaymentStatus { get; set; } + //کد وضعیت فعال سازی + public int? VerificationStatusCode { get; set; } + //پیام وضعیت فعال سازی + public string? VerificationStatusMessage { get; set; } + //هش کارت + public string? CardHash { get; set; } + //شماره کارت + public string? CardPan { get; set; } + //شماره تراکنش + public string? RefId { get; set; } + //شناسه سفارش + public string? OrderId { get; set; } + //نوع تراکنش + public TransactionTypeEnum Type { get; set; } +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQuery.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQuery.cs new file mode 100644 index 0000000..571c412 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQuery.cs @@ -0,0 +1,9 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetTransaction; +public record GetTransactionQuery : IRequest +{ + //شناسه + public long? Id { get; init; } + //آتوریتی + public string? Authority { get; init; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryHandler.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryHandler.cs new file mode 100644 index 0000000..1d1fd97 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryHandler.cs @@ -0,0 +1,16 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetTransaction; +public class GetTransactionQueryHandler : IRequestHandler +{ + private readonly IApplicationContractContext _context; + + public GetTransactionQueryHandler(IApplicationContractContext context) + { + _context = context; + } + + public async Task Handle(GetTransactionQuery request, CancellationToken cancellationToken) + { + //TODO: Implement your business logic + return new GetTransactionResponseDto(); + } +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryValidator.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryValidator.cs new file mode 100644 index 0000000..e5597a2 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionQueryValidator.cs @@ -0,0 +1,14 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetTransaction; +public class GetTransactionQueryValidator : AbstractValidator +{ + public GetTransactionQueryValidator() + { + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetTransactionQuery)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionResponseDto.cs b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionResponseDto.cs new file mode 100644 index 0000000..f46b5b5 --- /dev/null +++ b/src/FrontOffice.BFF.Application/TransactionCQ/Queries/GetTransaction/GetTransactionResponseDto.cs @@ -0,0 +1,47 @@ +namespace FrontOffice.BFF.Application.TransactionCQ.Queries.GetTransaction; +public class GetTransactionResponseDto +{ + //شناسه + public long Id { get; set; } + //شناسه بازرگانی + public string MerchantId { get; set; } + //مقدار + public long Amount { get; set; } + //آدرس اینترنتی برگشت به تماس + public string CallbackUrl { get; set; } + //توضیحات + public string Description { get; set; } + //موبایل + public string? Mobile { get; set; } + //ایمیل + public string? Email { get; set; } + //کد وضعیت درخواست + public int? RequestStatusCode { get; set; } + //پیام وضعیت درخواست + public string? RequestStatusMessage { get; set; } + //اتوریتی-اختیار + public string? Authority { get; set; } + //نوع کارمزد + public string? FeeType { get; set; } + //کارمزد + public long? Fee { get; set; } + //واحد پولی + public CurrencyEnum? Currency { get; set; } + //وضعیت پرداخت + public bool PaymentStatus { get; set; } + //کد وضعیت فعال سازی + public int? VerificationStatusCode { get; set; } + //پیام وضعیت فعال سازی + public string? VerificationStatusMessage { get; set; } + //هش کارت + public string? CardHash { get; set; } + //شماره کارت + public string? CardPan { get; set; } + //شماره تراکنش + public string? RefId { get; set; } + //شناسه سفارش + public string? OrderId { get; set; } + //نوع تراکنش + public TransactionTypeEnum Type { get; set; } + +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs index d08b4a3..31cf944 100644 --- a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs +++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs @@ -11,8 +11,6 @@ public record CreateNewUserOrderCommand : IRequest model.PaymentStatus) .NotNull(); - RuleFor(model => model.UserId) - .NotNull(); RuleFor(model => model.UserAddressId) .NotNull(); } diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs index cae5a1d..118ab76 100644 --- a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs +++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs @@ -3,17 +3,7 @@ public record UpdateUserOrderCommand : IRequest { //شناسه public long Id { get; init; } - //قیمت - public long Price { get; init; } - //شناسه پکیج - public long PackageId { get; init; } //شناسه تراکنش public long? TransactionId { get; init; } - //وضعیت پرداخت - public bool PaymentStatus { get; init; } - //تاریخ پرداخت - public DateTime? PaymentDate { get; init; } - //شناسه کاربر - public long UserId { get; init; } } \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandValidator.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandValidator.cs index 7d77150..025ff8b 100644 --- a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandValidator.cs +++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandValidator.cs @@ -5,14 +5,6 @@ public class UpdateUserOrderCommandValidator : AbstractValidator model.Id) .NotNull(); - RuleFor(model => model.Price) - .NotNull(); - RuleFor(model => model.PackageId) - .NotNull(); - RuleFor(model => model.PaymentStatus) - .NotNull(); - RuleFor(model => model.UserId) - .NotNull(); } public Func>> ValidateValue => async (model, propertyName) => { diff --git a/src/FrontOffice.BFF.WebApi/Common/Mappings/TransactionProfile.cs b/src/FrontOffice.BFF.WebApi/Common/Mappings/TransactionProfile.cs new file mode 100644 index 0000000..d93e8f9 --- /dev/null +++ b/src/FrontOffice.BFF.WebApi/Common/Mappings/TransactionProfile.cs @@ -0,0 +1,11 @@ +namespace FrontOffice.BFF.WebApi.Common.Mappings; + +public class TransactionProfile : IRegister +{ + void IRegister.Register(TypeAdapterConfig config) + { + config.NewConfig() + .IgnoreIf((src, dest) => !src.Filter.HasCurrency, dest => dest.Filter.Currency) + .IgnoreIf((src, dest) => !src.Filter.HasType, dest => dest.Filter.Type); + } +} diff --git a/src/FrontOffice.BFF.WebApi/Services/TransactionService.cs b/src/FrontOffice.BFF.WebApi/Services/TransactionService.cs new file mode 100644 index 0000000..ce7d3c4 --- /dev/null +++ b/src/FrontOffice.BFF.WebApi/Services/TransactionService.cs @@ -0,0 +1,32 @@ +using FrontOffice.BFF.Transaction.Protobuf.Protos.Transaction; +using FrontOffice.BFF.WebApi.Common.Services; +using FrontOffice.BFF.Application.TransactionCQ.Queries.GetTransaction; +using FrontOffice.BFF.Application.TransactionCQ.Queries.GetAllTransactionByFilter; +using FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentRequest; +using FrontOffice.BFF.Application.TransactionCQ.Commands.PaymentVerification; +namespace FrontOffice.BFF.WebApi.Services; +public class TransactionService : TransactionContract.TransactionContractBase +{ + private readonly IDispatchRequestToCQRS _dispatchRequestToCQRS; + + public TransactionService(IDispatchRequestToCQRS dispatchRequestToCQRS) + { + _dispatchRequestToCQRS = dispatchRequestToCQRS; + } + public override async Task GetTransaction(GetTransactionRequest request, ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle(request, context); + } + public override async Task GetAllTransactionByFilter(GetAllTransactionByFilterRequest request, ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle(request, context); + } + public override async Task PaymentRequest(PaymentRequestRequest request, ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle(request, context); + } + public override async Task PaymentVerification(PaymentVerificationRequest request, ServerCallContext context) + { + return await _dispatchRequestToCQRS.Handle(request, context); + } +} diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/ConfigureServices.cs b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/ConfigureServices.cs new file mode 100644 index 0000000..6048817 --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/ConfigureServices.cs @@ -0,0 +1,14 @@ +using FluentValidation; +using System.Reflection; + +namespace Microsoft.Extensions.DependencyInjection; + +public static class ConfigureServices +{ + public static IServiceCollection AddTransactionProtobufServices(this IServiceCollection services) + { + services.AddValidatorsFromAssembly(Assembly.GetExecutingAssembly()); + return services; + } +} + diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/FrontOffice.BFF.Transaction.Protobuf.csproj b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/FrontOffice.BFF.Transaction.Protobuf.csproj new file mode 100644 index 0000000..d033be2 --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/FrontOffice.BFF.Transaction.Protobuf.csproj @@ -0,0 +1,27 @@ + + + + net7.0 + enable + enable + 1.0.0 + None + False + False + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + + diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/annotations.proto b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/annotations.proto new file mode 100644 index 0000000..85c361b --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/annotations.proto @@ -0,0 +1,31 @@ +// Copyright (c) 2015, Google Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.api; + +import "google/api/http.proto"; +import "google/protobuf/descriptor.proto"; + +option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; +option java_multiple_files = true; +option java_outer_classname = "AnnotationsProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + +extend google.protobuf.MethodOptions { + // See `HttpRule`. + HttpRule http = 72295728; +} diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/http.proto b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/http.proto new file mode 100644 index 0000000..b8426ba --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/google/api/http.proto @@ -0,0 +1,377 @@ +// Copyright 2019 Google LLC. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +syntax = "proto3"; + +package google.api; + +option cc_enable_arenas = true; +option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; +option java_multiple_files = true; +option java_outer_classname = "HttpProto"; +option java_package = "com.google.api"; +option objc_class_prefix = "GAPI"; + +// Defines the HTTP configuration for an API service. It contains a list of +// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method +// to one or more HTTP REST API methods. +message Http { + // A list of HTTP configuration rules that apply to individual API methods. + // + // **NOTE:** All service configuration rules follow "last one wins" order. + repeated HttpRule rules = 1; + + // When set to true, URL path parameters will be fully URI-decoded except in + // cases of single segment matches in reserved expansion, where "%2F" will be + // left encoded. + // + // The default behavior is to not decode RFC 6570 reserved characters in multi + // segment matches. + bool fully_decode_reserved_expansion = 2; +} + +// # gRPC Transcoding +// +// gRPC Transcoding is a feature for mapping between a gRPC method and one or +// more HTTP REST endpoints. It allows developers to build a single API service +// that supports both gRPC APIs and REST APIs. Many systems, including [Google +// APIs](https://github.com/googleapis/googleapis), +// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC +// Gateway](https://github.com/grpc-ecosystem/grpc-gateway), +// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature +// and use it for large scale production services. +// +// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies +// how different portions of the gRPC request message are mapped to the URL +// path, URL query parameters, and HTTP request body. It also controls how the +// gRPC response message is mapped to the HTTP response body. `HttpRule` is +// typically specified as an `google.api.http` annotation on the gRPC method. +// +// Each mapping specifies a URL path template and an HTTP method. The path +// template may refer to one or more fields in the gRPC request message, as long +// as each field is a non-repeated field with a primitive (non-message) type. +// The path template controls how fields of the request message are mapped to +// the URL path. +// +// Example: +// +// service Messaging { +// rpc GetMessage(GetMessageRequest) returns (Message) { +// option (google.api.http) = { +// get: "/v1/{name=messages/*}" +// }; +// } +// } +// message GetMessageRequest { +// string name = 1; // Mapped to URL path. +// } +// message Message { +// string text = 1; // The resource content. +// } +// +// This enables an HTTP REST to gRPC mapping as below: +// +// HTTP | gRPC +// -----|----- +// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")` +// +// Any fields in the request message which are not bound by the path template +// automatically become HTTP query parameters if there is no HTTP request body. +// For example: +// +// service Messaging { +// rpc GetMessage(GetMessageRequest) returns (Message) { +// option (google.api.http) = { +// get:"/v1/messages/{message_id}" +// }; +// } +// } +// message GetMessageRequest { +// message SubMessage { +// string subfield = 1; +// } +// string message_id = 1; // Mapped to URL path. +// int64 revision = 2; // Mapped to URL query parameter `revision`. +// SubMessage sub = 3; // Mapped to URL query parameter `sub.subfield`. +// } +// +// This enables a HTTP JSON to RPC mapping as below: +// +// HTTP | gRPC +// -----|----- +// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | +// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: +// "foo"))` +// +// Note that fields which are mapped to URL query parameters must have a +// primitive type or a repeated primitive type or a non-repeated message type. +// In the case of a repeated type, the parameter can be repeated in the URL +// as `...?param=A¶m=B`. In the case of a message type, each field of the +// message is mapped to a separate parameter, such as +// `...?foo.a=A&foo.b=B&foo.c=C`. +// +// For HTTP methods that allow a request body, the `body` field +// specifies the mapping. Consider a REST update method on the +// message resource collection: +// +// service Messaging { +// rpc UpdateMessage(UpdateMessageRequest) returns (Message) { +// option (google.api.http) = { +// patch: "/v1/messages/{message_id}" +// body: "message" +// }; +// } +// } +// message UpdateMessageRequest { +// string message_id = 1; // mapped to the URL +// Message message = 2; // mapped to the body +// } +// +// The following HTTP JSON to RPC mapping is enabled, where the +// representation of the JSON in the request body is determined by +// protos JSON encoding: +// +// HTTP | gRPC +// -----|----- +// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: +// "123456" message { text: "Hi!" })` +// +// The special name `*` can be used in the body mapping to define that +// every field not bound by the path template should be mapped to the +// request body. This enables the following alternative definition of +// the update method: +// +// service Messaging { +// rpc UpdateMessage(Message) returns (Message) { +// option (google.api.http) = { +// patch: "/v1/messages/{message_id}" +// body: "*" +// }; +// } +// } +// message Message { +// string message_id = 1; +// string text = 2; +// } +// +// +// The following HTTP JSON to RPC mapping is enabled: +// +// HTTP | gRPC +// -----|----- +// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: +// "123456" text: "Hi!")` +// +// Note that when using `*` in the body mapping, it is not possible to +// have HTTP parameters, as all fields not bound by the path end in +// the body. This makes this option more rarely used in practice when +// defining REST APIs. The common usage of `*` is in custom methods +// which don't use the URL at all for transferring data. +// +// It is possible to define multiple HTTP methods for one RPC by using +// the `additional_bindings` option. Example: +// +// service Messaging { +// rpc GetMessage(GetMessageRequest) returns (Message) { +// option (google.api.http) = { +// get: "/v1/messages/{message_id}" +// additional_bindings { +// get: "/v1/users/{user_id}/messages/{message_id}" +// } +// }; +// } +// } +// message GetMessageRequest { +// string message_id = 1; +// string user_id = 2; +// } +// +// This enables the following two alternative HTTP JSON to RPC mappings: +// +// HTTP | gRPC +// -----|----- +// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` +// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: +// "123456")` +// +// ## Rules for HTTP mapping +// +// 1. Leaf request fields (recursive expansion nested messages in the request +// message) are classified into three categories: +// - Fields referred by the path template. They are passed via the URL path. +// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They are passed via the HTTP +// request body. +// - All other fields are passed via the URL query parameters, and the +// parameter name is the field path in the request message. A repeated +// field can be represented as multiple query parameters under the same +// name. +// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL query parameter, all fields +// are passed via URL path and HTTP request body. +// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP request body, all +// fields are passed via URL path and URL query parameters. +// +// ### Path template syntax +// +// Template = "/" Segments [ Verb ] ; +// Segments = Segment { "/" Segment } ; +// Segment = "*" | "**" | LITERAL | Variable ; +// Variable = "{" FieldPath [ "=" Segments ] "}" ; +// FieldPath = IDENT { "." IDENT } ; +// Verb = ":" LITERAL ; +// +// The syntax `*` matches a single URL path segment. The syntax `**` matches +// zero or more URL path segments, which must be the last part of the URL path +// except the `Verb`. +// +// The syntax `Variable` matches part of the URL path as specified by its +// template. A variable template must not contain other variables. If a variable +// matches a single path segment, its template may be omitted, e.g. `{var}` +// is equivalent to `{var=*}`. +// +// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL` +// contains any reserved character, such characters should be percent-encoded +// before the matching. +// +// If a variable contains exactly one path segment, such as `"{var}"` or +// `"{var=*}"`, when such a variable is expanded into a URL path on the client +// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The +// server side does the reverse decoding. Such variables show up in the +// [Discovery +// Document](https://developers.google.com/discovery/v1/reference/apis) as +// `{var}`. +// +// If a variable contains multiple path segments, such as `"{var=foo/*}"` +// or `"{var=**}"`, when such a variable is expanded into a URL path on the +// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. +// The server side does the reverse decoding, except "%2F" and "%2f" are left +// unchanged. Such variables show up in the +// [Discovery +// Document](https://developers.google.com/discovery/v1/reference/apis) as +// `{+var}`. +// +// ## Using gRPC API Service Configuration +// +// gRPC API Service Configuration (service config) is a configuration language +// for configuring a gRPC service to become a user-facing product. The +// service config is simply the YAML representation of the `google.api.Service` +// proto message. +// +// As an alternative to annotating your proto file, you can configure gRPC +// transcoding in your service config YAML files. You do this by specifying a +// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same +// effect as the proto annotation. This can be particularly useful if you +// have a proto that is reused in multiple services. Note that any transcoding +// specified in the service config will override any matching transcoding +// configuration in the proto. +// +// Example: +// +// http: +// rules: +// # Selects a gRPC method and applies HttpRule to it. +// - selector: example.v1.Messaging.GetMessage +// get: /v1/messages/{message_id}/{sub.subfield} +// +// ## Special notes +// +// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the +// proto to JSON conversion must follow the [proto3 +// specification](https://developers.google.com/protocol-buffers/docs/proto3#json). +// +// While the single segment variable follows the semantics of +// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String +// Expansion, the multi segment variable **does not** follow RFC 6570 Section +// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion +// does not expand special characters like `?` and `#`, which would lead +// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding +// for multi segment variables. +// +// The path variables **must not** refer to any repeated or mapped field, +// because client libraries are not capable of handling such variable expansion. +// +// The path variables **must not** capture the leading "/" character. The reason +// is that the most common use case "{var}" does not capture the leading "/" +// character. For consistency, all path variables must share the same behavior. +// +// Repeated message fields must not be mapped to URL query parameters, because +// no client library can support such complicated mapping. +// +// If an API needs to use a JSON array for request or response body, it can map +// the request or response body to a repeated field. However, some gRPC +// Transcoding implementations may not support this feature. +message HttpRule { + // Selects a method to which this rule applies. + // + // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. + string selector = 1; + + // Determines the URL pattern is matched by this rules. This pattern can be + // used with any of the {get|put|post|delete|patch} methods. A custom method + // can be defined using the 'custom' field. + oneof pattern { + // Maps to HTTP GET. Used for listing and getting information about + // resources. + string get = 2; + + // Maps to HTTP PUT. Used for replacing a resource. + string put = 3; + + // Maps to HTTP POST. Used for creating a resource or performing an action. + string post = 4; + + // Maps to HTTP DELETE. Used for deleting a resource. + string delete = 5; + + // Maps to HTTP PATCH. Used for updating a resource. + string patch = 6; + + // The custom pattern is used for specifying an HTTP method that is not + // included in the `pattern` field, such as HEAD, or "*" to leave the + // HTTP method unspecified for this rule. The wild-card rule is useful + // for services that provide content to Web (HTML) clients. + CustomHttpPattern custom = 8; + } + + // The name of the request field whose value is mapped to the HTTP request + // body, or `*` for mapping all request fields not captured by the path + // pattern to the HTTP body, or omitted for not having any HTTP request body. + // + // NOTE: the referred field must be present at the top-level of the request + // message type. + string body = 7; + + // Optional. The name of the response field whose value is mapped to the HTTP + // response body. When omitted, the entire response message will be used + // as the HTTP response body. + // + // NOTE: The referred field must be present at the top-level of the response + // message type. + string response_body = 12; + + // Additional HTTP bindings for the selector. Nested bindings must + // not contain an `additional_bindings` field themselves (that is, + // the nesting may only be one level deep). + repeated HttpRule additional_bindings = 11; +} + +// A custom pattern is used for defining custom HTTP verb. +message CustomHttpPattern { + // The name of this custom HTTP verb. + string kind = 1; + + // The path matched by this custom verb. + string path = 2; +} + diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/transaction.proto b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/transaction.proto new file mode 100644 index 0000000..0bc296a --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Protos/transaction.proto @@ -0,0 +1,218 @@ +syntax = "proto3"; + +package transaction; + +import "google/protobuf/empty.proto"; +import "google/protobuf/wrappers.proto"; +import "google/protobuf/duration.proto"; +import "google/protobuf/timestamp.proto"; +import "google/api/annotations.proto"; + +option csharp_namespace = "FrontOffice.BFF.Transaction.Protobuf.Protos.Transaction"; + +service TransactionContract +{ + rpc GetTransaction(GetTransactionRequest) returns (GetTransactionResponse){ + option (google.api.http) = { + get: "/GetTransaction" + + }; + }; + rpc GetAllTransactionByFilter(GetAllTransactionByFilterRequest) returns (GetAllTransactionByFilterResponse){ + option (google.api.http) = { + get: "/GetAllTransactionByFilter" + + }; + }; + rpc PaymentRequest(PaymentRequestRequest) returns (PaymentRequestResponse){ + option (google.api.http) = { + post: "/PaymentRequest" + body: "*" + }; + }; + rpc PaymentVerification(PaymentVerificationRequest) returns (PaymentVerificationResponse){ + option (google.api.http) = { + post: "/PaymentVerification" + body: "*" + }; + }; +} +message GetTransactionRequest +{ + google.protobuf.Int64Value id = 1; + google.protobuf.StringValue authority = 2; +} +message GetTransactionResponse +{ + int64 id = 1; + string merchant_id = 2; + int64 amount = 3; + string callback_url = 4; + string description = 5; + google.protobuf.StringValue mobile = 6; + google.protobuf.StringValue email = 7; + google.protobuf.Int32Value request_status_code = 8; + google.protobuf.StringValue request_status_message = 9; + google.protobuf.StringValue authority = 10; + google.protobuf.StringValue fee_type = 11; + google.protobuf.Int64Value fee = 12; + oneof Currency_item + { + CurrencyEnum currency = 13; + } + bool payment_status = 14; + google.protobuf.Int32Value verification_status_code = 15; + google.protobuf.StringValue verification_status_message = 16; + google.protobuf.StringValue card_hash = 17; + google.protobuf.StringValue card_pan = 18; + google.protobuf.StringValue ref_id = 19; + google.protobuf.StringValue order_id = 20; + oneof Type_item + { + TransactionTypeEnum type = 21; + } +} +enum CurrencyEnum +{ + IRR = 0; + IRT = 1; +} +enum TransactionTypeEnum +{ + Real = 0; + Sandbox = 1; +} +message GetAllTransactionByFilterRequest +{ + PaginationState pagination_state = 1; + google.protobuf.StringValue sort_by = 2; + GetAllTransactionByFilterFilter filter = 3; +} +message GetAllTransactionByFilterFilter +{ + google.protobuf.Int64Value id = 1; + google.protobuf.StringValue merchant_id = 2; + google.protobuf.Int64Value amount = 3; + google.protobuf.StringValue callback_url = 4; + google.protobuf.StringValue description = 5; + google.protobuf.StringValue mobile = 6; + google.protobuf.StringValue email = 7; + google.protobuf.Int32Value request_status_code = 8; + google.protobuf.StringValue request_status_message = 9; + google.protobuf.StringValue authority = 10; + google.protobuf.StringValue fee_type = 11; + google.protobuf.Int64Value fee = 12; + oneof Currency_item + { + CurrencyEnum currency = 13; + } + google.protobuf.BoolValue payment_status = 14; + google.protobuf.Int32Value verification_status_code = 15; + google.protobuf.StringValue verification_status_message = 16; + google.protobuf.StringValue card_hash = 17; + google.protobuf.StringValue card_pan = 18; + google.protobuf.StringValue ref_id = 19; + google.protobuf.StringValue order_id = 20; + oneof Type_item + { + TransactionTypeEnum type = 21; + } +} +message GetAllTransactionByFilterResponse +{ + MetaData meta_data = 1; + repeated GetAllTransactionByFilterResponseModel models = 2; +} +message GetAllTransactionByFilterResponseModel +{ + int64 id = 1; + string merchant_id = 2; + int64 amount = 3; + string callback_url = 4; + string description = 5; + google.protobuf.StringValue mobile = 6; + google.protobuf.StringValue email = 7; + google.protobuf.Int32Value request_status_code = 8; + google.protobuf.StringValue request_status_message = 9; + google.protobuf.StringValue authority = 10; + google.protobuf.StringValue fee_type = 11; + google.protobuf.Int64Value fee = 12; + oneof Currency_item + { + CurrencyEnum currency = 13; + } + bool payment_status = 14; + google.protobuf.Int32Value verification_status_code = 15; + google.protobuf.StringValue verification_status_message = 16; + google.protobuf.StringValue card_hash = 17; + google.protobuf.StringValue card_pan = 18; + google.protobuf.StringValue ref_id = 19; + google.protobuf.StringValue order_id = 20; + oneof Type_item + { + TransactionTypeEnum type = 21; + } +} +message PaymentRequestRequest +{ + int64 amount = 1; + string callback_url = 2; + google.protobuf.StringValue description = 3; + google.protobuf.StringValue mobile = 4; + google.protobuf.StringValue email = 5; + oneof Currency_item + { + CurrencyEnum currency = 6; + } + oneof Type_item + { + TransactionTypeEnum type = 7; + } + google.protobuf.StringValue order_id = 8; +} +message PaymentRequestResponse +{ + string payment_g_w_url = 1; +} +message PaymentVerificationRequest +{ + string authority = 1; + string status = 2; +} +message PaymentVerificationResponse +{ + int64 id = 1; + bool payment_status = 2; + string message = 3; + google.protobuf.StringValue ref_id = 4; + google.protobuf.StringValue order_id = 5; + google.protobuf.Int32Value verification_status_code = 6; +} + +message PaginationState +{ + int32 page_number = 1; + + int32 page_size = 2; +} +message MetaData +{ + int64 current_page = 1; + + int64 total_page = 2; + + int64 page_size = 3; + + int64 total_count = 4; + + bool has_previous = 5; + + bool has_next = 6; +} +message DecimalValue +{ + + int64 units = 1; + + sfixed32 nanos = 2; +} diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetAllTransactionByFilterRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetAllTransactionByFilterRequestValidator.cs new file mode 100644 index 0000000..3c21548 --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetAllTransactionByFilterRequestValidator.cs @@ -0,0 +1,17 @@ +using FluentValidation; +using FrontOffice.BFF.Transaction.Protobuf.Protos.Transaction; +namespace FrontOffice.BFF.Transaction.Protobuf.Validator; + +public class GetAllTransactionByFilterRequestValidator : AbstractValidator +{ + public GetAllTransactionByFilterRequestValidator() + { + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetAllTransactionByFilterRequest)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetTransactionRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetTransactionRequestValidator.cs new file mode 100644 index 0000000..387e029 --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/GetTransactionRequestValidator.cs @@ -0,0 +1,17 @@ +using FluentValidation; +using FrontOffice.BFF.Transaction.Protobuf.Protos.Transaction; +namespace FrontOffice.BFF.Transaction.Protobuf.Validator; + +public class GetTransactionRequestValidator : AbstractValidator +{ + public GetTransactionRequestValidator() + { + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((GetTransactionRequest)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentRequestRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentRequestRequestValidator.cs new file mode 100644 index 0000000..3d67957 --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentRequestRequestValidator.cs @@ -0,0 +1,27 @@ +using FluentValidation; +using FrontOffice.BFF.Transaction.Protobuf.Protos.Transaction; +namespace FrontOffice.BFF.Transaction.Protobuf.Validator; + +public class PaymentRequestRequestValidator : AbstractValidator +{ + public PaymentRequestRequestValidator() + { + RuleFor(model => model.Amount) + .NotNull(); + RuleFor(model => model.CallbackUrl) + .NotEmpty(); + RuleFor(model => model.Currency) + .IsInEnum() + .NotNull(); + RuleFor(model => model.Type) + .IsInEnum() + .NotNull(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((PaymentRequestRequest)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentVerificationRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentVerificationRequestValidator.cs new file mode 100644 index 0000000..bdcd852 --- /dev/null +++ b/src/Protobufs/FrontOffice.BFF.Transaction.Protobuf/Validator/PaymentVerificationRequestValidator.cs @@ -0,0 +1,21 @@ +using FluentValidation; +using FrontOffice.BFF.Transaction.Protobuf.Protos.Transaction; +namespace FrontOffice.BFF.Transaction.Protobuf.Validator; + +public class PaymentVerificationRequestValidator : AbstractValidator +{ + public PaymentVerificationRequestValidator() + { + RuleFor(model => model.Authority) + .NotEmpty(); + RuleFor(model => model.Status) + .NotEmpty(); + } + public Func>> ValidateValue => async (model, propertyName) => + { + var result = await ValidateAsync(ValidationContext.CreateWithOptions((PaymentVerificationRequest)model, x => x.IncludeProperties(propertyName))); + if (result.IsValid) + return Array.Empty(); + return result.Errors.Select(e => e.ErrorMessage); + }; +} diff --git a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto index b04b651..db85881 100644 --- a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto +++ b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto @@ -50,8 +50,7 @@ message CreateNewUserOrderRequest google.protobuf.Int64Value transaction_id = 3; bool payment_status = 4; google.protobuf.Timestamp payment_date = 5; - int64 user_id = 6; - int64 user_address_id = 7; + int64 user_address_id = 6; } message CreateNewUserOrderResponse { @@ -60,12 +59,7 @@ message CreateNewUserOrderResponse message UpdateUserOrderRequest { int64 id = 1; - int64 price = 2; - int64 package_id = 3; - google.protobuf.Int64Value transaction_id = 4; - bool payment_status = 5; - google.protobuf.Timestamp payment_date = 6; - int64 user_id = 7; + google.protobuf.Int64Value transaction_id = 2; } message DeleteUserOrderRequest { diff --git a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/CreateNewUserOrderRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/CreateNewUserOrderRequestValidator.cs index 045c35e..cf0b97e 100644 --- a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/CreateNewUserOrderRequestValidator.cs +++ b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/CreateNewUserOrderRequestValidator.cs @@ -12,8 +12,6 @@ public class CreateNewUserOrderRequestValidator : AbstractValidator model.PaymentStatus) .NotNull(); - RuleFor(model => model.UserId) - .NotNull(); RuleFor(model => model.UserAddressId) .NotNull(); } diff --git a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/UpdateUserOrderRequestValidator.cs b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/UpdateUserOrderRequestValidator.cs index 63541ea..1a30048 100644 --- a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/UpdateUserOrderRequestValidator.cs +++ b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Validator/UpdateUserOrderRequestValidator.cs @@ -8,14 +8,6 @@ public class UpdateUserOrderRequestValidator : AbstractValidator model.Id) .NotNull(); - RuleFor(model => model.Price) - .NotNull(); - RuleFor(model => model.PackageId) - .NotNull(); - RuleFor(model => model.PaymentStatus) - .NotNull(); - RuleFor(model => model.UserId) - .NotNull(); } public Func>> ValidateValue => async (model, propertyName) => {