WS Result bug fix, Nuget bump, PSN, Reactor,

Extra RDS rule, OpenInsightApi and testRunTitle

Adaptation/.editorconfig

@@ -79,9 +79,11 @@ dotnet_code_quality.CAXXXX.api_surface = private, internal
 dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array allocations
 dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available
 dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable
+dotnet_diagnostic.CA1846.severity = none # CA1846: Prefer AsSpan over Substring
+dotnet_diagnostic.CA1847.severity = none # CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
 dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name
-dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant.
 dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2");
+dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant.
 dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary
 dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed
 dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049)

Adaptation/.vscode/Reactor.js

@@ -15,8 +15,8 @@ function getValue(value, length, mesEntity, recipe, processJobId) {
         return mesEntity;
     else if (recipe.toUpperCase() === 'STANDARD \\ THINSPC')
         return mesEntity;
-    else if (length !== 0 || processJobId === '-')
+    else if (length === 0)
-        return value;
-    else
         return processJobId;
+    else
+        return value;
 }

Adaptation/.vscode/psn.js

@@ -15,8 +15,8 @@ function getValue(value, length, product, recipe) {
         return 'RHI_STD';
     else if (recipe.toUpperCase() === 'STANDARD \\ THINSPC')
         return 'THINSPC';
-    else if (length !== 0 || product === '-')
+    else if (length === 0)
-        return value;
-    else
         return product;
+    else
+        return value;
 }

Adaptation/FileHandlers/OpenInsight/FileRead.cs

@@ -6,6 +6,7 @@ using Adaptation.Shared.Methods;
 using Adaptation.Shared.Metrology;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -18,6 +19,8 @@ public class FileRead : Shared.FileRead, IFileRead
 
     private readonly string _IqsConnectionString;
     private readonly string _OpenInsightFilePattern;
+    private readonly string _OpenInsightApiECDirectory;
+    private readonly string _OpenInsightApiIFXDirectory;
 
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, string cellInstanceConnectionName, FileConnectorConfiguration fileConnectorConfiguration, string equipmentTypeName, string parameterizedModelObjectDefinitionType, IList<ModelObjectParameterDefinition> modelObjectParameters, string equipmentDictionaryName, Dictionary<string, List<long>> dummyRuns, Dictionary<long, List<string>> staticRuns, bool useCyclicalForDescription, bool isEAFHosted) :
         base(new Description(), false, smtp, fileParameter, cellInstanceName, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted)
@@ -31,6 +34,8 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
+        _OpenInsightApiIFXDirectory = @"\\messdv002.na.infineon.com\Candela\Archive\API";
+        _OpenInsightApiECDirectory = @"\\messv02ecc1.ec.local\EC_Metrology_Si\Archive\API";
         _IqsConnectionString = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "IQS.ConnectionString");
         _OpenInsightFilePattern = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.FilePattern");
     }
@@ -148,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead
         return results.ToString();
     }
 
-    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, List<txt.Description> descriptions, Test[] tests)
+    private void SaveOpenInsightFile(string reportFullPath, DateTime dateTime, string logistics, List<txt.Description> descriptions, Test[] tests)
     {
         bool isDummyRun = false;
         List<(Shared.Properties.IScopeInfo, string)> collection = new();
@@ -179,6 +184,8 @@ public class FileRead : Shared.FileRead, IFileRead
                     collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} {_OpenInsightFilePattern}"), lines));
                 else
                     collection.Add(new(new ScopeInfo(tests[0], $"{subGroupId.Value} E{count.Value} {_OpenInsightFilePattern}"), lines));
+                string weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday).ToString("00");
+                FromIQS.Save(_OpenInsightApiECDirectory, _OpenInsightApiIFXDirectory, _Logistics, reportFullPath, logistics, descriptions.First(), lines, subGroupId, weekOfYear);
             }
         }
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
@@ -195,7 +202,7 @@ public class FileRead : Shared.FileRead, IFileRead
         List<txt.Description> descriptions = txt.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            SaveOpenInsightFile(reportFullPath, dateTime, descriptions, tests);
+            SaveOpenInsightFile(reportFullPath, dateTime, pdsf.Item1, descriptions, tests);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/FileHandlers/OpenInsight/FromIQS.cs

@@ -3,6 +3,7 @@ using System;
 using System.Data;
 using System.Data.SqlClient;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.Json;
@@ -127,6 +128,82 @@ public class FromIQS
         return new(result, count, commandText);
     }
 
+    private static string GetJson(Logistics logistics, string logisticLines, txt.Description description)
+    {
+        string result;
+        StringBuilder stringBuilder = new();
+        var @object = new
+        {
+            description.MesEntity,
+            description.Employee,
+            description.Layer,
+            description.PSN,
+            description.RDS,
+            description.Reactor,
+            description.Recipe,
+            description.Zone,
+            logistics.DateTimeFromSequence.Ticks
+        };
+        string[] pair;
+        string[] segments;
+        foreach (string line in logisticLines.Split(new string[] { Environment.NewLine }, StringSplitOptions.None))
+        {
+            segments = line.Split('\t');
+            if (segments.Length < 2)
+                continue;
+            segments = segments[1].Split(';');
+            _ = stringBuilder.Append('{');
+            foreach (string segment in segments)
+            {
+                pair = segment.Split('=');
+                if (pair.Length != 2 || pair[0].Length < 3)
+                    continue;
+                _ = stringBuilder.Append('"').Append(pair[0].Substring(2)).Append('"').Append(':').Append('"').Append(pair[1]).Append('"').Append(',');
+            }
+            if (stringBuilder.Length > 0)
+                _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
+            _ = stringBuilder.Append('}').Append(',');
+        }
+        if (stringBuilder.Length > 0)
+            _ = stringBuilder.Remove(stringBuilder.Length - 1, 1);
+        _ = stringBuilder.Append(']').Append('}');
+        _ = stringBuilder.Insert(0, ",\"Logistics\":[");
+        string json = JsonSerializer.Serialize(@object);
+        _ = stringBuilder.Insert(0, json.Substring(0, json.Length - 1));
+        JsonElement? jsonElement = JsonSerializer.Deserialize<JsonElement>(stringBuilder.ToString());
+        result = jsonElement is null ? "{}" : JsonSerializer.Serialize(jsonElement, new JsonSerializerOptions { WriteIndented = true });
+        return result;
+    }
+
+    internal static void Save(string openInsightApiECDirectory, string openInsightApiIFXDirectory, Logistics logistics, string reportFullPath, string logisticLines, txt.Description description, string lines, long? subGroupId, string weekOfYear)
+    {
+        string fileName = Path.GetFileName(reportFullPath);
+        string json = GetJson(logistics, logisticLines, description);
+        string? ecPathRoot = Path.GetPathRoot(openInsightApiECDirectory);
+        string? ifxPathRoot = Path.GetPathRoot(openInsightApiIFXDirectory);
+        bool ecExists = ecPathRoot is not null && Directory.Exists(ecPathRoot);
+        bool ifxExists = ifxPathRoot is not null && Directory.Exists(ifxPathRoot);
+        string weekYear = $"{logistics.DateTimeFromSequence:yyyy}_Week_{weekOfYear}";
+        string ecDirectory = Path.Combine(openInsightApiECDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}");
+        string ifxDirectory = Path.Combine(openInsightApiIFXDirectory, weekYear, $"-{description.PSN}", $"-{description.Reactor}", $"-{description.RDS}", $"-{subGroupId}");
+        if (ecExists && !Directory.Exists(ecDirectory))
+            _ = Directory.CreateDirectory(ecDirectory);
+        if (ifxExists && !Directory.Exists(ifxDirectory))
+            _ = Directory.CreateDirectory(ifxDirectory);
+        if (ecExists)
+            File.Copy(reportFullPath, Path.Combine(ecDirectory, fileName));
+        if (ifxExists)
+            File.Copy(reportFullPath, Path.Combine(ifxDirectory, fileName));
+        if (ecExists)
+            File.WriteAllText(Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt"), lines);
+        if (ifxExists)
+            File.WriteAllText(Path.Combine(ifxDirectory, $"{logistics.DateTimeFromSequence.Ticks}.txt"), lines);
+        if (ecExists)
+            File.WriteAllText(Path.Combine(ecDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json"), json);
+        if (ifxExists)
+            File.WriteAllText(Path.Combine(ifxDirectory, $"{logistics.DateTimeFromSequence.Ticks}.json"), json);
+    }
+
 #nullable disable
 
 }

Adaptation/FileHandlers/RsM/ProcessData.cs

@@ -85,11 +85,11 @@ public class ProcessData : IProcessData
         return results;
     }
 
-    private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments)
+    private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments, bool hasRDS)
     {
         string rds;
         string reactor;
-        if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText))
+        if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText) || (segments.Length > 1 && !hasRDS))
             reactor = defaultReactor;
         else
             reactor = segments[0];
@@ -105,11 +105,11 @@ public class ProcessData : IProcessData
         return new(reactor, rds);
     }
 
-    private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments)
+    private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments, bool hasRDS)
     {
         string psn;
         string layer;
-        if (segments.Length <= 2)
+        if (segments.Length <= 2 || (segments.Length > 1 && !hasRDS))
         {
             psn = defaultPSN;
             layer = defaultLayer;
@@ -193,8 +193,9 @@ public class ProcessData : IProcessData
                 title = title.Substring(2);
             run = title;
             string[] segments = title.Split('-');
-            (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments);
+            bool hasRDS = Regex.IsMatch(title, "[-]?[0-9]{5,}[-]?");
-            (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments);
+            (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments, hasRDS);
+            (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
             zone = GetZone(segments);
             employee = defaultEmployee;
         }

Adaptation/FileHandlers/txt/ProcessData.cs

@@ -242,11 +242,11 @@ public class ProcessData : IProcessData
         return result;
     }
 
-    private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments)
+    private static (string, string) GetReactorAndRDS(string defaultReactor, string defaultRDS, string text, string formattedText, string[] segments, bool hasRDS)
     {
         string rds;
         string reactor;
-        if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText))
+        if (string.IsNullOrEmpty(text) || segments.Length == 0 || string.IsNullOrEmpty(formattedText) || (segments.Length > 1 && !hasRDS))
             reactor = defaultReactor;
         else
             reactor = segments[0];
@@ -262,11 +262,11 @@ public class ProcessData : IProcessData
         return new(reactor, rds);
     }
 
-    private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments)
+    private static (string, string) GetLayerAndPSN(string defaultLayer, string defaultPSN, string[] segments, bool hasRDS)
     {
         string psn;
         string layer;
-        if (segments.Length <= 2)
+        if (segments.Length <= 2 || (segments.Length > 1 && !hasRDS))
         {
             psn = defaultPSN;
             layer = defaultLayer;
@@ -352,8 +352,9 @@ public class ProcessData : IProcessData
                 title = title.Substring(2);
             run = title;
             string[] segments = title.Split('-');
-            (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments);
+            bool hasRDS = Regex.IsMatch(title, "[-]?[0-9]{5,}[-]?");
-            (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments);
+            (reactor, rds) = GetReactorAndRDS(defaultReactor, defaultRDS, text, title, segments, hasRDS);
+            (layer, psn) = GetLayerAndPSN(defaultLayer, defaultPSN, segments, hasRDS);
             zone = GetZone(segments);
             employee = defaultEmployee;
         }

Adaptation/MET08RESIMAPCDE-Development.yml

@@ -119,6 +119,7 @@ steps:
     inputs:
       testResultsFormat: VSTest
       testResultsFiles: "**/*.trx"
+      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
       searchFolder: "$(System.DefaultWorkingDirectory)"
 
   - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1

Adaptation/MET08RESIMAPCDE.Tests.csproj

@@ -34,7 +34,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="coverlet.collector" Version="3.2.0" />
-        <PackageReference Include="FFMpegCore" Version="5.0.1" />
+        <PackageReference Include="FFMpegCore" Version="5.0.2" />
         <PackageReference Include="IKVM.AWT.WinForms" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.OpenJDK.Core" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.OpenJDK.Media" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>

Adaptation/MET08RESIMAPCDE.yml

@@ -116,6 +116,7 @@ steps:
     inputs:
       testResultsFormat: VSTest
       testResultsFiles: "**/*.trx"
+      testRunTitle: "$(GitCommitSeven)-$(Build.BuildId)-$(CoreVersion)-$(Configuration)-$(Build.Repository.Name)"
       searchFolder: "$(System.DefaultWorkingDirectory)"
 
   - task: mspremier.CreateWorkItem.CreateWorkItem-task.CreateWorkItem@1

Adaptation/Shared/Metrology/WS.cs

@@ -30,7 +30,7 @@ public partial class WS
                 };
                 HttpResponseMessage httpResponseMessage = httpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).Result;
                 resultsJson = httpResponseMessage.Content.ReadAsStringAsync().Result;
-                results = JsonSerializer.Deserialize<Results>(resultsJson);
+                results = JsonSerializer.Deserialize<Results>(resultsJson, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
             }
             if (!results.Success)
                 results.Errors.Add(results.ToString());
@@ -45,6 +45,7 @@ public partial class WS
                 exception = exception.InnerException;
             }
             results.Errors ??= new List<string>();
+            results.Errors.Add(resultsJson);
             results.Errors.Add(stringBuilder.ToString());
         }
         return new(resultsJson, results);

Adaptation/_Tests/Extract/Staging/v2.47.5/MET08RESIMAPCDE.cs

@@ -58,6 +58,21 @@ public class MET08RESIMAPCDE
     [TestMethod]
     public void Staging__v2_47_5__MET08RESIMAPCDE__OpenInsightMetrologyViewer() => _MET08RESIMAPCDE.Staging__v2_47_5__MET08RESIMAPCDE__OpenInsightMetrologyViewer();
 
+#if DEBUG
+    [Ignore]
+#endif
+    [TestMethod]
+    public void Staging__v2_47_5__MET08RESIMAPCDE__OpenInsightMetrologyViewer638127615724700306__NewColumn()
+    {
+        string check = "*.pdsf";
+        MethodBase methodBase = new StackFrame().GetMethod();
+        _MET08RESIMAPCDE.Staging__v2_47_5__MET08RESIMAPCDE__OpenInsightMetrologyViewer();
+        string[] variables = _MET08RESIMAPCDE.AdaptationTesting.GetVariables(methodBase, check, validatePDSF: false);
+        IFileRead fileRead = _MET08RESIMAPCDE.AdaptationTesting.Get(methodBase, sourceFileLocation: variables[2], sourceFileFilter: variables[3], useCyclicalForDescription: false);
+        Logistics logistics = new(fileRead);
+        _ = AdaptationTesting.ReExtractCompareUpdatePassDirectory(variables, fileRead, logistics);
+    }
+
 #if DEBUG
     [Ignore]
 #endif

Adaptation/_Tests/Static/RsM.cs

@@ -135,6 +135,14 @@ public class RsM : LoggingUnitTesting, IDisposable
         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");
+        Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Run));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }
 

Adaptation/_Tests/Static/txt.cs

@@ -128,6 +128,14 @@ public class TXT : LoggingUnitTesting, IDisposable
         Assert.IsTrue(descriptor.Reactor is "20");
         Assert.IsTrue(descriptor.Zone is "1");
         Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
+        descriptor = FileHandlers.txt.ProcessData.GetDescriptor("P2-LOW-RR");
+        Assert.IsTrue(!string.IsNullOrEmpty(descriptor.Title));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Layer));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.PSN));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.RDS));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Reactor));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Zone));
+        Assert.IsTrue(string.IsNullOrEmpty(descriptor.Employee));
         LoggingUnitTesting.Logger.LogInformation(string.Concat(methodBase.Name, " - Exit"));
     }