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

9
src/CMSMicroservice.Protobuf/Protos/tag.proto
View File

@@ -48,7 +48,7 @@ message CreateNewTagRequest
{
string name = 1;
string title = 2;
string description = 3;
google.protobuf.StringValue description = 3;
bool is_active = 4;
int32 sort_order = 5;
}
@@ -61,7 +61,7 @@ message UpdateTagRequest
int64 id = 1;
string name = 2;
string title = 3;
string description = 4;
google.protobuf.StringValue description = 4;
bool is_active = 5;
int32 sort_order = 6;
}
@@ -78,7 +78,7 @@ message GetTagResponse
int64 id = 1;
string name = 2;
string title = 3;
string description = 4;
google.protobuf.StringValue description = 4;
bool is_active = 5;
int32 sort_order = 6;
}
@@ -107,8 +107,7 @@ message GetAllTagByFilterResponseModel
int64 id = 1;
string name = 2;
string title = 3;
string description = 4;
google.protobuf.StringValue description = 4;
bool is_active = 5;
int32 sort_order = 6;
}

135
src/CMSMicroservice.Protobuf/Protos/transactions.proto
View File

@@ -46,32 +46,17 @@ service TransactionsContract
}
message CreateNewTransactionsRequest
{
string merchant_id = 1;
int64 amount = 2;
string callback_url = 3;
string description = 4;
google.protobuf.StringValue mobile = 5;
google.protobuf.StringValue email = 6;
google.protobuf.Int32Value request_status_code = 7;
google.protobuf.StringValue request_status_message = 8;
google.protobuf.StringValue authority = 9;
google.protobuf.StringValue fee_type = 10;
google.protobuf.Int64Value fee = 11;
google.protobuf.Int32Value currency = 12;
int64 amount = 1;
string description = 2;
oneof PaymentStatus_item
{
messages.PaymentStatus payment_status = 13;
messages.PaymentStatus payment_status = 3;
}
google.protobuf.Timestamp payment_date = 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;
google.protobuf.Timestamp payment_date = 4;
google.protobuf.StringValue ref_id = 5;
oneof Type_item
{
messages.TransactionType type = 21;
messages.TransactionType type = 6;
}
}
message CreateNewTransactionsResponse
@@ -81,32 +66,17 @@ message CreateNewTransactionsResponse
message UpdateTransactionsRequest
{
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;
google.protobuf.Int32Value currency = 13;
int64 amount = 2;
string description = 3;
oneof PaymentStatus_item
{
messages.PaymentStatus payment_status = 14;
messages.PaymentStatus payment_status = 4;
}
google.protobuf.Timestamp payment_date = 15;
google.protobuf.Int32Value verification_status_code = 16;
google.protobuf.StringValue verification_status_message = 17;
google.protobuf.StringValue card_hash = 18;
google.protobuf.StringValue card_pan = 19;
google.protobuf.StringValue ref_id = 20;
google.protobuf.StringValue order_id = 21;
google.protobuf.Timestamp payment_date = 5;
google.protobuf.StringValue ref_id = 6;
oneof Type_item
{
messages.TransactionType type = 22;
messages.TransactionType type = 7;
}
}
message DeleteTransactionsRequest
@@ -120,32 +90,17 @@ message GetTransactionsRequest
message GetTransactionsResponse
{
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;
google.protobuf.Int32Value currency = 13;
int64 amount = 2;
string description = 3;
oneof PaymentStatus_item
{
messages.PaymentStatus payment_status = 14;
messages.PaymentStatus payment_status = 4;
}
google.protobuf.Timestamp payment_date = 15;
google.protobuf.Int32Value verification_status_code = 16;
google.protobuf.StringValue verification_status_message = 17;
google.protobuf.StringValue card_hash = 18;
google.protobuf.StringValue card_pan = 19;
google.protobuf.StringValue ref_id = 20;
google.protobuf.StringValue order_id = 21;
google.protobuf.Timestamp payment_date = 5;
google.protobuf.StringValue ref_id = 6;
oneof Type_item
{
messages.TransactionType type = 22;
messages.TransactionType type = 7;
}
}
message GetAllTransactionsByFilterRequest
@@ -157,32 +112,17 @@ message GetAllTransactionsByFilterRequest
message GetAllTransactionsByFilterFilter
{
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;
google.protobuf.Int32Value currency = 13;
google.protobuf.Int64Value amount = 2;
google.protobuf.StringValue description = 3;
oneof PaymentStatus_item
{
messages.PaymentStatus payment_status = 14;
messages.PaymentStatus payment_status = 4;
}
google.protobuf.Timestamp payment_date = 15;
google.protobuf.Int32Value verification_status_code = 16;
google.protobuf.StringValue verification_status_message = 17;
google.protobuf.StringValue card_hash = 18;
google.protobuf.StringValue card_pan = 19;
google.protobuf.StringValue ref_id = 20;
google.protobuf.Int64Value order_id = 21;
google.protobuf.Timestamp payment_date = 5;
google.protobuf.StringValue ref_id = 6;
oneof Type_item
{
messages.TransactionType type = 22;
messages.TransactionType type = 7;
}
}
message GetAllTransactionsByFilterResponse
@@ -193,31 +133,16 @@ message GetAllTransactionsByFilterResponse
message GetAllTransactionsByFilterResponseModel
{
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;
google.protobuf.Int32Value currency = 13;
int64 amount = 2;
string description = 3;
oneof PaymentStatus_item
{
messages.PaymentStatus payment_status = 14;
messages.PaymentStatus payment_status = 4;
}
google.protobuf.Timestamp payment_date = 15;
google.protobuf.Int32Value verification_status_code = 16;
google.protobuf.StringValue verification_status_message = 17;
google.protobuf.StringValue card_hash = 18;
google.protobuf.StringValue card_pan = 19;
google.protobuf.StringValue ref_id = 20;
google.protobuf.StringValue order_id = 21;
google.protobuf.Timestamp payment_date = 5;
google.protobuf.StringValue ref_id = 6;
oneof Type_item
{
messages.TransactionType type = 22;
messages.TransactionType type = 7;
}
}

10
src/CMSMicroservice.Protobuf/Protos/userorder.proto
View File

@@ -52,7 +52,7 @@ service UserOrderContract
}
message CreateNewUserOrderRequest
{
int64 price = 1;
int64 amount = 1;
int64 package_id = 2;
google.protobuf.Int64Value transaction_id = 3;
oneof PaymentStatus_item
@@ -74,7 +74,7 @@ message CreateNewUserOrderResponse
message UpdateUserOrderRequest
{
int64 id = 1;
int64 price = 2;
int64 amount = 2;
int64 package_id = 3;
google.protobuf.Int64Value transaction_id = 4;
oneof PaymentStatus_item
@@ -100,7 +100,7 @@ message GetUserOrderRequest
message GetUserOrderResponse
{
int64 id = 1;
int64 price = 2;
int64 amount = 2;
int64 package_id = 3;
google.protobuf.Int64Value transaction_id = 4;
oneof PaymentStatus_item
@@ -126,7 +126,7 @@ message GetAllUserOrderByFilterRequest
message GetAllUserOrderByFilterFilter
{
google.protobuf.Int64Value id = 1;
google.protobuf.Int64Value price = 2;
google.protobuf.Int64Value amount = 2;
google.protobuf.Int64Value package_id = 3;
google.protobuf.Int64Value transaction_id = 4;
oneof PaymentStatus_item
@@ -149,7 +149,7 @@ message GetAllUserOrderByFilterResponse
message GetAllUserOrderByFilterResponseModel
{
int64 id = 1;
int64 price = 2;
int64 amount = 2;
int64 package_id = 3;
google.protobuf.Int64Value transaction_id = 4;
oneof PaymentStatus_item

3
src/CMSMicroservice.Protobuf/Validator/Tag/CreateNewTagRequestValidator.cs
View File

@@ -10,6 +10,8 @@ public class CreateNewTagRequestValidator : AbstractValidator<CreateNewTagReques
.NotEmpty();
RuleFor(model => model.Title)
.NotEmpty();
RuleFor(model => model.IsActive)
.NotNull();
RuleFor(model => model.SortOrder)
.NotNull();
}
@@ -21,4 +23,3 @@ public class CreateNewTagRequestValidator : AbstractValidator<CreateNewTagReques
return result.Errors.Select(e => e.ErrorMessage);
};
}

3
src/CMSMicroservice.Protobuf/Validator/Tag/UpdateTagRequestValidator.cs
View File

@@ -12,6 +12,8 @@ public class UpdateTagRequestValidator : AbstractValidator<UpdateTagRequest>
.NotEmpty();
RuleFor(model => model.Title)
.NotEmpty();
RuleFor(model => model.IsActive)
.NotNull();
RuleFor(model => model.SortOrder)
.NotNull();
}
@@ -23,4 +25,3 @@ public class UpdateTagRequestValidator : AbstractValidator<UpdateTagRequest>
return result.Errors.Select(e => e.ErrorMessage);
};
}

4
src/CMSMicroservice.Protobuf/Validator/Transactions/CreateNewTransactionsRequestValidator.cs
View File

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

4
src/CMSMicroservice.Protobuf/Validator/Transactions/UpdateTransactionsRequestValidator.cs
View File

@@ -8,12 +8,8 @@ public class UpdateTransactionsRequestValidator : 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)

2
src/CMSMicroservice.Protobuf/Validator/UserOrder/CreateNewUserOrderRequestValidator.cs
View File

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

2
src/CMSMicroservice.Protobuf/Validator/UserOrder/UpdateUserOrderRequestValidator.cs
View File

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