Merge branch 'newmain'

src/CMSMicroservice.Protobuf/Validator/Tag/CreateNewTagRequestValidator.cs

@@ -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);
     };
 }
-

src/CMSMicroservice.Protobuf/Validator/Tag/UpdateTagRequestValidator.cs

@@ -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);
     };
 }
-

src/CMSMicroservice.Protobuf/Validator/Transactions/CreateNewTransactionsRequestValidator.cs

@@ -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)

src/CMSMicroservice.Protobuf/Validator/Transactions/UpdateTransactionsRequestValidator.cs

@@ -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)

src/CMSMicroservice.Protobuf/Validator/UserOrder/CreateNewUserOrderRequestValidator.cs

@@ -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();

src/CMSMicroservice.Protobuf/Validator/UserOrder/UpdateUserOrderRequestValidator.cs

@@ -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();