From da4888ef8fce9278cb1176c2d372d6d2a22d09b1 Mon Sep 17 00:00:00 2001
From: Mike Phares <mike.phares@infineon.com>
Date: Mon, 17 Feb 2025 12:04:53 -0700
Subject: [PATCH] using Adaptation.FileHandlers.RsM;

---
 Adaptation/FileHandlers/RsM/Row.cs |  6 ++-
 Adaptation/FileHandlers/RsM/Run.cs |  2 +-
 Adaptation/_Tests/Static/RsM.cs    | 72 +++++++++++++++++++-----------
 3 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/Adaptation/FileHandlers/RsM/Row.cs b/Adaptation/FileHandlers/RsM/Row.cs
index 69834e3..0bbd593 100644
--- a/Adaptation/FileHandlers/RsM/Row.cs
+++ b/Adaptation/FileHandlers/RsM/Row.cs
@@ -9,6 +9,8 @@ internal class Row
 
     public Row(Run run, int i)
     {
+        Index = i;
+        //
         Title = run.Line1.Title;
         //
         FileName = run.Line2.FileName;
@@ -103,7 +105,9 @@ internal class Row
         MeritGOF = run.Points[i].MeritGOF;
         DataIntegrity = run.Points[i].DataIntegrity;
     }
-    
+
+    public int Index { get; }
+    //
     public string Title { get; }
     //
     public string FileName { get; }
diff --git a/Adaptation/FileHandlers/RsM/Run.cs b/Adaptation/FileHandlers/RsM/Run.cs
index fb88102..6388b8b 100644
--- a/Adaptation/FileHandlers/RsM/Run.cs
+++ b/Adaptation/FileHandlers/RsM/Run.cs
@@ -75,7 +75,7 @@ internal class Run
         int columns = 0;
         StringBuilder stringBuilder = new();
         results.Add($"\"Count\",{jsonElements?.Length}");
-        results.Add($"\"{nameof(logistics.Sequence)}\",{logistics.Sequence}");
+        results.Add($"\"{nameof(logistics.Sequence)}\",\"{logistics.Sequence}\"");
         results.Add($"\"{nameof(logistics.MesEntity)}\",\"{logistics.MesEntity}\"");
         string dateTimeFromSequence = logistics.DateTimeFromSequence.ToString("MM/dd/yyyy hh:mm:ss tt");
         for (int i = 0; i < jsonElements?.Length;)
diff --git a/Adaptation/_Tests/Static/RsM.cs b/Adaptation/_Tests/Static/RsM.cs
index a4001d1..2d2cbda 100644
--- a/Adaptation/_Tests/Static/RsM.cs
+++ b/Adaptation/_Tests/Static/RsM.cs
@@ -1,4 +1,5 @@
 using Adaptation._Tests.Shared;
+using Adaptation.FileHandlers.RsM;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
@@ -57,112 +58,131 @@ public class RsM : LoggingUnitTesting, IDisposable
     [TestMethod]
     public void TestDescriptor()
     {
-        FileHandlers.RsM.Descriptor descriptor;
+        Descriptor descriptor;
         MethodBase methodBase = new StackFrame().GetMethod();
         LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Getting configuration"));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor(string.Empty);
+        descriptor = ProcessData.GetDescriptor(string.Empty);
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("12-123456-1234");
+        descriptor = ProcessData.GetDescriptor("12-123456-1234");
         Assert.IsTrue(descriptor.Reactor is "12");
         Assert.IsTrue(descriptor.RDS is "123456");
         Assert.IsTrue(descriptor.PSN is "1234");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("123456");
+        descriptor = ProcessData.GetDescriptor("123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(descriptor.RDS is "123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("1T123456");
+        descriptor = ProcessData.GetDescriptor("1T123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(descriptor.RDS is "123456");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("MP");
+        descriptor = ProcessData.GetDescriptor("MP");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(descriptor.Employee is "MP");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("12-123456-1234.2-1");
+        descriptor = ProcessData.GetDescriptor("12-123456-1234.2-1");
         Assert.IsTrue(descriptor.Reactor is "12");
         Assert.IsTrue(descriptor.RDS is "123456");
         Assert.IsTrue(descriptor.PSN is "1234");
         Assert.IsTrue(descriptor.Layer is "2");
         Assert.IsTrue(descriptor.Zone is "1");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("12-123456-1234.02-01");
+        descriptor = ProcessData.GetDescriptor("12-123456-1234.02-1");
         Assert.IsTrue(descriptor.Reactor is "12");
         Assert.IsTrue(descriptor.RDS is "123456");
         Assert.IsTrue(descriptor.PSN is "1234");
         Assert.IsTrue(descriptor.Layer is "2");
         Assert.IsTrue(descriptor.Zone is "1");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("12-123456-1234.02-1");
-        Assert.IsTrue(descriptor.Reactor is "12");
-        Assert.IsTrue(descriptor.RDS is "123456");
-        Assert.IsTrue(descriptor.PSN is "1234");
-        Assert.IsTrue(descriptor.Layer is "2");
-        Assert.IsTrue(descriptor.Zone is "1");
-        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("20");
+        descriptor = ProcessData.GetDescriptor("20");
         Assert.IsTrue(descriptor.Reactor is "20");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("20.2");
+        descriptor = ProcessData.GetDescriptor("20.2");
         Assert.IsTrue(descriptor.Reactor is "20");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(descriptor.Layer is "2");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("20.2.1");
+        descriptor = ProcessData.GetDescriptor("20.2.1");
         Assert.IsTrue(descriptor.Layer is "2");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(descriptor.Reactor is "20");
         Assert.IsTrue(descriptor.Zone is "1");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("20.1.1");
+        descriptor = ProcessData.GetDescriptor("20.1.1");
         Assert.IsTrue(descriptor.Layer is "1");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(descriptor.Reactor is "20");
         Assert.IsTrue(descriptor.Zone is "1");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("P2-LOW-RR");
+        descriptor = ProcessData.GetDescriptor("P2-LOW-RR");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(descriptor.PSN is "RR");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(descriptor.Reactor is "P2");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("75-QP1414-SPLIT4");
-        Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Run));
+        descriptor = ProcessData.GetDescriptor("i171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
+        Assert.IsTrue(descriptor.RDS is "i171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
+        descriptor = ProcessData.GetDescriptor("o171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
+        Assert.IsTrue(descriptor.RDS is "o171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
+        descriptor = ProcessData.GetDescriptor("O171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
+        Assert.IsTrue(descriptor.RDS is "O171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
+        descriptor = ProcessData.GetDescriptor("171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
+        Assert.IsTrue(descriptor.RDS is "171308.1.51");
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
+        descriptor = ProcessData.GetDescriptor("75-QP1414-SPLIT4");
+        // Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Lot));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(descriptor.PSN is "SPLIT4");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
         Assert.IsTrue(descriptor.Reactor is "75");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("B48");
-        Assert.IsTrue(descriptor.Run == "B48");
-        descriptor = FileHandlers.RsM.ProcessData.GetDescriptor("B48");
-        Assert.IsTrue(descriptor.Run == "B48");
+        descriptor = ProcessData.GetDescriptor("B48");
+        // Assert.IsTrue(descriptor.Lot == "B48");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));