From 4c6de6a76f99b97c7b229ed3e9f6daeddb2639af Mon Sep 17 00:00:00 2001 From: mahan Date: Sat, 25 Oct 2025 17:25:08 +0330 Subject: [PATCH] refactor: improve sorting logic in Fine, Loan, and Reward repositories --- CompanyManagment.EFCore/Repository/FineRepository.cs | 2 +- CompanyManagment.EFCore/Repository/LoanRepository.cs | 2 +- CompanyManagment.EFCore/Repository/RewardRepository.cs | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CompanyManagment.EFCore/Repository/FineRepository.cs b/CompanyManagment.EFCore/Repository/FineRepository.cs index 07e1a8b8..0955122f 100644 --- a/CompanyManagment.EFCore/Repository/FineRepository.cs +++ b/CompanyManagment.EFCore/Repository/FineRepository.cs @@ -124,7 +124,7 @@ public class FineRepository : RepositoryBase, IFineRepository } query = query.Where(x => x.EmployeeId == searchModel.EmployeeId); - var list = query.ToList().Select(x => new FineViewModel() + var list = query.OrderByDescending(x=>x.FineDate).ToList().Select(x => new FineViewModel() { Amount = x.Amount.ToMoney(), AmountDouble = x.Amount, diff --git a/CompanyManagment.EFCore/Repository/LoanRepository.cs b/CompanyManagment.EFCore/Repository/LoanRepository.cs index 366fdde6..05c681e7 100644 --- a/CompanyManagment.EFCore/Repository/LoanRepository.cs +++ b/CompanyManagment.EFCore/Repository/LoanRepository.cs @@ -97,7 +97,7 @@ public class LoanRepository : RepositoryBase, ILoanRepository query = query.Where(x => x.StartInstallmentPayment >= startDate && x.StartInstallmentPayment <= endDate); } query = query.Where(x => x.EmployeeId == searchModel.EmployeeId); - var list = query.ToList().Select(x => new LoanViewModel() + var list = query.OrderByDescending(x=>x.StartInstallmentPayment).ToList().Select(x => new LoanViewModel() { Amount = x.Amount.ToMoney(), AmountDouble = x.Amount, diff --git a/CompanyManagment.EFCore/Repository/RewardRepository.cs b/CompanyManagment.EFCore/Repository/RewardRepository.cs index cfecb44f..f40853b1 100644 --- a/CompanyManagment.EFCore/Repository/RewardRepository.cs +++ b/CompanyManagment.EFCore/Repository/RewardRepository.cs @@ -6,6 +6,7 @@ using _0_Framework.InfraStructure; using Company.Domain.RewardAgg; using CompanyManagment.App.Contracts.Reward; using Microsoft.EntityFrameworkCore; +using SharpCompress.Compressors.Xz; namespace CompanyManagment.EFCore.Repository; @@ -119,12 +120,12 @@ public class RewardRepository : RepositoryBase, IRewardRepository query = query.Where(x => x.EmployeeId == searchModel.EmployeeId); - var list = query.ToList().Select(x => new RewardViewModel + var list = query.ToList().OrderByDescending(x=>x.GrantDate).Select(x => new RewardViewModel { WorkshopId = x.WorkshopId, Amount = x.Amount.ToMoney(), AmountDouble = x.Amount, - Description = x.Description, + Description = x.Description ?? "", EmployeeFullName = employees.FirstOrDefault(e => e.id == x.EmployeeId).FullName, EmployeeId = x.EmployeeId, GrantDateFa = x.GrantDate.ToFarsi(),