From fc4f6defb32ad6f03bd4622e51a5dbabb8c12fc8 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Fri, 28 Nov 2025 01:39:05 +0330
Subject: [PATCH] Update user order proto and filter model

---
 .../GetAllUserOrderByFilterQuery.cs           | 18 +++++++--------
 .../GetAllUserOrderByFilterResponseDto.cs     | 22 +++++++++----------
 .../GetUserOrder/GetUserOrderResponseDto.cs   | 22 +++++++++----------
 .../FrontOffice.BFF.Domain.csproj             |  2 +-
 .../Protos/userorder.proto                    | 10 ++++-----
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
index e035f1d..215c6a7 100644
--- a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
+++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
@@ -10,20 +10,20 @@ public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterRes
 
 }public class GetAllUserOrderByFilterFilter
 {
-    //شناسه 
+    //شناسه
     public long? Id { get; set; }
-    //قیمت 
-    public long? Price { get; set; }
-    //شناسه پکیج 
+    //قیمت
+    public long? Amount { get; set; }
+    //شناسه پکیج
     public long? PackageId { get; set; }
-    //شناسه تراکنش 
+    //شناسه تراکنش
     public long? TransactionId { get; set; }
-    //وضعیت پرداخت 
+    //وضعیت پرداخت
     public bool? PaymentStatus { get; set; }
-    //تاریخ پرداخت 
+    //تاریخ پرداخت
     public DateTime? PaymentDate { get; set; }
-    //شناسه کاربر 
+    //شناسه کاربر
     public long? UserId { get; set; }
-    //شناسه آدرس کاربر 
+    //شناسه آدرس کاربر
     public long? UserAddressId { get; set; }
 }
diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
index 6bcfbec..975709b 100644
--- a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
+++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
@@ -11,27 +11,27 @@ public class GetAllUserOrderByFilterResponseDto
 
 }public class GetAllUserOrderByFilterResponseModel
 {
-    //شناسه 
+    //شناسه
     public long Id { get; set; }
-    //قیمت 
+    //قیمت
     public long Amount { get; set; }
-    //شناسه پکیج 
+    //شناسه پکیج
     public long PackageId { get; set; }
-    //شناسه تراکنش 
+    //شناسه تراکنش
     public long? TransactionId { get; set; }
-    //وضعیت پرداخت 
+    //وضعیت پرداخت
     public PaymentStatus PaymentStatus { get; set; }
-    //تاریخ پرداخت 
+    //تاریخ پرداخت
     public DateTime? PaymentDate { get; set; }
-    //شناسه کاربر 
+    //شناسه کاربر
     public long UserId { get; set; }
-    //شناسه آدرس کاربر 
+    //شناسه آدرس کاربر
     public long UserAddressId { get; set; }
-    // 
+    //
     public PaymentMethod? PaymentMethod { get; set; }
-    // 
+    //
     public string? UserAddressText { get; set; }
-    // 
+    //
     public List<GetAllUserOrderByFilterResponseModelFactorDetail>? FactorDetails { get; set; }
 }
 public class GetAllUserOrderByFilterResponseModelFactorDetail
diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
index ee1abc1..ad4c4c0 100644
--- a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
+++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
@@ -3,27 +3,27 @@ using FrontOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
 namespace FrontOffice.BFF.Application.UserOrderCQ.Queries.GetUserOrder;
 public class GetUserOrderResponseDto
 {
-    //شناسه 
+    //شناسه
     public long Id { get; set; }
-    //قیمت 
+    //قیمت
     public long Amount { get; set; }
-    //شناسه پکیج 
+    //شناسه پکیج
     public long PackageId { get; set; }
-    //شناسه تراکنش 
+    //شناسه تراکنش
     public long? TransactionId { get; set; }
-    //وضعیت پرداخت 
+    //وضعیت پرداخت
     public PaymentStatus PaymentStatus { get; set; }
-    //تاریخ پرداخت 
+    //تاریخ پرداخت
     public DateTime? PaymentDate { get; set; }
-    //شناسه کاربر 
+    //شناسه کاربر
     public long UserId { get; set; }
-    //شناسه آدرس کاربر 
+    //شناسه آدرس کاربر
     public long UserAddressId { get; set; }
-    // 
+    //
     public PaymentMethod? PaymentMethod { get; set; }
-    // 
+    //
     public string? UserAddressText { get; set; }
-    // 
+    //
     public List<GetUserOrderResponseFactorDetail>? FactorDetails { get; set; }
 
 }public class GetUserOrderResponseFactorDetail
diff --git a/src/FrontOffice.BFF.Domain/FrontOffice.BFF.Domain.csproj b/src/FrontOffice.BFF.Domain/FrontOffice.BFF.Domain.csproj
index 83ef7de..9f3f3bc 100644
--- a/src/FrontOffice.BFF.Domain/FrontOffice.BFF.Domain.csproj
+++ b/src/FrontOffice.BFF.Domain/FrontOffice.BFF.Domain.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="Afrino.PYMSMicroservice.Protobuf" Version="0.0.11" />
-    <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.128" />
+    <PackageReference Include="Foursat.CMSMicroservice.Protobuf" Version="0.0.134" />
     <PackageReference Include="Google.Protobuf" Version="3.33.0" />
 		<PackageReference Include="Grpc.Net.ClientFactory" Version="2.54.0" />
 		<PackageReference Include="Grpc.Tools" Version="2.76.0">
diff --git a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto
index 32d5f91..a80a129 100644
--- a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto
+++ b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto
@@ -81,14 +81,14 @@ message GetUserOrderResponse
     int64 amount = 2;
     int64 package_id = 3;
     google.protobuf.Int64Value transaction_id = 4;
-    oneof PaymentStatus_item 
+    oneof PaymentStatus_item
     {
         PaymentStatus payment_status = 5;
     }
     google.protobuf.Timestamp payment_date = 6;
     int64 user_id = 7;
     int64 user_address_id = 8;
-    oneof PaymentMethod_item 
+    oneof PaymentMethod_item
     {
         PaymentMethod payment_method = 9;
     }
@@ -124,7 +124,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;
     google.protobuf.BoolValue payment_status = 5;
@@ -143,14 +143,14 @@ message GetAllUserOrderByFilterResponseModel
     int64 amount = 2;
     int64 package_id = 3;
     google.protobuf.Int64Value transaction_id = 4;
-    oneof PaymentStatus_item 
+    oneof PaymentStatus_item
     {
         PaymentStatus payment_status = 5;
     }
     google.protobuf.Timestamp payment_date = 6;
     int64 user_id = 7;
     int64 user_address_id = 8;
-    oneof PaymentMethod_item 
+    oneof PaymentMethod_item
     {
         PaymentMethod payment_method = 9;
     }