admin/CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newmain'

Browse Source
This commit is contained in:
masoodafar-web
2025-11-24 23:22:18 +03:30
parent 744f71ce6c
commit 25eee4ede3
30 changed files with 69 additions and 370 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMSMicroservice.Application/TagCQ/Commands/CreateNewTag/CreateNewTagCommandValidator.cs
View File

@@ -7,6 +7,8 @@ public class CreateNewTagCommandValidator : AbstractValidator<CreateNewTagComman
.NotEmpty();
RuleFor(model => model.Title)
.NotEmpty();
RuleFor(model => model.IsActive)
.NotNull();
RuleFor(model => model.SortOrder)
.NotNull();
}
@@ -18,4 +20,3 @@ public class CreateNewTagCommandValidator : AbstractValidator<CreateNewTagComman
return result.Errors.Select(e => e.ErrorMessage);
};
}

3
src/CMSMicroservice.Application/TagCQ/Commands/UpdateTag/UpdateTagCommandValidator.cs
View File

@@ -9,6 +9,8 @@ public class UpdateTagCommandValidator : AbstractValidator<UpdateTagCommand>
.NotEmpty();
RuleFor(model => model.Title)
.NotEmpty();
RuleFor(model => model.IsActive)
.NotNull();
RuleFor(model => model.SortOrder)
.NotNull();
}
@@ -20,4 +22,3 @@ public class UpdateTagCommandValidator : AbstractValidator<UpdateTagCommand>
return result.Errors.Select(e => e.ErrorMessage);
};
}

32
src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommand.cs
View File

@@ -1,49 +1,17 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.TransactionsCQ.Commands.CreateNewTransactions;
public record CreateNewTransactionsCommand : IRequest<CreateNewTransactionsResponseDto>
{
//
public string MerchantId { get; init; }
//
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 int? RequestStatusCode { get; init; }
//
public string? RequestStatusMessage { get; init; }
//
public string? Authority { get; init; }
//
public string? FeeType { get; init; }
//
public long? Fee { get; init; }
//
public int? Currency { get; init; }
//
public PaymentStatus PaymentStatus { get; init; }
//تاریخ پرداخت
public DateTime? PaymentDate { get; init; }
//
public int? VerificationStatusCode { get; init; }
//
public string? VerificationStatusMessage { get; init; }
//
public string? CardHash { get; init; }
//
public string? CardPan { get; init; }
//
public string? RefId { get; init; }
//
public string? OrderId { get; init; }
//
public TransactionType Type { get; init; }
}

4
src/CMSMicroservice.Application/TransactionsCQ/Commands/CreateNewTransactions/CreateNewTransactionsCommandValidator.cs
View File

@@ -3,12 +3,8 @@ public class CreateNewTransactionsCommandValidator : AbstractValidator<CreateNew
{
public CreateNewTransactionsCommandValidator()
{
RuleFor(model => model.MerchantId)
.NotEmpty();
RuleFor(model => model.Amount)
.NotNull();
RuleFor(model => model.CallbackUrl)
.NotEmpty();
RuleFor(model => model.Description)
.NotEmpty();
RuleFor(model => model.PaymentStatus)

32
src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommand.cs
View File

@@ -1,51 +1,19 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.TransactionsCQ.Commands.UpdateTransactions;
public record UpdateTransactionsCommand : IRequest<Unit>
{
//
public long Id { get; init; }
//
public string MerchantId { get; init; }
//
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 int? RequestStatusCode { get; init; }
//
public string? RequestStatusMessage { get; init; }
//
public string? Authority { get; init; }
//
public string? FeeType { get; init; }
//
public long? Fee { get; init; }
//
public int? Currency { get; init; }
//
public PaymentStatus PaymentStatus { get; init; }
//تاریخ پرداخت
public DateTime? PaymentDate { get; init; }
//
public int? VerificationStatusCode { get; init; }
//
public string? VerificationStatusMessage { get; init; }
//
public string? CardHash { get; init; }
//
public string? CardPan { get; init; }
//
public string? RefId { get; init; }
//
public string? OrderId { get; init; }
//
public TransactionType Type { get; init; }
}

4
src/CMSMicroservice.Application/TransactionsCQ/Commands/UpdateTransactions/UpdateTransactionsCommandValidator.cs
View File

@@ -5,12 +5,8 @@ public class UpdateTransactionsCommandValidator : AbstractValidator<UpdateTransa
{
RuleFor(model => model.Id)
.NotNull();
RuleFor(model => model.MerchantId)
.NotEmpty();
RuleFor(model => model.Amount)
.NotNull();
RuleFor(model => model.CallbackUrl)
.NotEmpty();
RuleFor(model => model.Description)
.NotEmpty();
RuleFor(model => model.PaymentStatus)

32
src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterQuery.cs
View File

@@ -1,5 +1,3 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter;
public record GetAllTransactionsByFilterQuery : IRequest<GetAllTransactionsByFilterResponseDto>
{
@@ -15,45 +13,15 @@ public record GetAllTransactionsByFilterQuery : IRequest<GetAllTransactionsByFil
//
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 int? Currency { get; set; }
//
public PaymentStatus? PaymentStatus { get; set; }
//تاریخ پرداخت
public DateTime? PaymentDate { 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 long? OrderId { get; set; }
//
public TransactionType? Type { get; set; }
}

32
src/CMSMicroservice.Application/TransactionsCQ/Queries/GetAllTransactionsByFilter/GetAllTransactionsByFilterResponseDto.cs
View File

@@ -1,5 +1,3 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetAllTransactionsByFilter;
public class GetAllTransactionsByFilterResponseDto
{
@@ -13,45 +11,15 @@ public class GetAllTransactionsByFilterResponseDto
//
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 int? Currency { get; set; }
//
public PaymentStatus PaymentStatus { get; set; }
//تاریخ پرداخت
public DateTime? PaymentDate { 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 TransactionType Type { get; set; }
}

32
src/CMSMicroservice.Application/TransactionsCQ/Queries/GetTransactions/GetTransactionsResponseDto.cs
View File

@@ -1,51 +1,19 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.TransactionsCQ.Queries.GetTransactions;
public class GetTransactionsResponseDto
{
//
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 int? Currency { get; set; }
//
public PaymentStatus PaymentStatus { get; set; }
//تاریخ پرداخت
public DateTime? PaymentDate { 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 TransactionType Type { get; set; }
}

4
src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommand.cs
View File

@@ -1,10 +1,8 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.UserOrderCQ.Commands.CreateNewUserOrder;
public record CreateNewUserOrderCommand : IRequest<CreateNewUserOrderResponseDto>
{
//قیمت
public long Price { get; init; }
public long Amount { get; init; }
//شناسه پکیج
public long PackageId { get; init; }
//شناسه تراکنش

2
src/CMSMicroservice.Application/UserOrderCQ/Commands/CreateNewUserOrder/CreateNewUserOrderCommandValidator.cs
View File

@@ -3,7 +3,7 @@ public class CreateNewUserOrderCommandValidator : AbstractValidator<CreateNewUse
{
public CreateNewUserOrderCommandValidator()
{
RuleFor(model => model.Price)
RuleFor(model => model.Amount)
.NotNull();
RuleFor(model => model.PackageId)
.NotNull();

4
src/CMSMicroservice.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommand.cs
View File

@@ -1,12 +1,10 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.UserOrderCQ.Commands.UpdateUserOrder;
public record UpdateUserOrderCommand : IRequest<Unit>
{
//شناسه
public long Id { get; init; }
//قیمت
public long Price { get; init; }
public long Amount { get; init; }
//شناسه پکیج
public long PackageId { get; init; }
//شناسه تراکنش

2
src/CMSMicroservice.Application/UserOrderCQ/Commands/UpdateUserOrder/UpdateUserOrderCommandValidator.cs
View File

@@ -5,7 +5,7 @@ public class UpdateUserOrderCommandValidator : AbstractValidator<UpdateUserOrder
{
RuleFor(model => model.Id)
.NotNull();
RuleFor(model => model.Price)
RuleFor(model => model.Amount)
.NotNull();
RuleFor(model => model.PackageId)
.NotNull();

4
src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
View File

@@ -1,5 +1,3 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterResponseDto>
{
@@ -15,7 +13,7 @@ public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterRes
//شناسه
public long? Id { get; set; }
//قیمت
public long? Price { get; set; }
public long? Amount { get; set; }
//شناسه پکیج
public long? PackageId { get; set; }
//شناسه تراکنش

4
src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
View File

@@ -1,5 +1,3 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
public class GetAllUserOrderByFilterResponseDto
{
@@ -13,7 +11,7 @@ public class GetAllUserOrderByFilterResponseDto
//شناسه
public long Id { get; set; }
//قیمت
public long Price { get; set; }
public long Amount { get; set; }
//شناسه پکیج
public long PackageId { get; set; }
//شناسه تراکنش

4
src/CMSMicroservice.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
View File

@@ -1,12 +1,10 @@
using CMSMicroservice.Domain.Enums;
namespace CMSMicroservice.Application.UserOrderCQ.Queries.GetUserOrder;
public class GetUserOrderResponseDto
{
//شناسه
public long Id { get; set; }
//قیمت
public long Price { get; set; }
public long Amount { get; set; }
//شناسه پکیج
public long PackageId { get; set; }
//شناسه تراکنش