From 92f0aa29b51d9de199784870ce15bf276423d2d0 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Tue, 30 Mar 2021 15:08:42 +0300
Subject: [PATCH] fix & refactor dates

---
 EvoCalculator.Core.Calculation/v1/Columns/DateColumn.cs   | 8 ++------
 .../v1/Columns/DateTempColumn.cs                          | 6 ++++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/EvoCalculator.Core.Calculation/v1/Columns/DateColumn.cs b/EvoCalculator.Core.Calculation/v1/Columns/DateColumn.cs
index 6a2f39e..f88007b 100644
--- a/EvoCalculator.Core.Calculation/v1/Columns/DateColumn.cs
+++ b/EvoCalculator.Core.Calculation/v1/Columns/DateColumn.cs
@@ -16,12 +16,8 @@ namespace EvoCalculator.Core.Calculation.v1.Columns
 
             Values[2] = preparedValues.DeliveryTime switch
             {
-                100000000 => preparedValues.PaymentDateNew == null
-                    ? Values[1].AddMonths(1)
-                    : preparedValues.PaymentDateNew ?? DateTime.MinValue,
-                100000001 => preparedValues.PaymentDateNew == null
-                    ? Values[1].AddDays(constants.DeliveryDays)
-                    : preparedValues.PaymentDateNew ?? DateTime.MinValue,
+                100000000 => preparedValues.PaymentDateNew ?? Values[1].AddMonths(1),
+                100000001 => preparedValues.PaymentDateNew ?? Values[1].AddDays(constants.DeliveryDays),
                 _ => Values[2]
             };
 
diff --git a/EvoCalculator.Core.Calculation/v1/Columns/DateTempColumn.cs b/EvoCalculator.Core.Calculation/v1/Columns/DateTempColumn.cs
index 01311bb..08172e8 100644
--- a/EvoCalculator.Core.Calculation/v1/Columns/DateTempColumn.cs
+++ b/EvoCalculator.Core.Calculation/v1/Columns/DateTempColumn.cs
@@ -8,10 +8,12 @@ namespace EvoCalculator.Core.Calculation.v1.Columns
         public DateTempColumn(int count) : base(count)
         {
         }
-
+        
         public void ComputeValues(PreparedValues preparedValues)
         {
-            Values[0] = preparedValues.DogDate;
+            Values[0] = preparedValues.PaymentDateNew != null && preparedValues.DeliveryTime == 100000001 
+                ? preparedValues.PaymentDateNew.Value.AddMonths(-1) 
+                : preparedValues.DogDate;
             Values[1] = Values[0];
             Values[2] = preparedValues.PaymentDateNew ?? Values[1].AddMonths(1);