From b824c4ba36ba05f9876152658ae25b2a0223d406 Mon Sep 17 00:00:00 2001
From: Mike Phares <mike.phares@infineon.com>
Date: Wed, 28 Aug 2024 15:58:20 -0700
Subject: [PATCH] Get text from OI

---
 Shared/Models/Stateless/IWaferCounterController.cs     |  2 +-
 Shared/Models/Stateless/IWaferCounterRepository.cs     |  2 +-
 Tests/UnitTestExportController.cs                      |  1 -
 Wafer-Counter/ApiControllers/WaferCounterController.cs |  8 ++++----
 Wafer-Counter/OI.Metrology.Wafer.Counter.csproj        |  6 +++---
 Wafer-Counter/Repositories/WaferCounterRepository.cs   | 10 ++++++----
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Shared/Models/Stateless/IWaferCounterController.cs b/Shared/Models/Stateless/IWaferCounterController.cs
index 6c5a4fa..17e1b1f 100644
--- a/Shared/Models/Stateless/IWaferCounterController.cs
+++ b/Shared/Models/Stateless/IWaferCounterController.cs
@@ -11,6 +11,6 @@ public interface IWaferCounterController<T>
 
     static string GetRouteName() => nameof(IWaferCounterController<T>)[1..^10];
 
-    T GetLastQuantityAndSlotMap(string area, string waferSize);
+    T GetLastQuantityAndSlotMap(string area, string waferSize, string text);
 
 }
\ No newline at end of file
diff --git a/Shared/Models/Stateless/IWaferCounterRepository.cs b/Shared/Models/Stateless/IWaferCounterRepository.cs
index 791e571..bbc41b0 100644
--- a/Shared/Models/Stateless/IWaferCounterRepository.cs
+++ b/Shared/Models/Stateless/IWaferCounterRepository.cs
@@ -4,6 +4,6 @@ public interface IWaferCounterRepository
 {
 
     string? GetSlotMap(string line1, string line2);
-    DataModels.WaferCounter? GetLastQuantityAndSlotMap(string area, string waferSize);
+    DataModels.WaferCounter? GetLastQuantityAndSlotMap(string area, string waferSize, string text);
 
 }
\ No newline at end of file
diff --git a/Tests/UnitTestExportController.cs b/Tests/UnitTestExportController.cs
index 2ccda27..7e6bc80 100644
--- a/Tests/UnitTestExportController.cs
+++ b/Tests/UnitTestExportController.cs
@@ -233,7 +233,6 @@ public class UnitTestExportController
         _Logger?.LogInformation("{TestName} completed", _TestContext?.TestName);
     }
 
-    [Ignore]
     [TestMethod]
     public void GetCSVExport()
     {
diff --git a/Wafer-Counter/ApiControllers/WaferCounterController.cs b/Wafer-Counter/ApiControllers/WaferCounterController.cs
index e99229a..3af5213 100644
--- a/Wafer-Counter/ApiControllers/WaferCounterController.cs
+++ b/Wafer-Counter/ApiControllers/WaferCounterController.cs
@@ -14,13 +14,13 @@ public class WaferCounterController : Controller, IWaferCounterController<IActio
 
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [HttpGet("{waferSize}/last-quantity-and-slot-map")]
-    public IActionResult GetLastQuantityAndSlotMap(string area, string waferSize)
+    public IActionResult GetLastQuantityAndSlotMap(string area, string waferSize, string text)
     {
-        Shared.DataModels.WaferCounter? waferCounter = _WaferCounterRepository.GetLastQuantityAndSlotMap(area, waferSize);
+        Shared.DataModels.WaferCounter? waferCounter = _WaferCounterRepository.GetLastQuantityAndSlotMap(area, waferSize, text);
         if (waferCounter is null)
-            return this.BadRequest();
+            return BadRequest();
         else if (!string.IsNullOrEmpty(waferCounter.Message))
-            return this.BadRequest(waferCounter.Message);
+            return BadRequest(waferCounter.Message);
         else
             return Json(waferCounter);
     }
diff --git a/Wafer-Counter/OI.Metrology.Wafer.Counter.csproj b/Wafer-Counter/OI.Metrology.Wafer.Counter.csproj
index a636b0a..36944cc 100644
--- a/Wafer-Counter/OI.Metrology.Wafer.Counter.csproj
+++ b/Wafer-Counter/OI.Metrology.Wafer.Counter.csproj
@@ -17,9 +17,9 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Dapper" Version="2.1.44" />
-        <PackageReference Include="EntityFramework" Version="6.4.4" />
+        <PackageReference Include="EntityFramework" Version="6.5.1" />
         <PackageReference Include="jQuery" Version="3.7.1" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.5" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
         <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
@@ -29,7 +29,7 @@
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="8.0.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.1" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
         <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
     </ItemGroup>
     <ItemGroup>
diff --git a/Wafer-Counter/Repositories/WaferCounterRepository.cs b/Wafer-Counter/Repositories/WaferCounterRepository.cs
index d350f43..066360a 100644
--- a/Wafer-Counter/Repositories/WaferCounterRepository.cs
+++ b/Wafer-Counter/Repositories/WaferCounterRepository.cs
@@ -28,13 +28,15 @@ public class WaferCounterRepository : IWaferCounterRepository
         _RepositoryName = nameof(WaferCounterRepository)[..^10];
     }
 
-    private void MoveFile(string waferSizeDirectory, NginxFileSystemSortable nginxFileSystemSortable)
+    private void MoveFile(string area, string waferSize, string text, string waferSizeDirectory, NginxFileSystemSortable nginxFileSystemSortable)
     {
         Calendar calendar = new CultureInfo("en-US").Calendar;
         string from = Path.Combine(waferSizeDirectory, nginxFileSystemSortable.Name);
+        string archive = Path.Combine(_AppSettings.EcCharacterizationSi, "Archive", $"{area}-{waferSize}");
         string weekOfYear = $"{nginxFileSystemSortable.DateTime:yyyy}_Week_{calendar.GetWeekOfYear(nginxFileSystemSortable.DateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday):00}";
-        string to = Path.Combine(waferSizeDirectory, "Archive", weekOfYear, nginxFileSystemSortable.Name);
+        string to = Path.Combine(archive, weekOfYear, nginxFileSystemSortable.DateTime.ToString("yyyy-MM-dd"), nginxFileSystemSortable.Name);
         _FileShareRepository.MoveFile(from, to);
+        _FileShareRepository.FileWrite($"{to}.txt", text);
     }
 
     private static Record GetRecord(string line1, string line2)
@@ -172,7 +174,7 @@ public class WaferCounterRepository : IWaferCounterRepository
         return result;
     }
 
-    WaferCounter? IWaferCounterRepository.GetLastQuantityAndSlotMap(string area, string waferSize)
+    WaferCounter? IWaferCounterRepository.GetLastQuantityAndSlotMap(string area, string waferSize, string text)
     {
         WaferCounter? result;
         Uri waferSizeUri = GetWaferSizeUri(area, waferSize);
@@ -185,7 +187,7 @@ public class WaferCounterRepository : IWaferCounterRepository
         {
             result = GetLastQuantityAndSlotMap(waferSize, httpClient, nginxFileSystemSortableCollection[0]);
             for (int i = 0; i < nginxFileSystemSortableCollection.Count; i++)
-                MoveFile(waferSizeDirectory, nginxFileSystemSortableCollection[i]);
+                MoveFile(area, waferSize, text, waferSizeDirectory, nginxFileSystemSortableCollection[i]);
         }
         return result;
     }