Metrology Viewer

.gitignore

@@ -335,11 +335,11 @@ ASALocalRun/
 !**/.vscode/extensions.json
 !**/.vscode/format-report.json
 !**/.vscode/launch.json
-!**/.vscode/mklink.md
 !**/.vscode/settings.json
 !**/.vscode/tasks.json
 !**/.vscode/mklink.md
 
 *.lnk
 
-.kanbn
+.kanbn
+Adaptation/.kanbn

.vscode/mklink.md

@@ -1,11 +0,0 @@
----
-type: "note"
-created: "2023-10-20T03:52:57.401Z"
-updated: "2023-10-20T03:53:49.161Z"
----
-
-# mklink
-
-```bash
-mklink /J "L:\Workspaces\33_CS29_79_72\MIT_EAF_Adaptations\Trunk\MESAFIBACKLOG\06_SourceCode\MESAFIBACKLOG\.kanbn" "D:\5-Other-Small\Kanban\MESAFIBACKLOG"
-```

Adaptation/.editorconfig

@@ -100,6 +100,7 @@ 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.CA1854.severity = warning # CA1854: Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup
 dotnet_diagnostic.CA1860.severity = error # CA1860: Prefer comparing 'Count' to 0 rather than using 'Any()', both for clarity and for performance
+dotnet_diagnostic.CA1861.severity = none # CA1861: Prefer 'static readonly' fields over constant array arguments
 dotnet_diagnostic.CA1862.severity = none # CA1862: Prefer using 'string.Equals(string, StringComparison)' to perform a case-insensitive comparison, but keep in mind that this might cause subtle changes in behavior, so make sure to conduct thorough testing after applying the suggestion, or if culturally sensitive comparison is not required, consider using 'StringComparison.OrdinalIgnoreCase'
 dotnet_diagnostic.CA1864.severity = none # CA1864: To avoid double lookup, call 'TryAdd' instead of calling 'Add' with a 'ContainsKey' guard
 dotnet_diagnostic.CA1866.severity = none # CA1866: Use 'string.EndsWith(char)' instead of 'string.EndsWith(string)' when you have a string with a single char

Adaptation/.vscode/mklink.md

@@ -1,15 +1,5 @@
----
-type: "note"
-created: "2023-10-20T03:56:21.490Z"
-updated: "2023-10-20T03:57:15.006Z"
----
-
 # mklink
 
 ```bash
-mklink /J "T:\MESAFIBACKLOG\06_SourceCode\MESAFIBACKLOG\Adaptation\.kanbn" "D:\5-Other-Small\Kanban\MESAFIBACKLOG"
+mklink /J "T:\MET08AFMD3100\06_SourceCode\MET08AFMD3100\Adaptation\.kanbn" "D:\5-Other-Small\Kanban\MET08AFMD3100"
-```
-
-```bash
-mklink /J "T:\MESAFIBACKLOG\06_SourceCode\MESAFIBACKLOG\Adaptation\.kanbn" "D:\5-Other-Small\Kanban\MESAFIBACKLOG"
 ```

Adaptation/.vscode/tasks.json

@@ -12,6 +12,28 @@
             ],
             "problemMatcher": "$msCompile"
         },
+        {
+            "label": "Test-Debug",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "test",
+                "-c",
+                "Debug"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "Test-Release",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "test",
+                "-c",
+                "Release"
+            ],
+            "problemMatcher": "$msCompile"
+        },
         {
             "label": "Format",
             "command": "dotnet",
@@ -46,7 +68,7 @@
             "args": [
                 "/target:Build",
                 "/restore:True",
-                "/p:RestoreSources=https://api.nuget.org/v3/index.json%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://localhost/v3/index.json",
+                "/p:RestoreSources=https://artifactory.intra.infineon.com/artifactory/api/nuget/ngt-fi-package-main-vir/%3Bhttps://packagemanagement.eu.infineon.com:4430/api/v2/%3Bhttps://tfs.intra.infineon.com/tfs/ManufacturingIT/_packaging/eaf/nuget/v3/index.json%3Bhttps://tfs.intra.infineon.com/tfs/FactoryIntegration/_packaging/EAF%40Local/nuget/v3/index.json%3Bhttps://api.nuget.org/v3/index.json",
                 "/detailedsummary",
                 "/consoleloggerparameters:PerformanceSummary;ErrorsOnly;",
                 "/property:Configuration=Debug;TargetFrameworkVersion=v4.8",

Adaptation/FileHandlers/OpenInsightMetrologyViewer/FileRead.cs

@@ -14,8 +14,6 @@ namespace Adaptation.FileHandlers.OpenInsightMetrologyViewer;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    private readonly string _OpenInsightMetrologyViewerAPI;
-
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, 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, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
     {
@@ -28,7 +26,6 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
-        _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI");
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -106,14 +103,14 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-#pragma warning disable IDE0060
+#pragma warning disable IDE0060, CA1822
     private void SendData(string reportFullPath, DateTime dateTime, List<Description> descriptions)
-#pragma warning restore IDE0060
+#pragma warning restore IDE0060, CA1822
     {
-        if (_OpenInsightMetrologyViewerAPI is null)
-        { }
         // WSRequest wsRequest = new(this, _Logistics, descriptions);
-        // (string json, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, wsRequest);
+        // int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+        // string directory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekOfYear:00}");
+        // (string jsonResults, WS.Results wsResults) = WS.SendData(_OpenInsightMetrologyViewerAPI, _Logistics.Sequence, directory, wsRequest);
         // if (!wsResults.Success)
         //     throw new Exception(wsResults.ToString());
         // _Log.Debug(wsResults.HeaderID);
@@ -121,8 +118,12 @@ public class FileRead : Shared.FileRead, IFileRead
         // {
         //     if (!_StaticRuns.ContainsKey(_Logistics.Sequence))
         //         _StaticRuns.Add(_Logistics.Sequence, new());
-        //     _StaticRuns[_Logistics.Sequence].Add(json);
+        //     _StaticRuns[_Logistics.Sequence].Add(jsonResults);
         // }
+        // string checkDirectory = Path.Combine(directory, wsResults.HeaderID.ToString());
+        // if (!Directory.Exists(checkDirectory))
+        //     _ = Directory.CreateDirectory(checkDirectory);
+        // File.Copy(reportFullPath, Path.Combine(checkDirectory, Path.GetFileName(reportFullPath)), overwrite: true);
     }
 
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)

Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs

@@ -5,6 +5,7 @@ using Adaptation.Shared.Duplicator;
 using Adaptation.Shared.Methods;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
@@ -14,8 +15,8 @@ namespace Adaptation.FileHandlers.OpenInsightMetrologyViewerAttachments;
 public class FileRead : Shared.FileRead, IFileRead
 {
 
-    private readonly string _JobIdParentDirectory;
     private readonly string _OpenInsightMetrologyViewerAPI;
+    private readonly string _OpenInsightMetrologyViewerFileShare;
 
     public FileRead(ISMTP smtp, Dictionary<string, string> fileParameter, string cellInstanceName, int? connectionCount, 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, connectionCount, cellInstanceConnectionName, fileConnectorConfiguration, equipmentTypeName, parameterizedModelObjectDefinitionType, modelObjectParameters, equipmentDictionaryName, dummyRuns, staticRuns, useCyclicalForDescription, isEAFHosted: connectionCount is null)
@@ -29,8 +30,8 @@ public class FileRead : Shared.FileRead, IFileRead
             throw new Exception(cellInstanceConnectionName);
         if (!_IsDuplicator)
             throw new Exception(cellInstanceConnectionName);
-        _JobIdParentDirectory = GetJobIdParentDirectory(_FileConnectorConfiguration.SourceFileLocation);
         _OpenInsightMetrologyViewerAPI = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerAPI");
+        _OpenInsightMetrologyViewerFileShare = GetPropertyValue(cellInstanceConnectionName, modelObjectParameters, "OpenInsight.MetrologyViewerFileShare");
     }
 
     void IFileRead.Move(Tuple<string, Test[], JsonElement[], List<FileInfo>> extractResults, Exception exception)
@@ -108,31 +109,41 @@ public class FileRead : Shared.FileRead, IFileRead
         return results;
     }
 
-#pragma warning disable IDE0060
+#nullable enable
-    private void PostOpenInsightMetrologyViewerAttachments(string reportFullPath, DateTime dateTime, List<Description> descriptions)
-#pragma warning restore IDE0060
-    {
-        string jobIdDirectory = Path.Combine(_JobIdParentDirectory, _Logistics.JobID);
-        if (!Directory.Exists(jobIdDirectory))
-            _ = Directory.CreateDirectory(jobIdDirectory);
 
-        _ = GetInProcessDirectory(jobIdDirectory);
+    private string? GetHeaderIdDirectory(long headerId)
-        if (!_StaticRuns.ContainsKey(_Logistics.Sequence))
+    {
-            _ = string.Empty;
+        string? result = null;
-        else
+        int weekNum;
+        string year;
+        string weekDirectory;
+        string checkDirectory;
+        DateTime[] dateTimes = new DateTime[] { _Logistics.DateTimeFromSequence, _Logistics.DateTimeFromSequence.AddDays(-6.66) };
+        foreach (DateTime dateTime in dateTimes)
         {
-            if (_StaticRuns[_Logistics.Sequence].Count != 1)
+            year = dateTime.Year.ToString();
-                throw new Exception($"{nameof(_StaticRuns)} has too many values for {_Logistics.Sequence}!");
+            weekNum = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
-            _ = _StaticRuns[_Logistics.Sequence][0];
+            weekDirectory = Path.Combine(_OpenInsightMetrologyViewerFileShare, dateTime.Year.ToString(), $"WW{weekNum:00}");
-            lock (_StaticRuns)
+            if (!Directory.Exists(weekDirectory))
-                _ = _StaticRuns.Remove(_Logistics.Sequence);
+                _ = Directory.CreateDirectory(weekDirectory);
+            checkDirectory = Path.Combine(weekDirectory, $"-{headerId}");
+            if (!Directory.Exists(checkDirectory))
+                continue;
+            result = checkDirectory;
+            break;
         }
-        if (_OpenInsightMetrologyViewerAPI is null)
+        return result;
-        { }
-        // OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, dateTime, json, descriptions, matchDirectories[0]);
     }
 
+#pragma warning disable IDE0060
+    private static void PostOpenInsightMetrologyViewerAttachments(List<Description> descriptions)
+#pragma warning restore IDE0060
+    {
+    }
+
+#pragma warning disable IDE0060
     private Tuple<string, Test[], JsonElement[], List<FileInfo>> GetExtractResult(string reportFullPath, DateTime dateTime)
+#pragma warning restore IDE0060
     {
         Tuple<string, Test[], JsonElement[], List<FileInfo>> results;
         Tuple<string, string[], string[]> pdsf = ProcessDataStandardFormat.GetLogisticsColumnsAndBody(reportFullPath);
@@ -142,7 +153,7 @@ public class FileRead : Shared.FileRead, IFileRead
         List<Description> descriptions = json.ProcessData.GetDescriptions(jsonElements);
         Test[] tests = (from l in descriptions select (Test)l.Test).ToArray();
         if (_IsEAFHosted && _FileConnectorConfiguration.FileScanningIntervalInSeconds > 0)
-            PostOpenInsightMetrologyViewerAttachments(reportFullPath, dateTime, descriptions);
+            PostOpenInsightMetrologyViewerAttachments(descriptions);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/Shared/Metrology/WS.Attachment.cs

@@ -2,18 +2,27 @@
 
 public partial class WS
 {
+
     public class Attachment
     {
 
+        public string SubGroupId { get; set; }
+        public long HeaderId { get; set; }
+        public string HeaderIdDirectory { get; set; }
         public string UniqueId { get; set; }
         public string DestinationFileName { get; set; }
         public string SourceFileName { get; set; }
+        public string AttachmentId { get; set; }
 
-        public Attachment(string uniqueId, string destinationFileName, string sourceFileName)
+        public Attachment(string subGroupId, long headerId, string headerIdDirectory, string uniqueId, string destinationFileName, string sourceFileName)
         {
+            SubGroupId = subGroupId;
+            HeaderId = headerId;
+            HeaderIdDirectory = headerIdDirectory;
             UniqueId = uniqueId;
             DestinationFileName = destinationFileName;
             SourceFileName = sourceFileName;
+            AttachmentId = System.Guid.NewGuid().ToString();
         }
 
     }

Adaptation/Shared/Metrology/WS.cs

@@ -10,7 +10,7 @@ namespace Adaptation.Shared.Metrology;
 public partial class WS
 {
 
-    public static (string, Results) SendData(string url, object payload, int timeoutSeconds = 120)
+    public static (string, Results) SendData(string url, long sequence, string directory, object payload, int timeoutSeconds = 120)
     {
         Results results = new();
         string resultsJson = string.Empty;
@@ -31,6 +31,10 @@ public partial class WS
                 HttpResponseMessage httpResponseMessage = httpClient.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).Result;
                 resultsJson = httpResponseMessage.Content.ReadAsStringAsync().Result;
                 results = JsonSerializer.Deserialize<Results>(resultsJson, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+                string checkDirectory = Path.Combine(directory, $"-{results.HeaderID}");
+                if (!Directory.Exists(checkDirectory))
+                    _ = Directory.CreateDirectory(checkDirectory);
+                File.WriteAllText(Path.Combine(checkDirectory, $"{sequence}.json"), json);
             }
             if (!results.Success)
                 results.Errors.Add(results.ToString());
@@ -45,63 +49,60 @@ 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);
     }
 
-    // this method is a wrapper for attaching a file to either a header or data record
+    public static void AttachFile(string url, Attachment attachment, int timeoutSeconds = 60)
-    //   URL is the same URL used for SendData, ex: http://localhost/api/inbound/CDE
-    //   attachToHeaderId is the ID returned by SendData 
-    //   attachToDataUniqueId is the string unique ID for the data record, aka the Title of the Sharepoint list entry
-    //   fileContents is a byte array with the contents of the file
-    //   fileName is which attachment this is, image.pdf, data.pdf, data.txt, header.pdf, etc
-    //   timeoutSeconds is configured as the request timeout
-    // this method will either succeed or throw an exception
-    // also, this has been made synchronous
-    public static void AttachFile(string url, long attachToHeaderId, string attachToDataUniqueId, byte[] fileContents, string fileName, int timeoutSeconds = 60)
     {
         using HttpClient httpClient = new();
-        string requestUrl = url + "/attachment?headerid=" + attachToHeaderId.ToString();
+        string json = JsonSerializer.Serialize(attachment);
-        if (!string.IsNullOrWhiteSpace(attachToDataUniqueId))
-        {
-            requestUrl += "&datauniqueid=";
-            requestUrl += System.Net.WebUtility.UrlEncode(attachToDataUniqueId);
-        }
-        requestUrl += "&filename="; // this is just so the web server log shows the filename
-        requestUrl += System.Net.WebUtility.UrlEncode(fileName);
-
         httpClient.Timeout = new TimeSpan(0, 0, 0, timeoutSeconds, 0);
-
+        StringContent httpContent = new(json, Encoding.UTF8, "application/json");
-        MultipartFormDataContent multipartFormDataContent = new();
+        HttpResponseMessage httpResponseMessage = httpClient.PostAsync($"{url}/attachment", httpContent).Result;
-        ByteArrayContent byteArrayContent = new(fileContents);
+        if (!httpResponseMessage.IsSuccessStatusCode)
-        byteArrayContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/octet-stream");
+        {
-
+            string resultBody = httpResponseMessage.Content.ReadAsStringAsync().Result;
-        multipartFormDataContent.Add(byteArrayContent, "attachment", fileName);
+            throw new Exception($"Attachment failed: {resultBody}");
-
+        }
-        HttpResponseMessage httpResponseMessage = httpClient.PostAsync(requestUrl, multipartFormDataContent).Result;
-
-        if (httpResponseMessage.IsSuccessStatusCode)
-            return;
-
-        string resultBody = httpResponseMessage.Content.ReadAsStringAsync().Result;
-
-        throw new Exception("Attachment failed: " + resultBody);
     }
 
-    public static void AttachFiles(string url, long headerID, List<Attachment> headerAttachments = null, List<Attachment> dataAttachments = null)
+    public static void AttachFiles(string url, List<Attachment> headerAttachments = null, List<Attachment> dataAttachments = null)
     {
+        string directory;
         try
         {
             if (headerAttachments is not null)
             {
                 foreach (Attachment attachment in headerAttachments)
-                    AttachFile(url, headerID, "", File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName);
+                {
+                    directory = Path.Combine(Path.GetDirectoryName(attachment.HeaderIdDirectory), attachment.AttachmentId) ?? throw new Exception();
+                    if (!Directory.Exists(directory))
+                        _ = Directory.CreateDirectory(directory);
+                    File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.DestinationFileName), overwrite: true);
+                }
             }
             if (dataAttachments is not null)
             {
                 foreach (Attachment attachment in dataAttachments)
-                    AttachFile(url, headerID, attachment.UniqueId, File.ReadAllBytes(attachment.SourceFileName), attachment.DestinationFileName);
+                {
+                    directory = Path.Combine(Path.GetDirectoryName(attachment.HeaderIdDirectory.Replace("Header", "Data")), attachment.AttachmentId) ?? throw new Exception();
+                    if (!Directory.Exists(directory))
+                        _ = Directory.CreateDirectory(directory);
+                    File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.DestinationFileName), overwrite: true);
+                }
+            }
+            if (headerAttachments is not null)
+            {
+                foreach (Attachment attachment in headerAttachments)
+                    AttachFile(url, attachment);
+            }
+            if (dataAttachments is not null)
+            {
+                foreach (Attachment attachment in dataAttachments)
+                    AttachFile(url, attachment);
             }
             //MessageBox.Show(r.ToString());
         }

MESAFIBACKLOG.csproj

@@ -48,6 +48,12 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFrameworkVersion)' == 'v4.8' ">
+    <DefineConstants>NETFRAMEWORK;NET20;NET35;NET40;NET45;NET451;NET452;NET46;NET461;NET462;NET47;NET471;NET472;NET48;$(DefineConstants)</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <RuntimeHostConfigurationOption Include="AssemblyName" Value="MESAFIBACKLOG" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -183,7 +189,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Infineon.EAF.Runtime">
-      <Version>2.52.0</Version>
+      <Version>2.56.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.TeamFoundationServer.Client">
       <Version>16.205.1</Version>