From 8eb9dec769776920079eff75b53e2646f80479e8 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Fri, 19 May 2023 13:36:17 +0300 Subject: [PATCH] merge fix/post-calculation_tlm-tracker --- .../PostCalculation/Models/Prepared/PreparedValues.cs | 5 +++-- .../v1/Columns/Next/TLMCostColumn.cs | 10 +++++----- .../v1/Managers/lib/Helper/TLMLength.cs | 4 ++-- EvoCalculator.Core.PostCalculation/v1/NextValues.cs | 8 ++++---- .../v1/Managers/CalculateByIRRAndSumTests.cs | 2 +- .../v1/Managers/CalculateByTotalExpectedTests.cs | 2 +- .../v1/Managers/CalculateDefaultTests.cs | 2 +- .../PostCalculation/v1/Managers/EarlyRedemption.cs | 4 ++-- .../v1/Managers/PERWithChangingTheTermTests.cs | 2 +- .../v1/Managers/PERWithoutChangingTheTermTests.cs | 2 +- 10 files changed, 21 insertions(+), 20 deletions(-) diff --git a/EvoCalculator.Core.Models/PostCalculation/Models/Prepared/PreparedValues.cs b/EvoCalculator.Core.Models/PostCalculation/Models/Prepared/PreparedValues.cs index 2cba157..68d200f 100644 --- a/EvoCalculator.Core.Models/PostCalculation/Models/Prepared/PreparedValues.cs +++ b/EvoCalculator.Core.Models/PostCalculation/Models/Prepared/PreparedValues.cs @@ -20,7 +20,8 @@ public class PreparedValues [Range(2, 60)] public int EditPaymentNumber { get; set; } [Required] public ChangingValue EditPaymentDate { get; set; } - [Required] public bool ChangeTrackerTLM { get; set; } + [Required] public bool ChangeTLM { get; set; } + [Required] public bool ChangeTracker { get; set; } public int MonthOffset { get; set; } [Required] public bool LastPaymentFix { get; set; } public bool LastDayMonth { get; set; } @@ -33,7 +34,7 @@ public class PreparedValues public ChangingValue Nmper { get; set; } public ChangingValue PlPrice { get; set; } - + public decimal PlPriceWithVAT { get; set; } public decimal PlPriceVAT { get; set; } public ChangingValue Discount { get; set; } diff --git a/EvoCalculator.Core.PostCalculation/v1/Columns/Next/TLMCostColumn.cs b/EvoCalculator.Core.PostCalculation/v1/Columns/Next/TLMCostColumn.cs index 4466390..134a532 100644 --- a/EvoCalculator.Core.PostCalculation/v1/Columns/Next/TLMCostColumn.cs +++ b/EvoCalculator.Core.PostCalculation/v1/Columns/Next/TLMCostColumn.cs @@ -21,7 +21,7 @@ public class TLMCostColumn : BaseColumnWithSum , ChangingValue tableTLMTracker) { /* Вариант 1: меняем системы ТЛМ */ - if (preparedValues.ChangeTrackerTLM + if (preparedValues.ChangeTLM && tableTLMTracker.Current != null && tableTLMTracker.Next != null) { @@ -48,7 +48,7 @@ public class TLMCostColumn : BaseColumnWithSum , nextPart.Select(x => x.CostTLM)); } /* Вариант 2: добавляем ТЛМ */ - else if (preparedValues.ChangeTrackerTLM + else if (preparedValues.ChangeTLM && tableTLMTracker.Current == null && tableTLMTracker.Next != null) { @@ -61,7 +61,7 @@ public class TLMCostColumn : BaseColumnWithSum , nextPart.Select(x => x.CostTLM)); } /* Вариант 3: удаляем ТЛМ */ - else if (preparedValues.ChangeTrackerTLM + else if (preparedValues.ChangeTLM && tableTLMTracker.Current != null && tableTLMTracker.Next == null) { @@ -79,7 +79,7 @@ public class TLMCostColumn : BaseColumnWithSum ); } /* Вариант 4: ТЛМ есть и не меняется */ - else if (preparedValues.ChangeTrackerTLM == false + else if (preparedValues.ChangeTLM == false && tableTLMTracker.Current != null && tableTLMTracker.Next == null) { @@ -101,7 +101,7 @@ public class TLMCostColumn : BaseColumnWithSum } } /* Вариант 5: ТЛМ нет и не меняется */ - else if (preparedValues.ChangeTrackerTLM == false + else if (preparedValues.ChangeTLM == false && tableTLMTracker.Current != null && tableTLMTracker.Next != null) { diff --git a/EvoCalculator.Core.PostCalculation/v1/Managers/lib/Helper/TLMLength.cs b/EvoCalculator.Core.PostCalculation/v1/Managers/lib/Helper/TLMLength.cs index 4958dfa..9eb65d0 100644 --- a/EvoCalculator.Core.PostCalculation/v1/Managers/lib/Helper/TLMLength.cs +++ b/EvoCalculator.Core.PostCalculation/v1/Managers/lib/Helper/TLMLength.cs @@ -22,11 +22,11 @@ public class Helper ) { if (currentTableTLMTracker == null && nextTableTLMTracker == null) return null; - if (preparedValues.ChangeTrackerTLM == false && currentTableTLMTracker == null) return null; + if (preparedValues.ChangeTLM == false && currentTableTLMTracker == null) return null; DateTime startDate; DateTime endDate; - if (preparedValues.ChangeTrackerTLM) + if (preparedValues.ChangeTLM) { startDate = currentTableTLMTracker?[0]?.DateTLM ?? preparedValues.EditPaymentDate.Current; endDate = nextTableTLMTracker != null diff --git a/EvoCalculator.Core.PostCalculation/v1/NextValues.cs b/EvoCalculator.Core.PostCalculation/v1/NextValues.cs index 0be5ee9..084bb69 100644 --- a/EvoCalculator.Core.PostCalculation/v1/NextValues.cs +++ b/EvoCalculator.Core.PostCalculation/v1/NextValues.cs @@ -24,7 +24,7 @@ public class NextValues public void ComputeAcquisitionExpenses(TableInsuranceRow[]? nextTableInsurance) { var tracker = 0m; - if (preparedValues.TrackerCost.Next == 0) + if (preparedValues.ChangeTracker == false) tracker = preparedValues.TrackerCost.Current; else if (preparedValues.TypeChangeTracker == 100000000) tracker = preparedValues.TrackerCost.Current + preparedValues.TrackerCost.Next; @@ -32,7 +32,7 @@ public class NextValues tracker = preparedValues.TrackerCostRemove + preparedValues.TrackerCost.Next; var tlm = 0m; - if (preparedValues.TLMCost.Next == 0) + if (preparedValues.ChangeTLM == false) tlm = preparedValues.TLMCost.Current; else if (preparedValues.TypeChangeTLM == 100000000) tlm = preparedValues.TLMCost.Current + preparedValues.TLMCost.Next; @@ -90,7 +90,7 @@ public class NextValues var tracker = 0m; - if (preparedValues.TrackerCost.Next == 0) + if (preparedValues.ChangeTracker == false) tracker = preparedValues.TrackerCost.Current; else if (preparedValues.TypeChangeTracker == 100000000) tracker = preparedValues.TrackerCost.Current + preparedValues.TrackerCost.Next; @@ -98,7 +98,7 @@ public class NextValues tracker = preparedValues.TrackerCostRemove + preparedValues.TrackerCost.Next; var tlm = 0m; - if (preparedValues.TLMCost.Next == 0) + if (preparedValues.ChangeTLM == false) tlm = preparedValues.TLMCost.Current; else if (preparedValues.TypeChangeTLM == 100000000) tlm = preparedValues.TLMCost.Current + preparedValues.TLMCost.Next; diff --git a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByIRRAndSumTests.cs b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByIRRAndSumTests.cs index acfb44b..b828086 100644 --- a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByIRRAndSumTests.cs +++ b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByIRRAndSumTests.cs @@ -30,7 +30,7 @@ public class CalculateByIRRAndSumTests Current = new DateTime(2021, 11, 06), Next = new DateTime(2021, 11, 28) }, - ChangeTrackerTLM = false, + ChangeTLM = false, MonthOffset = 0, LastPaymentFix = true, FuelCardSum = 0m, diff --git a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByTotalExpectedTests.cs b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByTotalExpectedTests.cs index 6264f50..ebf773b 100644 --- a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByTotalExpectedTests.cs +++ b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateByTotalExpectedTests.cs @@ -30,7 +30,7 @@ public class CalculateByTotalExpectedTests Current = new DateTime(2021, 11, 06), Next = new DateTime(2021, 11, 06) }, - ChangeTrackerTLM = false, + ChangeTLM = false, MonthOffset = 0, LastPaymentFix = true, FuelCardSum = 0m, diff --git a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateDefaultTests.cs b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateDefaultTests.cs index 54cee62..8f2fa9e 100644 --- a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateDefaultTests.cs +++ b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/CalculateDefaultTests.cs @@ -30,7 +30,7 @@ public class CalculateDefaultTests Current = new DateTime(2021, 11, 06), Next = new DateTime(2021, 11, 06) }, - ChangeTrackerTLM = false, + ChangeTLM = false, MonthOffset = 0, LastPaymentFix = true, FuelCardSum = 0m, diff --git a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/EarlyRedemption.cs b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/EarlyRedemption.cs index 762a1b6..05587c3 100644 --- a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/EarlyRedemption.cs +++ b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/EarlyRedemption.cs @@ -30,7 +30,7 @@ public class EarlyRedemptionTests Current = new DateTime(2022, 03, 06), Next = new DateTime(2022, 03, 06) }, - ChangeTrackerTLM = false, + ChangeTLM = false, MonthOffset = 0, LastPaymentFix = true, FuelCardSum = 0m, @@ -310,7 +310,7 @@ public class EarlyRedemptionTests Current = new DateTime(2022, 03, 06), Next = new DateTime(2022, 03, 06) }, - ChangeTrackerTLM = false, + ChangeTLM = false, MonthOffset = 0, LastPaymentFix = true, FuelCardSum = 0m, diff --git a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithChangingTheTermTests.cs b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithChangingTheTermTests.cs index f0ffc7f..b5662f1 100644 --- a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithChangingTheTermTests.cs +++ b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithChangingTheTermTests.cs @@ -30,7 +30,7 @@ public class PERWithChangingTheTermTests Current = new DateTime(2021, 11, 06), Next = new DateTime(2021, 11, 06) }, - ChangeTrackerTLM = false, + ChangeTLM = false, MonthOffset = 0, LastPaymentFix = true, FuelCardSum = 0m, diff --git a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithoutChangingTheTermTests.cs b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithoutChangingTheTermTests.cs index f6804ce..902c94a 100644 --- a/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithoutChangingTheTermTests.cs +++ b/EvoCalculator.Core.Tests/PostCalculation/v1/Managers/PERWithoutChangingTheTermTests.cs @@ -30,7 +30,7 @@ public class PERWithoutChangingTheTermTests Current = new DateTime(2021, 11, 06), Next = new DateTime(2021, 11, 06) }, - ChangeTrackerTLM = false, + ChangeTLM = false, MonthOffset = 0, LastPaymentFix = true, FuelCardSum = 0m,