From 88f38f5d8e06e9804c22b51af85e6861ef00eb87 Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Tue, 25 Nov 2025 03:04:00 +0330
Subject: [PATCH] update

---
 .../SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs    | 2 +-
 .../GetAllUserWalletChangeLogByFilterQueryHandler.cs          | 4 +++-
 src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
index 160854d..57a25c9 100644
--- a/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
+++ b/src/CMSMicroservice.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderCommandHandler.cs
@@ -88,7 +88,7 @@ public class
             PaymentStatus = newOrder.PaymentStatus,
             TotalAmount = newOrder.Amount,
             UserAddressText = user.UserAddresss.First(f => f.IsDefault).Address,
-            Created = newOrder.PaymentDate,
+            PaymentDate = newOrder.PaymentDate,
             FactorDetails = factorDetailsList.Select(s => new SubmitShopBuyOrderFactorDetail()
             {
                 Count = s.Count,
diff --git a/src/CMSMicroservice.Application/UserWalletChangeLogCQ/Queries/GetAllUserWalletChangeLogByFilter/GetAllUserWalletChangeLogByFilterQueryHandler.cs b/src/CMSMicroservice.Application/UserWalletChangeLogCQ/Queries/GetAllUserWalletChangeLogByFilter/GetAllUserWalletChangeLogByFilterQueryHandler.cs
index 6ba0058..2989c8b 100644
--- a/src/CMSMicroservice.Application/UserWalletChangeLogCQ/Queries/GetAllUserWalletChangeLogByFilter/GetAllUserWalletChangeLogByFilterQueryHandler.cs
+++ b/src/CMSMicroservice.Application/UserWalletChangeLogCQ/Queries/GetAllUserWalletChangeLogByFilter/GetAllUserWalletChangeLogByFilterQueryHandler.cs
@@ -11,8 +11,9 @@ public class GetAllUserWalletChangeLogByFilterQueryHandler : IRequestHandler<Get
     public async Task<GetAllUserWalletChangeLogByFilterResponseDto> Handle(GetAllUserWalletChangeLogByFilterQuery request, CancellationToken cancellationToken)
     {
         var query = _context.UserWalletChangeLogs
+            .Include(i=>i.Wallet)
             .ApplyOrder(sortBy: request.SortBy)
-            .AsNoTracking()
+            .AsNoTracking() 
             .AsQueryable();
         if (request.Filter is not null)
         {
@@ -23,6 +24,7 @@ public class GetAllUserWalletChangeLogByFilterQueryHandler : IRequestHandler<Get
                 .Where(x => request.Filter.ChangeValue == null || x.ChangeValue == request.Filter.ChangeValue)
                 .Where(x => request.Filter.IsIncrease == null || x.IsIncrease == request.Filter.IsIncrease)
                 .Where(x => request.Filter.RefrenceId == null || x.RefrenceId == request.Filter.RefrenceId)
+                .Where(x => request.Filter.UserId == null || x.Wallet.UserId == request.Filter.UserId)
 ;
         }
         return new GetAllUserWalletChangeLogByFilterResponseDto
diff --git a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj
index 56754a4..b7aaec7 100644
--- a/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj
+++ b/src/CMSMicroservice.Protobuf/CMSMicroservice.Protobuf.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.0.126</Version>
+    <Version>0.0.127</Version>
     <DebugType>None</DebugType>
     <DebugSymbols>False</DebugSymbols>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>