fix

WebApi.Test/Budget/BudgetStatsTest.cs

@@ -21,7 +21,7 @@ public class BudgetStatsTest : BaseTest
     public BudgetStatsTest()
     {
         _dateTimeProvider.Now.Returns(new DateTime(2024, 1, 15));
-        
+
         IBudgetStatsService budgetStatsService = new BudgetStatsService(
             _budgetRepository,
             _budgetArchiveRepository,
@@ -29,7 +29,7 @@ public class BudgetStatsTest : BaseTest
             _dateTimeProvider,
             Substitute.For<ILogger<BudgetStatsService>>()
         );
-        
+
         _service = new BudgetService(
             _budgetRepository,
             _budgetArchiveRepository,
@@ -89,7 +89,7 @@ public class BudgetStatsTest : BaseTest
         _budgetRepository.GetAllAsync().Returns(budgets);
         _budgetRepository.GetCurrentAmountAsync(Arg.Any<BudgetRecord>(), Arg.Any<DateTime>(), Arg.Any<DateTime>())
             .Returns(0m); // 实际支出的金额为0
-        
+
         _dateTimeProvider.Now.Returns(referenceDate);
         _transactionStatisticsService.GetFilteredTrendStatisticsAsync(Arg.Any<DateTime>(), Arg.Any<DateTime>(), Arg.Any<TransactionType>(), Arg.Any<List<string>>(), Arg.Any<bool>())
             .Returns(new Dictionary<DateTime, decimal>());
@@ -117,7 +117,7 @@ public class BudgetStatsTest : BaseTest
         };
 
         _budgetRepository.GetAllAsync().Returns(budgets);
-        
+
         // 月度统计使用趋势统计数据（只包含月度预算的分类）
         _transactionStatisticsService.GetFilteredTrendStatisticsAsync(
             Arg.Is<DateTime>(d => d.Year == 2024 && d.Month == 1 && d.Day == 1),
@@ -128,7 +128,7 @@ public class BudgetStatsTest : BaseTest
             {
                 { new DateTime(2024, 1, 15), 800m }  // 1月15日月度吃饭累计800
             });
-        
+
         // 年度统计使用GetCurrentAmountAsync
         _budgetRepository.GetCurrentAmountAsync(Arg.Any<BudgetRecord>(), Arg.Any<DateTime>(), Arg.Any<DateTime>())
             .Returns(args =>
@@ -136,22 +136,22 @@ public class BudgetStatsTest : BaseTest
                 var b = (BudgetRecord)args[0];
                 var startDate = (DateTime)args[1];
                 var endDate = (DateTime)args[2];
-                
+
                 // 月度范围查询 - 月度吃饭（1月）
                 if (startDate.Month == 1 && startDate.Day == 1 && endDate.Month == 1)
                 {
                     return b.Name == "月度吃饭" ? 800m : 0m;
                 }
-                
+
                 // 年度范围查询 - 年度旅游
                 if (startDate.Month == 1 && startDate.Day == 1 && endDate.Month == 12)
                 {
                     return b.Name == "年度旅游" ? 2000m : 0m;
                 }
-                
+
                 return 0m;
             });
-        
+
         // 年度趋势统计（包含所有分类）
         _transactionStatisticsService.GetFilteredTrendStatisticsAsync(
             Arg.Is<DateTime>(d => d.Year == 2024 && d.Month == 1 && d.Day == 1),
@@ -172,7 +172,7 @@ public class BudgetStatsTest : BaseTest
         result.Month.Limit.Should().Be(3000);       // 月度吃饭3000
         result.Month.Current.Should().Be(800);      // 月度吃饭已用800（从GetCurrentAmountAsync获取）
         result.Month.Count.Should().Be(1);          // 只包含1个月度预算
-        
+
         // 年度统计中：包含所有预算（月度预算按剩余月份折算）
         // 1月时，月度预算分为：当前月(1月) + 剩余月份(2-12月共11个月)
         result.Year.Limit.Should().Be(12000 + (3000 * 12));  // 年度旅游12000 + 月度吃饭折算年度(3000*12=36000) = 48000
@@ -239,7 +239,7 @@ public class BudgetStatsTest : BaseTest
     {
         // Arrange
         var referenceDate = new DateTime(2024, 1, 15);
-        
+
         // 设置预算：包含月度预算和年度预算
         var budgets = new List<BudgetRecord>
         {
@@ -257,7 +257,7 @@ public class BudgetStatsTest : BaseTest
         };
 
         _budgetRepository.GetAllAsync().Returns(budgets);
-        
+
         // 设置月度预算的当前金额
         _budgetRepository.GetCurrentAmountAsync(Arg.Any<BudgetRecord>(), Arg.Any<DateTime>(), Arg.Any<DateTime>())
             .Returns(args =>
@@ -272,7 +272,7 @@ public class BudgetStatsTest : BaseTest
                     _ => 0m
                 };
             });
-        
+
         // 设置月度趋势统计数据：只包含月度预算相关的分类（餐饮、零食、交通）
         // 注意：不应包含年度预算的分类（旅游、度假、奖金、年终奖）
         _transactionStatisticsService.GetFilteredTrendStatisticsAsync(
@@ -284,7 +284,7 @@ public class BudgetStatsTest : BaseTest
             {
                 { new DateTime(2024, 1, 15), 1500m }  // 1月15日累计1500（吃喝1200+交通300，不包含年度旅游2000）
             });
-        
+
         // 设置年度趋势统计数据：包含所有预算相关的分类
         _transactionStatisticsService.GetFilteredTrendStatisticsAsync(
             Arg.Is<DateTime>(d => d.Year == 2024 && d.Month == 1 && d.Day == 1),
@@ -296,7 +296,7 @@ public class BudgetStatsTest : BaseTest
             {
                 { new DateTime(2024, 1, 1), 3500m }  // 1月累计3500（吃喝1200+交通300+年度旅游2000）
             });
-        
+
         // 设置收入相关的趋势统计数据
         _transactionStatisticsService.GetFilteredTrendStatisticsAsync(
             Arg.Is<DateTime>(d => d.Year == 2024 && d.Month == 1),
@@ -304,7 +304,7 @@ public class BudgetStatsTest : BaseTest
             TransactionType.Income,
             Arg.Any<List<string>>())
             .Returns(new Dictionary<DateTime, decimal>());  // 月度收入为空
-        
+
         _transactionStatisticsService.GetFilteredTrendStatisticsAsync(
             Arg.Is<DateTime>(d => d.Year == 2024 && d.Month == 1 && d.Day == 1),
             Arg.Is<DateTime>(d => d.Year == 2024 && d.Month == 12 && d.Day == 31),
@@ -318,7 +318,7 @@ public class BudgetStatsTest : BaseTest
 
         // Act - 测试支出统计
         var expenseResult = await _service.GetCategoryStatsAsync(BudgetCategory.Expense, referenceDate);
-        
+
         // Act - 测试收入统计
         var incomeResult = await _service.GetCategoryStatsAsync(BudgetCategory.Income, referenceDate);
 
@@ -345,17 +345,17 @@ public class BudgetStatsTest : BaseTest
         incomeResult.Year.Count.Should().Be(1);       // 包含1个年度收入预算
     }
 
-        
+
     [Fact]
     public async Task GetCategoryStats_年度_3月_2月预算变更_Test()
     {
         // Arrange
         // 测试场景：2024年3月查看年度预算统计，其中2月份发生了预算变更（吃喝预算从2000增加到2500）
         var referenceDate = new DateTime(2024, 3, 15);
-        
+
         // 设置当前时间，确保3月被认为是当前月份
         _dateTimeProvider.Now.Returns(new DateTime(2024, 3, 15));
-        
+
         // 当前3月份有效的预算
         var currentBudgets = new List<BudgetRecord>
         {
@@ -426,11 +426,11 @@ public class BudgetStatsTest : BaseTest
 
         // 设置仓储响应
         _budgetRepository.GetAllAsync().Returns(currentBudgets);
-        
+
         // 设置归档仓储响应
         _budgetArchiveRepository.GetArchiveAsync(2024, 2).Returns(febArchive);
         _budgetArchiveRepository.GetArchiveAsync(2024, 1).Returns(janArchive);
-        
+
         // 设置月度预算的当前金额查询（仅用于3月份）
         _budgetRepository.GetCurrentAmountAsync(Arg.Any<BudgetRecord>(), Arg.Is<DateTime>(d => d.Month == 3), Arg.Is<DateTime>(d => d.Month == 3))
             .Returns(args =>
@@ -443,11 +443,11 @@ public class BudgetStatsTest : BaseTest
                     _ => 0m
                 };
             });
-        
+
         // 年度旅游的年度金额查询
         _budgetRepository.GetCurrentAmountAsync(
-            Arg.Is<BudgetRecord>(b => b.Id == 3), 
-            Arg.Is<DateTime>(d => d.Month == 1), 
+            Arg.Is<BudgetRecord>(b => b.Id == 3),
+            Arg.Is<DateTime>(d => d.Month == 1),
             Arg.Is<DateTime>(d => d.Month == 12))
             .Returns(2500m);  // 年度旅游1-3月已花费2500
 
@@ -477,11 +477,11 @@ public class BudgetStatsTest : BaseTest
                 // 3月累计：月度预算1000 + 年度旅游2500 = 3500
                 { new DateTime(2024, 3, 1), 3500m }
             });
-        
+
         // 补充：年度旅游的GetCurrentAmountAsync调用（用于计算Current）
         _budgetRepository.GetCurrentAmountAsync(
-            Arg.Is<BudgetRecord>(b => b.Id == 3), 
-            Arg.Is<DateTime>(d => d.Month == 1), 
+            Arg.Is<BudgetRecord>(b => b.Id == 3),
+            Arg.Is<DateTime>(d => d.Month == 1),
             Arg.Is<DateTime>(d => d.Month == 12))
             .Returns(2500m);  // 年度旅游1-3月已花费2500
 
@@ -494,7 +494,7 @@ public class BudgetStatsTest : BaseTest
             _dateTimeProvider,
             Substitute.For<ILogger<BudgetStatsService>>()
         );
-        
+
         var result = await budgetStatsService.GetCategoryStatsAsync(BudgetCategory.Expense, referenceDate);
 
         // Assert - 月度统计（3月份）
@@ -502,7 +502,7 @@ public class BudgetStatsTest : BaseTest
         result.Month.Limit.Should().Be(3000);  // 吃喝2500 + 交通500（使用变更后的预算）
         result.Month.Current.Should().Be(1000); // 吃喝800 + 交通200
         result.Month.Count.Should().Be(2);      // 包含2个月度预算
-        
+
         // Assert - 年度统计（需要考虑预算变更和剩余月份）
         // 新逻辑：
         // 1. 对于归档数据，直接使用归档的限额，不折算
@@ -515,7 +515,7 @@ public class BudgetStatsTest : BaseTest
         // 年度旅游：12000
         // 总计：2500 + 2500 + 30000 + 12000 = 47000
         result.Year.Limit.Should().Be(47000);
-        
+
         // 预期年度实际金额：
         // 根据趋势统计数据，3月累计: 月度预算1000 + 年度旅游2500 = 3500
         // 但业务代码会累加所有预算项的Current值：
@@ -528,7 +528,7 @@ public class BudgetStatsTest : BaseTest
         // - 年度旅游：2500
         // 总计：1500+250+1800+300+800+200+2500 = 7350
         result.Year.Current.Should().Be(7350);
-        
+
         // 应该包含：
         // - 1月归档的月度预算：吃喝、1个
         // - 1月归档的月度预算：交通、1个  
@@ -541,7 +541,7 @@ public class BudgetStatsTest : BaseTest
         // - 年度旅游：1个
         // 总计：9个
         result.Year.Count.Should().Be(9);
-        
+
         // 验证使用率计算正确
         result.Month.Rate.Should().BeApproximately(1000m / 3000m * 100, 0.01m);
         // 年度使用率：7350 / 47000 * 100 = 15.64%

WebApi.Test/Repository/BudgetRepositoryTest.cs

@@ -60,7 +60,7 @@ public class BudgetRepositoryTest : TransactionTestBase
         var b1_updated = all.First(b => b.Name == "B1");
         b1_updated.SelectedCategories.Should().Contain("美食");
         b1_updated.SelectedCategories.Should().NotContain("餐饮");
-        
+
         var b2_updated = all.First(b => b.Name == "B2");
         b2_updated.SelectedCategories.Should().Be("美食");
     }

WebApi.Test/Repository/ConfigRepositoryTest.cs

@@ -13,7 +13,7 @@ public class ConfigRepositoryTest : RepositoryTestBase
     public async Task GetByKeyAsync_获取配置_Test()
     {
         await _repository.AddAsync(new ConfigEntity { Key = "k1", Value = "v1" });
-        
+
         var config = await _repository.GetByKeyAsync("k1");
         config.Should().NotBeNull();
         config.Value.Should().Be("v1");

WebApi.Test/Repository/EmailMessageRepositoryTest.cs

@@ -13,10 +13,10 @@ public class EmailMessageRepositoryTest : RepositoryTestBase
     public async Task ExistsAsync_检查存在_Test()
     {
         await _repository.AddAsync(new EmailMessage { Md5 = "md5_value", Subject = "Test" });
-        
+
         var msg = await _repository.ExistsAsync("md5_value");
         msg.Should().NotBeNull();
-        
+
         var notfound = await _repository.ExistsAsync("other");
         notfound.Should().BeNull();
     }
@@ -33,7 +33,7 @@ public class EmailMessageRepositoryTest : RepositoryTestBase
         // Assuming ID order follows insertion (mostly true for snowflakes if generated sequentially)
         // But ReceivedDate is the primary sort in logic usually.
         // Let's verify standard cursor pagination usually sorts by Date DESC, ID DESC.
-        
+
         await _repository.AddAsync(m1);
         await _repository.AddAsync(m2);
         await _repository.AddAsync(m3);

WebApi.Test/Repository/PushSubscriptionRepositoryTest.cs

@@ -13,7 +13,7 @@ public class PushSubscriptionRepositoryTest : RepositoryTestBase
     public async Task GetByEndpointAsync_通过Endpoint获取_Test()
     {
         await _repository.AddAsync(new PushSubscription { Endpoint = "ep1" });
-        
+
         var sub = await _repository.GetByEndpointAsync("ep1");
         sub.Should().NotBeNull();
         sub.Endpoint.Should().Be("ep1");

WebApi.Test/Repository/TransactionPeriodicRepositoryTest.cs

@@ -14,10 +14,10 @@ public class TransactionPeriodicRepositoryTest : TransactionTestBase
     {
         // 应该执行的：NextExecuteTime <= Now
         await _repository.AddAsync(new TransactionPeriodic { Reason = "Bill1", NextExecuteTime = DateTime.Now.AddDays(-1), IsEnabled = true });
-        
+
         // 不该执行的：NextExecuteTime > Now
         await _repository.AddAsync(new TransactionPeriodic { Reason = "Bill2", NextExecuteTime = DateTime.Now.AddDays(1), IsEnabled = true });
-        
+
         // 不该执行的：未激活
         await _repository.AddAsync(new TransactionPeriodic { Reason = "Bill3", NextExecuteTime = DateTime.Now.AddDays(-1), IsEnabled = false });
 

WebApi.Test/Repository/TransactionRecordRepositoryTest.cs

@@ -47,11 +47,11 @@ public class TransactionRecordRepositoryTest : TransactionTestBase
         var results = await _repository.QueryAsync(
             startDate: new DateTime(2023, 1, 1),
             endDate: new DateTime(2023, 2, 28)); // Include Feb
-        
+
         results.Should().HaveCount(2);
     }
 
-     [Fact]
+    [Fact]
     public async Task QueryAsync_按年月筛选_Test()
     {
         await _repository.AddAsync(CreateExpense(100, new DateTime(2023, 1, 15)));
@@ -99,7 +99,7 @@ public class TransactionRecordRepositoryTest : TransactionTestBase
 
         var records = await _repository.QueryAsync(reason: "麦当劳");
         records.All(r => r.Classify == "快餐").Should().BeTrue();
-        
+
         var kfc = await _repository.QueryAsync(reason: "肯德基");
         kfc.First().Classify.Should().Be("餐饮");
     }

WebApi.Test/Transaction/TransactionPeriodicServiceTest.cs

@@ -51,7 +51,7 @@ public class TransactionPeriodicServiceTest : BaseTest
         // Assert
         // Service inserts Amount directly from periodicBill.Amount (100 is positive)
         await _transactionRepository.Received(1).AddAsync(Arg.Is<TransactionRecord>(t =>
-            t.Amount == 100m && 
+            t.Amount == 100m &&
             t.Type == TransactionType.Expense &&
             t.Classify == "餐饮" &&
             t.Reason == "每日餐费" &&
@@ -69,7 +69,7 @@ public class TransactionPeriodicServiceTest : BaseTest
 
         await _periodicRepository.Received(1).UpdateExecuteTimeAsync(
             Arg.Is(1L),
-            Arg.Any<DateTime>(), 
+            Arg.Any<DateTime>(),
             Arg.Any<DateTime?>()
         );
     }
@@ -149,7 +149,7 @@ public class TransactionPeriodicServiceTest : BaseTest
             m.Content.Contains("每月工资")
         ));
     }
-    
+
     [Fact]
     public async Task ExecutePeriodicBillsAsync_未达到执行时间()
     {
@@ -158,7 +158,7 @@ public class TransactionPeriodicServiceTest : BaseTest
         {
             Id = 1,
             PeriodicType = PeriodicType.Weekly,
-            PeriodicConfig = "1,3,5", 
+            PeriodicConfig = "1,3,5",
             Amount = 200m,
             Type = TransactionType.Expense,
             Classify = "交通",
@@ -191,7 +191,7 @@ public class TransactionPeriodicServiceTest : BaseTest
             Classify = "餐饮",
             Reason = "每日餐费",
             IsEnabled = true,
-            LastExecuteTime = DateTime.Today, 
+            LastExecuteTime = DateTime.Today,
             NextExecuteTime = DateTime.Today.AddDays(1)
         };
 

WebApi.Test/Transaction/TransactionStatisticsServiceTest.cs

@@ -93,7 +93,7 @@ public class TransactionStatisticsServiceTest : BaseTest
         // Mock Logic: filter by year (Arg[0]) and month (Arg[1]) and type (Arg[4]) if provided
         _transactionRepository.QueryAsync(
             Arg.Any<int?>(), Arg.Any<int?>(), Arg.Any<DateTime?>(), Arg.Any<DateTime?>(), Arg.Any<TransactionType?>(), Arg.Any<string[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<int>(), Arg.Any<int>(), Arg.Any<bool>()
-        ).Returns(callInfo => 
+        ).Returns(callInfo =>
         {
             var y = callInfo.ArgAt<int?>(0);
             var m = callInfo.ArgAt<int?>(1);
@@ -106,7 +106,7 @@ public class TransactionStatisticsServiceTest : BaseTest
             // In GetTrendStatisticsAsync: transactionRepository.QueryAsync(year: targetYear, month: targetMonth...)
             // It does NOT pass type. So type is null.
             // But Service THEN filters by Type in memory.
-            
+
             return query.ToList();
         });
 
@@ -178,7 +178,7 @@ public class TransactionStatisticsServiceTest : BaseTest
         // Assert
         result[("餐饮", TransactionType.Expense)].Should().Be(-150m); // Expect Negative (Sum of amounts)
     }
-    
+
     // Additional tests from original file to maintain coverage, with minimal adjustments if needed
     [Fact]
     public async Task GetCategoryStatisticsAsync_支出分类()
@@ -190,18 +190,18 @@ public class TransactionStatisticsServiceTest : BaseTest
             new() { Amount = -50m, Type = TransactionType.Expense, Classify = "餐饮" },
             new() { Amount = -200m, Type = TransactionType.Expense, Classify = "交通" }
         };
-        
+
         // Mock filtering by Type
-         _transactionRepository.QueryAsync(
-            Arg.Any<int?>(), Arg.Any<int?>(), Arg.Any<DateTime?>(), Arg.Any<DateTime?>(), Arg.Any<TransactionType?>(), Arg.Any<string[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<int>(), Arg.Any<int>(), Arg.Any<bool>()
-        ).Returns(callInfo => 
-        {
-            var type = callInfo.ArgAt<TransactionType?>(4);
-            return testData.Where(t => !type.HasValue || t.Type == type).ToList();
-        });
+        _transactionRepository.QueryAsync(
+           Arg.Any<int?>(), Arg.Any<int?>(), Arg.Any<DateTime?>(), Arg.Any<DateTime?>(), Arg.Any<TransactionType?>(), Arg.Any<string[]>(), Arg.Any<string>(), Arg.Any<string>(), Arg.Any<int>(), Arg.Any<int>(), Arg.Any<bool>()
+       ).Returns(callInfo =>
+       {
+           var type = callInfo.ArgAt<TransactionType?>(4);
+           return testData.Where(t => !type.HasValue || t.Type == type).ToList();
+       });
 
         var result = await _service.GetCategoryStatisticsAsync(year, month, TransactionType.Expense);
-        
+
         result.First(c => c.Classify == "餐饮").Amount.Should().Be(150m);
         result.First(c => c.Classify == "交通").Amount.Should().Be(200m);
     }