Bump

Adaptation/.vscode/tasks.json

@@ -76,12 +76,6 @@
             ],
             "problemMatcher": "$msCompile"
         },
-        {
-            "label": "File-Folder-Helper AOT s M .Kanbn Tasks",
-            "type": "shell",
-            "command": "L:/DevOps/Mesa_FI/File-Folder-Helper/bin/Release/net8.0/win-x64/publish/File-Folder-Helper.exe s M T:/MET08RESIMAPCDE/06_SourceCode/MET08RESIMAPCDE/Adaptation -s T:/MET08RESIMAPCDE/06_SourceCode/MET08RESIMAPCDE/Adaptation/.kanbn/tasks",
-            "problemMatcher": []
-        },
         {
             "label": "Kanbn Console",
             "type": "npm",

Adaptation/FileHandlers/OpenInsightMetrologyViewer/WSRequest.cs

@@ -102,13 +102,13 @@ public class WSRequest
         FilePath = onlyWSRequest;
     }
 
-    internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, DateTime dateTime, int weekOfYear, string json, List<txt.Description> descriptions)
+    internal static long GetHeaderId(IFileRead fileRead, Logistics logistics, string openInsightMetrologyViewerAPI, string openInsightMetrologyViewerFileShare, int weekOfYear, string json, List<txt.Description> descriptions)
     {
         long result;
         if (string.IsNullOrEmpty(json))
         {
             WSRequest wsRequest = new(fileRead, logistics, descriptions);
-            string directory = Path.Combine(openInsightMetrologyViewerAPI, dateTime.Year.ToString(), $"WW{weekOfYear:00}");
+            string directory = Path.Combine(openInsightMetrologyViewerFileShare, logistics.DateTimeFromSequence.Year.ToString(), $"WW{weekOfYear:00}");
             (json, WS.Results wsResults) = WS.SendData(openInsightMetrologyViewerAPI, logistics.Sequence, directory, wsRequest);
             if (!wsResults.Success)
                 throw new Exception(wsResults.ToString());

Adaptation/FileHandlers/OpenInsightMetrologyViewerAttachments/FileRead.cs

@@ -111,13 +111,14 @@ public class FileRead : Shared.FileRead, IFileRead
 
 #nullable enable
 
-    private string? GetHeaderIdDirectory(DateTime[] dateTimes, long headerId)
+    private string? GetHeaderIdDirectory(long headerId)
     {
         string? result = null;
         int weekNum;
         string year;
         string weekDirectory;
         string checkDirectory;
+        DateTime[] dateTimes = new DateTime[] { _Logistics.DateTimeFromSequence, _Logistics.DateTimeFromSequence.AddDays(-6.66) };
         foreach (DateTime dateTime in dateTimes)
         {
             year = dateTime.Year.ToString();
@@ -134,7 +135,7 @@ public class FileRead : Shared.FileRead, IFileRead
         return result;
     }
 
-    private void PostOpenInsightMetrologyViewerAttachments(DateTime dateTime, List<txt.Description> descriptions)
+    private void PostOpenInsightMetrologyViewerAttachments(List<txt.Description> descriptions)
     {
         string? json;
         string? subGroupId;
@@ -154,16 +155,17 @@ public class FileRead : Shared.FileRead, IFileRead
             lock (_StaticRuns)
                 _ = _StaticRuns.Remove(_Logistics.Sequence);
         }
-        DateTime[] dateTimes = new DateTime[] { dateTime, dateTime.AddDays(-6.66) };
+        int weekOfYear = _Calendar.GetWeekOfYear(_Logistics.DateTimeFromSequence, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
-        int weekOfYear = _Calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday);
+        long headerId = !_IsEAFHosted ? -1 : OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, _OpenInsightMetrologyViewerFileShare, weekOfYear, json, descriptions);
-        long headerId = OpenInsightMetrologyViewer.WSRequest.GetHeaderId(this, _Logistics, _OpenInsightMetrologyViewerAPI, dateTime, weekOfYear, json, descriptions);
+        string? headerIdDirectory = GetHeaderIdDirectory(headerId);
-        string? headerIdDirectory = GetHeaderIdDirectory(dateTimes, headerId);
         if (string.IsNullOrEmpty(headerIdDirectory))
             throw new Exception($"Didn't find header id directory <{headerId}>");
         OpenInsightMetrologyViewer.WSRequest.PostOpenInsightMetrologyViewerAttachments(this, _Logistics, _OpenInsightMetrologyViewerAPI, descriptions, matchDirectories[0], subGroupId, headerId, headerIdDirectory);
     }
 
+#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);
@@ -173,7 +175,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)
-            PostOpenInsightMetrologyViewerAttachments(dateTime, descriptions);
+            PostOpenInsightMetrologyViewerAttachments(descriptions);
         results = new Tuple<string, Test[], JsonElement[], List<FileInfo>>(pdsf.Item1, tests, jsonElements, new List<FileInfo>());
         return results;
     }

Adaptation/MET08RESIMAPCDE.Tests.csproj

@@ -45,27 +45,27 @@
         <PackageReference Include="IKVM.OpenJDK.XML.API" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="IKVM.Runtime" Version="7.2.4630.5"><NoWarn>NU1701</NoWarn></PackageReference>
         <PackageReference Include="Instances" Version="3.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
         <PackageReference Include="Microsoft.Extensions.Configuration.json" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
         <PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />
         <PackageReference Include="Pdfbox" Version="1.1.1"><NoWarn>NU1701</NoWarn></PackageReference>
-        <PackageReference Include="RoboSharp" Version="1.5.1" />
+        <PackageReference Include="RoboSharp" Version="1.5.3" />
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
         <PackageReference Include="System.Data.OleDb" Version="8.0.0" />
         <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
-        <PackageReference Include="System.Drawing.Common" Version="8.0.5" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.7" />
-        <PackageReference Include="System.Text.Json" Version="8.0.3" />
+        <PackageReference Include="System.Text.Json" Version="8.0.4" />
         <PackageReference Include="Tesseract" Version="5.2.0" />
     </ItemGroup>
     <ItemGroup>

Adaptation/Shared/Metrology/WS.cs

@@ -78,20 +78,32 @@ public partial class WS
             {
                 foreach (Attachment attachment in headerAttachments)
                 {
-                    directory = Path.GetDirectoryName(attachment.HeaderIdDirectory) ?? throw new Exception();
+                    directory = Path.Combine(Path.GetDirectoryName(attachment.HeaderIdDirectory), attachment.AttachmentId) ?? throw new Exception();
-                    File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.AttachmentId, attachment.DestinationFileName), overwrite: true);
+                    if (!Directory.Exists(directory))
-                    AttachFile(url, attachment);
+                        _ = Directory.CreateDirectory(directory);
+                    File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.DestinationFileName), overwrite: true);
                 }
             }
             if (dataAttachments is not null)
             {
                 foreach (Attachment attachment in dataAttachments)
                 {
-                    directory = Path.GetDirectoryName(attachment.HeaderIdDirectory) ?? throw new Exception();
+                    directory = Path.Combine(Path.GetDirectoryName(attachment.HeaderIdDirectory.Replace("Header", "Data")), attachment.AttachmentId) ?? throw new Exception();
-                    File.Copy(attachment.SourceFileName, Path.Combine(directory, attachment.AttachmentId, attachment.DestinationFileName), overwrite: true);
+                    if (!Directory.Exists(directory))
-                    AttachFile(url, attachment);
+                        _ = 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());
         }
         catch (Exception e)

Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.52.0.0")]
+[assembly: AssemblyVersion("2.56.0.0")]
-[assembly: AssemblyFileVersion("2.52.0.0")]
+[assembly: AssemblyFileVersion("2.56.0.0")]