From 10035b328be222a7d7985a29e23b7395f172745b Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Thu, 27 Nov 2025 18:59:22 +0330
Subject: [PATCH] Add payment method and delivery status filters to user order
 queries

---
 .../Common/Mappings/UserOrderProfile.cs       | 59 ++++++++++++++++++-
 .../GetAllUserOrderByFilterQuery.cs           |  4 ++
 .../GetAllUserOrderByFilterResponseDto.cs     |  2 +
 .../GetUserOrder/GetUserOrderResponseDto.cs   |  2 +
 .../Protos/userorder.proto                    |  8 +++
 5 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs b/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
index f32ec6f..b832896 100644
--- a/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
+++ b/src/BackOffice.BFF.Application/Common/Mappings/UserOrderProfile.cs
@@ -1,10 +1,65 @@
+using BackOffice.BFF.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
+using Google.Protobuf.WellKnownTypes;
+using CmsUserOrderFilter = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterFilter;
+using CmsUserOrderRequest = CMSMicroservice.Protobuf.Protos.UserOrder.GetAllUserOrderByFilterRequest;
+
 namespace BackOffice.BFF.Application.Common.Mappings;
 
 public class UserOrderProfile : IRegister
 {
     void IRegister.Register(TypeAdapterConfig config)
     {
-        //config.NewConfig<Source,Destination>()
-        //    .Map(dest => dest.FullName, src => $"{src.Firstname} {src.Lastname}");
+        config.NewConfig<GetAllUserOrderByFilterQuery, CmsUserOrderRequest>()
+            .Map(dest => dest.PaginationState, src => src.PaginationState == null ? null : new CMSMicroservice.Protobuf.Protos.PaginationState
+            {
+                PageNumber = src.PaginationState.PageNumber,
+                PageSize = src.PaginationState.PageSize
+            })
+            .Map(dest => dest.SortBy, src => src.SortBy)
+            .Map(dest => dest.Filter, src => src.Filter == null ? null : BuildFilter(src.Filter));
+    }
+
+    private static CmsUserOrderFilter BuildFilter(GetAllUserOrderByFilterFilter src)
+    {
+        var filter = new CmsUserOrderFilter();
+
+        if (src.Id.HasValue)
+            filter.Id = src.Id.Value;
+
+        if (src.Price.HasValue)
+            filter.Amount = src.Price.Value;
+
+        if (src.PackageId.HasValue)
+            filter.PackageId = src.PackageId.Value;
+
+        if (src.TransactionId.HasValue)
+            filter.TransactionId = src.TransactionId.Value;
+
+        if (src.PaymentDate.HasValue)
+        {
+            filter.PaymentDate = Timestamp.FromDateTime(DateTime.SpecifyKind(src.PaymentDate.Value, DateTimeKind.Utc));
+        }
+
+        if (src.UserId.HasValue)
+            filter.UserId = src.UserId.Value;
+
+        if (src.PaymentStatus.HasValue)
+        {
+            filter.PaymentStatus = src.PaymentStatus.Value
+                ? CMSMicroservice.Protobuf.Protos.PaymentStatus.Success
+                : CMSMicroservice.Protobuf.Protos.PaymentStatus.Reject;
+        }
+
+        if (src.DeliveryStatus.HasValue)
+        {
+            filter.DeliveryStatus = (CMSMicroservice.Protobuf.Protos.DeliveryStatus)src.DeliveryStatus.Value;
+        }
+
+        if (src.PaymentMethod.HasValue)
+        {
+            filter.PaymentMethod = (CMSMicroservice.Protobuf.Protos.PaymentMethod)src.PaymentMethod.Value;
+        }
+
+        return filter;
     }
 }
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
index 075b856..76aa964 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
@@ -24,4 +24,8 @@ public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterRes
     public DateTime? PaymentDate { get; set; }
     //شناسه کاربر 
     public long? UserId { get; set; }
+    // وضعیت ارسال (int از DeliveryStatus)
+    public int? DeliveryStatus { get; set; }
+    // روش پرداخت (0=IPG,1=Wallet)
+    public int? PaymentMethod { get; set; }
 }
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
index 02229fd..dc45316 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
@@ -38,4 +38,6 @@ public class GetAllUserOrderByFilterResponseModel
     public string? UserFullName { get; set; }
     // کدملی کاربر
     public string? UserNationalCode { get; set; }
+    // روش پرداخت (0=IPG,1=Wallet)
+    public int PaymentMethod { get; set; }
 }
diff --git a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
index 89e4569..131f8a8 100644
--- a/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
+++ b/src/BackOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs
@@ -14,6 +14,8 @@ public class GetUserOrderResponseDto
     public bool PaymentStatus { get; set; }
     //تاریخ پرداخت 
     public DateTime? PaymentDate { get; set; }
+    // روش پرداخت (0=IPG,1=Wallet)
+    public int PaymentMethod { get; set; }
     //شناسه کاربر 
     public long UserId { get; set; }
     //شناسه آدرس کاربر
diff --git a/src/Protobufs/BackOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto b/src/Protobufs/BackOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto
index 2cc8a9e..02717ee 100644
--- a/src/Protobufs/BackOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto
+++ b/src/Protobufs/BackOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto
@@ -104,6 +104,8 @@ message GetUserOrderResponse
     google.protobuf.StringValue user_full_name = 14;
     // کدملی کاربر
     google.protobuf.StringValue user_national_code = 15;
+    // روش پرداخت (0=IPG,1=Wallet)
+    int32 payment_method = 16;
 }
 message GetAllUserOrderByFilterRequest
 {
@@ -121,6 +123,10 @@ message GetAllUserOrderByFilterFilter
     google.protobuf.Timestamp payment_date = 6;
     google.protobuf.Int64Value user_id = 7;
     google.protobuf.Int64Value user_address_id = 8;
+    // فیلتر وضعیت ارسال (مقدار عددی DeliveryStatus)
+    google.protobuf.Int32Value delivery_status = 9;
+    // فیلتر روش پرداخت (0=IPG,1=Wallet)
+    google.protobuf.Int32Value payment_method = 10;
 }
 message GetAllUserOrderByFilterResponse
 {
@@ -150,6 +156,8 @@ message GetAllUserOrderByFilterResponseModel
     google.protobuf.StringValue user_full_name = 13;
     // کدملی کاربر
     google.protobuf.StringValue user_national_code = 14;
+    // روش پرداخت (0=IPG,1=Wallet)
+    int32 payment_method = 15;
 }
 
 // جزئیات فاکتور سفارش