From 47abf8715c7d4d9c6c6ca4a659c25c469b36118c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Zieliski?= <bimbej@icloud.com>
Date: Fri, 9 Aug 2024 13:59:57 +0200
Subject: [PATCH] Update R2 export

---
 WebAPI/dataProcessors/t1.r1.processor.cs |  4 ++--
 WebAPI/dataProcessors/t4.r2.processor.cs | 28 +++++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/WebAPI/dataProcessors/t1.r1.processor.cs b/WebAPI/dataProcessors/t1.r1.processor.cs
index c17863f..e54bde4 100644
--- a/WebAPI/dataProcessors/t1.r1.processor.cs
+++ b/WebAPI/dataProcessors/t1.r1.processor.cs
@@ -247,7 +247,7 @@ public class T1R1Processor
         // update time 
         var timeUtc = new List<object>
         {
-            r1!.ModifiedAt.ToString(CultureInfo.InvariantCulture)
+            r1!.ModifiedAt.ToString("G")
         };
         var valueRangeUtcTime = new ValueRange
         {
@@ -261,7 +261,7 @@ public class T1R1Processor
         var warsawTime = TimeZoneInfo.ConvertTimeFromUtc(r1.ModifiedAt.ToUniversalTime(), warsawTimeZone);
         var timeWarsaw = new List<object>
         {
-            warsawTime.ToString(CultureInfo.InvariantCulture)
+            warsawTime.ToString("G")
         };
         var valueRangeWarsawTime = new ValueRange
         {
diff --git a/WebAPI/dataProcessors/t4.r2.processor.cs b/WebAPI/dataProcessors/t4.r2.processor.cs
index 15abee3..54a1175 100644
--- a/WebAPI/dataProcessors/t4.r2.processor.cs
+++ b/WebAPI/dataProcessors/t4.r2.processor.cs
@@ -290,7 +290,7 @@ public class T4R2Processor
         // update time 
         var timeUtc = new List<object>
         {
-            r2!.ModifiedAt.ToString(CultureInfo.InvariantCulture)
+            r2!.ModifiedAt.ToString("G")
         };
         var valueRangeUtcTime = new ValueRange
         {
@@ -299,16 +299,12 @@ public class T4R2Processor
         var updateTimeUtc = _googleSheetValues.Update(valueRangeUtcTime, sheetId, $"{reportSheetName}!G1");
         updateTimeUtc.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
         updateTimeUtc.Execute();
-        
-        var updateTimeUtc2 = _googleSheetValues.Update(valueRangeUtcTime, sheetId, $"{invoicesSheetName}!G1");
-        updateTimeUtc2.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
-        updateTimeUtc2.Execute();
             
         var warsawTimeZone = TimeZoneInfo.FindSystemTimeZoneById("Central European Standard Time");
         var warsawTime = TimeZoneInfo.ConvertTimeFromUtc(r2.ModifiedAt.ToUniversalTime(), warsawTimeZone);
         var timeWarsaw = new List<object>
         {
-            warsawTime.ToString(CultureInfo.InvariantCulture)
+            warsawTime.ToString("G")
         };
         var valueRangeWarsawTime = new ValueRange
         {
@@ -318,16 +314,13 @@ public class T4R2Processor
         updateTimeWarsaw.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
         updateTimeWarsaw.Execute();
         
-        var updateTimeWarsaw2 = _googleSheetValues.Update(valueRangeWarsawTime, sheetId, $"{invoicesSheetName}!G2");
-        updateTimeWarsaw2.ValueInputOption = SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
-        updateTimeWarsaw2.Execute();
-        
         //invoices
 
         var invoices = r2.Records!.Where(x => x.Code!.Length == 12)
             .OrderByDescending(x => x.Code);
         
         var invoicesValues = new List<IList<object>>();
+        var cleanUpValues = new List<IList<object>>();
         foreach (var invoice in invoices)
         {
             var invoiceDate =
@@ -341,12 +334,27 @@ public class T4R2Processor
                 invoice.Value1!
             };
             invoicesValues.Add(invoiceRow);
+
+            var cleanupRow = new List<object>
+            {
+                "", "", "", ""
+            };
+            cleanUpValues.Add(cleanupRow);
         }
 
+        
+        var cleanupValueRange = new ValueRange { Values = cleanUpValues };
+        var cleanupInvoices = _googleSheetValues.Update(cleanupValueRange, sheetId, $"{invoicesSheetName}!A6:E");
+        cleanupInvoices.ValueInputOption =
+            SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
+        cleanupInvoices.Execute();
+        
+        
         var invoicesValueRange = new ValueRange { Values = invoicesValues };
         var updateInvoices = _googleSheetValues.Update(invoicesValueRange, sheetId, $"{invoicesSheetName}!A6:E");
         updateInvoices.ValueInputOption =
             SpreadsheetsResource.ValuesResource.UpdateRequest.ValueInputOptionEnum.USERENTERED;
         updateInvoices.Execute();
+        
     }
 }
\ No newline at end of file