From 4c2bef71ec2a7222120a90d6649dcf0d41c50e54 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Thu, 19 Sep 2024 10:13:10 -0700 Subject: [PATCH] Characterization Data FI Backlog with Ignore Tag --- .gitignore | 4 +- Server/Repositories/FileShareRepository.cs | 3 + Shared/Models/CharacterizationInfo.cs | 5 + Shared/Models/CharacterizationParameters.cs | 16 ++ .../Models/Stateless/IFileShareRepository.cs | 2 +- Static/AwaitingDispo/index.html | 1 + Static/Export/index.html | 1 + Static/Metrology/AwaitingDispo/index.html | 1 + Static/Metrology/Export/index.html | 1 + Static/Metrology/RunHeaders/index.html | 1 + Static/Metrology/RunInfo/index.html | 1 + Static/Metrology/index.html | 1 + Static/RunHeaders/index.html | 1 + Static/RunInfo/index.html | 1 + Static/awaiting-disposition.html | 1 + Static/export.html | 1 + Static/files.html | 1 + Static/index.html | 1 + Static/js/leo.js | 161 ++++++++++++++++++ Static/js/mes.js | 161 ++++++++++++++++++ Static/leo.html | 43 +++++ Static/mes.html | 43 +++++ Static/run-headers.html | 1 + Tests/OI.Metrology.Tests.csproj | 11 +- Tests/UnitTestFileShareController.cs | 43 ++++- Tests/UnitTestWaferCounterController.cs | 74 ++++++++ Wafer-Counter/.vscode/mklink.md | 5 + .../ApiControllers/FileShareController.cs | 39 +++++ .../Repositories/FileShareRepository.cs | 144 ++++++++++++++++ Wafer-Counter/Repositories/RegexHelper.cs | 11 ++ .../Repositories/WaferCounterRepository.cs | 20 ++- 31 files changed, 783 insertions(+), 16 deletions(-) create mode 100644 Shared/Models/CharacterizationInfo.cs create mode 100644 Shared/Models/CharacterizationParameters.cs create mode 100644 Static/js/leo.js create mode 100644 Static/js/mes.js create mode 100644 Static/leo.html create mode 100644 Static/mes.html create mode 100644 Tests/UnitTestWaferCounterController.cs create mode 100644 Wafer-Counter/.vscode/mklink.md create mode 100644 Wafer-Counter/Repositories/RegexHelper.cs diff --git a/.gitignore b/.gitignore index 88486e0..7b6966c 100644 --- a/.gitignore +++ b/.gitignore @@ -343,4 +343,6 @@ ASALocalRun/ /wwwroot/lib/* .kanbn -Tests/.kanbn \ No newline at end of file +Tests/.kanbn + +/Wafer-Counter/.vscode/.UserSecrets/secrets.json \ No newline at end of file diff --git a/Server/Repositories/FileShareRepository.cs b/Server/Repositories/FileShareRepository.cs index 6795145..cd3bcf5 100644 --- a/Server/Repositories/FileShareRepository.cs +++ b/Server/Repositories/FileShareRepository.cs @@ -100,4 +100,7 @@ public class FileShareRepository : IFileShareRepository return results; } + List IFileShareRepository.GetArchiveData(CharacterizationParameters archiveParameters) => + throw new NotImplementedException(); + } \ No newline at end of file diff --git a/Shared/Models/CharacterizationInfo.cs b/Shared/Models/CharacterizationInfo.cs new file mode 100644 index 0000000..b0bedb4 --- /dev/null +++ b/Shared/Models/CharacterizationInfo.cs @@ -0,0 +1,5 @@ +namespace OI.Metrology.Shared.Models; + +public record CharacterizationInfo(string? Lot, + DateTime LastWriteTime, + string[] Lines); diff --git a/Shared/Models/CharacterizationParameters.cs b/Shared/Models/CharacterizationParameters.cs new file mode 100644 index 0000000..fa96fda --- /dev/null +++ b/Shared/Models/CharacterizationParameters.cs @@ -0,0 +1,16 @@ +using System.Text.Json.Serialization; + +namespace OI.Metrology.Shared.Models; + +public record CharacterizationParameters([property: JsonPropertyName("area")] string? Area, + [property: JsonPropertyName("equipment-id")] string? EquipmentId, + [property: JsonPropertyName("search-pattern")] string? SearchPattern, + [property: JsonPropertyName("start-time")] string? StartTime, + [property: JsonPropertyName("end-time")] string? EndTime, + [property: JsonPropertyName("wafer-size")] string? WaferSize); + +[JsonSourceGenerationOptions(WriteIndented = true)] +[JsonSerializable(typeof(CharacterizationParameters))] +public partial class CharacterizationParametersSourceGenerationContext : JsonSerializerContext +{ +} diff --git a/Shared/Models/Stateless/IFileShareRepository.cs b/Shared/Models/Stateless/IFileShareRepository.cs index 2bf20b0..b92546c 100644 --- a/Shared/Models/Stateless/IFileShareRepository.cs +++ b/Shared/Models/Stateless/IFileShareRepository.cs @@ -10,6 +10,6 @@ public interface IFileShareRepository HttpResponseMessage ReadFile(HttpClient httpClient, Uri uri); void CopyFile(HttpClient httpClient, string from, string to); void MoveFile(HttpClient httpClient, string from, string to); + List GetArchiveData(CharacterizationParameters characterizationParameters); List GetNginxFileSystemSortableCollection(HttpClient httpClient, Uri uri, string? endsWith); - } \ No newline at end of file diff --git a/Static/AwaitingDispo/index.html b/Static/AwaitingDispo/index.html index 537f1b8..20aa3ba 100644 --- a/Static/AwaitingDispo/index.html +++ b/Static/AwaitingDispo/index.html @@ -50,6 +50,7 @@
  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/Export/index.html b/Static/Export/index.html index 537f1b8..20aa3ba 100644 --- a/Static/Export/index.html +++ b/Static/Export/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/Metrology/AwaitingDispo/index.html b/Static/Metrology/AwaitingDispo/index.html index 537f1b8..20aa3ba 100644 --- a/Static/Metrology/AwaitingDispo/index.html +++ b/Static/Metrology/AwaitingDispo/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/Metrology/Export/index.html b/Static/Metrology/Export/index.html index 537f1b8..20aa3ba 100644 --- a/Static/Metrology/Export/index.html +++ b/Static/Metrology/Export/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/Metrology/RunHeaders/index.html b/Static/Metrology/RunHeaders/index.html index 537f1b8..20aa3ba 100644 --- a/Static/Metrology/RunHeaders/index.html +++ b/Static/Metrology/RunHeaders/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/Metrology/RunInfo/index.html b/Static/Metrology/RunInfo/index.html index 537f1b8..20aa3ba 100644 --- a/Static/Metrology/RunInfo/index.html +++ b/Static/Metrology/RunInfo/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/Metrology/index.html b/Static/Metrology/index.html index 537f1b8..20aa3ba 100644 --- a/Static/Metrology/index.html +++ b/Static/Metrology/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/RunHeaders/index.html b/Static/RunHeaders/index.html index 537f1b8..20aa3ba 100644 --- a/Static/RunHeaders/index.html +++ b/Static/RunHeaders/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/RunInfo/index.html b/Static/RunInfo/index.html index 537f1b8..20aa3ba 100644 --- a/Static/RunInfo/index.html +++ b/Static/RunInfo/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/awaiting-disposition.html b/Static/awaiting-disposition.html index c6fe0a0..27049d8 100644 --- a/Static/awaiting-disposition.html +++ b/Static/awaiting-disposition.html @@ -49,6 +49,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/export.html b/Static/export.html index cbf7cd9..8cca0f6 100644 --- a/Static/export.html +++ b/Static/export.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/files.html b/Static/files.html index cfa89e1..68bfeb1 100644 --- a/Static/files.html +++ b/Static/files.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/index.html b/Static/index.html index 537f1b8..20aa3ba 100644 --- a/Static/index.html +++ b/Static/index.html @@ -50,6 +50,7 @@

  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Static/js/leo.js b/Static/js/leo.js new file mode 100644 index 0000000..ca62889 --- /dev/null +++ b/Static/js/leo.js @@ -0,0 +1,161 @@ +function compareFunction(a, b) { + return a.Priority[0] - b.Priority[0] || a.TimeCriticality[0] - b.TimeCriticality[0] || b.State[0] - a.State[0] || a.Id - b.Id; +} + +function showOne(rowData) { + if (rowData == null) + return; + var data = []; + data.push({ name: "ADO Edit", value: '' + rowData["Id"] + '' }); + for (const property in rowData) { + if (rowData[property] == null) + continue; + data.push({ name: property, value: rowData[property].toString() }); + } + $("#AllGrid").igGrid({ + autoGenerateColumns: true, + dataSource: data, + width: "100%", + showHeader: false, + }); +} + +function loadOne() { + var selectedRow = $("#HeaderGrid").data("igGridSelection").selectedRow(); + if (selectedRow == null) + return; + var rowData = $("#HeaderGrid").data("igGrid").dataSource.dataView()[selectedRow.index]; + showOne(rowData); +} + +function detailSelectionChangedRunInfo(evt, ui) { + if (ui.row.index === 0) + return; + var rowData = ui.owner.grid.dataSource.dataView()[ui.row.index]; + showOne(rowData); +} + +function getState(state) { + var result; + if (state == null) + result = "9-Null"; + else if (state === "New") + result = `1-${state}`; + else if (state === "Active") + result = `2-${state}`; + else if (state === "Resolved") + result = `3-${state}`; + else if (state === "Closed") + result = `4-${state}`; + else if (state === "Removed") + result = `5-${state}`; + else + result = `8-${state}`; + return result; +} + +function getPriority(workItemType, priority) { + var result; + if (workItemType === "Bug") + result = "0-Bug"; + else if (priority == null || priority === 0) + result = "9-Null"; + else if (priority === 1) + result = `${priority}-High`; + else if (priority === 2) + result = `${priority}-Med`; + else if (priority === 3) + result = `${priority}-Low`; + else if (priority === 4) + result = `${priority}-TBD`; + else + result = "8-Not"; + return result; +} + +function getTimeCriticality(workItemType, timeCriticality) { + var result; + if (workItemType === "Bug") + result = "0-Bug"; + else if (timeCriticality == null || timeCriticality === 0) + result = "9-Null"; + else if (timeCriticality === 1) + result = `${timeCriticality}-QSM`; + else if (timeCriticality === 2) + result = `${timeCriticality}-Qual`; + else if (timeCriticality === 3) + result = `${timeCriticality}-Eff`; + else + result = "8-Not"; + return result; +} + +function getWorkItems(data) { + var workItems = []; + var workItem; + for (var i = data.length - 1; i > -1; i--) { + workItem = data[i]; + if (workItem.AreaPath !== 'ART SPS\\LEO') + continue; + if (workItem.Tags != null && workItem.Tags.includes("Ignore")) + continue; + if (workItem.WorkItemType !== 'Feature' && workItem.WorkItemType !== 'Bug') + continue; + workItem["State"] = getState(workItem["State"]) + workItem["Priority"] = getPriority(workItem["WorkItemType"], workItem["Priority"]) + workItem["TimeCriticality"] = getTimeCriticality(workItem["WorkItemType"], workItem["TimeCriticality"]) + workItems.push(workItem); + } + workItems.sort(compareFunction); + return workItems; +} + +function initIndex(url) { + $.getJSON(url, { _: new Date().getTime() }, function (data) { + var workItems = getWorkItems(data); + console.log(data.length); + if (data.length > 0) + console.log(data[0]); + $("#HeaderGrid").igGrid({ + autoGenerateColumns: false, + dataSource: workItems, + height: "100%", + primaryKey: "Id", + width: "100%", + columns: [ + { key: "Id", dataType: "number" }, + { key: "Requester", dataType: "string" }, + { headerText: "Assigned To", key: "AssignedTo", dataType: "string" }, + { key: "Title", dataType: "string", width: "20%" }, + { headerText: "System(s)", key: "Tags", dataType: "string" }, + { key: "Priority", dataType: "string" }, + { headerText: "Qual/Eff", key: "TimeCriticality", dataType: "string" }, + { key: "State", dataType: "string" }, + { headerText: "Effort in Days", key: "Effort", dataType: "number" }, + { headerText: "UAT as of", key: "ResolvedDate", dataType: "date", format: "date" }, + { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" }, + { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" }, + { key: "AreaPath", dataType: "string", hidden: true }, + { key: "AssignedTo", dataType: "string", hidden: true }, + { key: "BusinessValue", dataType: "number", hidden: true }, + { key: "ChangedDate", dataType: "string", hidden: true }, + { key: "CommentCount", dataType: "number", hidden: true }, + { key: "CreatedDate", dataType: "string", hidden: true }, + { key: "Description", dataType: "string", hidden: true }, + { key: "IterationPath", dataType: "string", hidden: true }, + { key: "Revision", dataType: "number", hidden: true }, + { key: "RiskReductionMinusOpportunityEnablement", dataType: "string", hidden: true }, + { key: "StartDate", dataType: "string", hidden: true }, + { key: "WorkItemType", dataType: "string", hidden: true }, + { key: "WeightedShortestJobFirst", dataType: "number", hidden: true }, + ], + features: [ + { name: "Sorting", type: "local" }, + { name: "Filtering", type: "local" }, + { name: "Selection", mode: "row", multipleSelection: false, rowSelectionChanging: detailSelectionChangedRunInfo }, + { name: "Paging", type: "local", recordCountKey: "TotalRows", pageSize: 10, pageSizeUrlKey: "pageSize", "pageIndexUrlKey": "page", showPageSizeDropDown: true }, + ], + }); + }); + $("#HeaderGrid").on("dblclick", "tr", loadOne); +} \ No newline at end of file diff --git a/Static/js/mes.js b/Static/js/mes.js new file mode 100644 index 0000000..5395107 --- /dev/null +++ b/Static/js/mes.js @@ -0,0 +1,161 @@ +function compareFunction(a, b) { + return a.Priority[0] - b.Priority[0] || a.TimeCriticality[0] - b.TimeCriticality[0] || b.State[0] - a.State[0] || a.Id - b.Id; +} + +function showOne(rowData) { + if (rowData == null) + return; + var data = []; + data.push({ name: "Edit in ADO", value: 'Edit in ADO ' + rowData["Id"] + '' }); + for (const property in rowData) { + if (rowData[property] == null) + continue; + data.push({ name: property, value: rowData[property].toString() }); + } + $("#AllGrid").igGrid({ + autoGenerateColumns: true, + dataSource: data, + width: "100%", + showHeader: false, + }); +} + +function loadOne() { + var selectedRow = $("#HeaderGrid").data("igGridSelection").selectedRow(); + if (selectedRow == null) + return; + var rowData = $("#HeaderGrid").data("igGrid").dataSource.dataView()[selectedRow.index]; + showOne(rowData); +} + +function detailSelectionChangedRunInfo(evt, ui) { + if (ui.row.index === 0) + return; + var rowData = ui.owner.grid.dataSource.dataView()[ui.row.index]; + showOne(rowData); +} + +function getState(state) { + var result; + if (state == null) + result = "9-Null"; + else if (state === "New") + result = `1-${state}`; + else if (state === "Active") + result = `2-${state}`; + else if (state === "Resolved") + result = `3-${state}`; + else if (state === "Closed") + result = `4-${state}`; + else if (state === "Removed") + result = `5-${state}`; + else + result = `8-${state}`; + return result; +} + +function getPriority(workItemType, priority) { + var result; + if (workItemType === "Bug") + result = "0-Bug"; + else if (priority == null || priority === 0) + result = "9-Null"; + else if (priority === 1) + result = `${priority}-High`; + else if (priority === 2) + result = `${priority}-Med`; + else if (priority === 3) + result = `${priority}-Low`; + else if (priority === 4) + result = `${priority}-TBD`; + else + result = "8-Not"; + return result; +} + +function getTimeCriticality(workItemType, timeCriticality) { + var result; + if (workItemType === "Bug") + result = "0-Bug"; + else if (timeCriticality == null || timeCriticality === 0) + result = "9-Null"; + else if (timeCriticality === 1) + result = `${timeCriticality}-QSM`; + else if (timeCriticality === 2) + result = `${timeCriticality}-Qual`; + else if (timeCriticality === 3) + result = `${timeCriticality}-Eff`; + else + result = "8-Not"; + return result; +} + +function getWorkItems(data) { + var workItems = []; + var workItem; + for (var i = data.length - 1; i > -1; i--) { + workItem = data[i]; + if (workItem.AreaPath !== 'ART SPS\\MES') + continue; + if (workItem.Tags != null && workItem.Tags.includes("Ignore")) + continue; + if (workItem.WorkItemType !== 'Feature' && workItem.WorkItemType !== 'Bug') + continue; + workItem["State"] = getState(workItem["State"]) + workItem["Priority"] = getPriority(workItem["WorkItemType"], workItem["Priority"]) + workItem["TimeCriticality"] = getTimeCriticality(workItem["WorkItemType"], workItem["TimeCriticality"]) + workItems.push(workItem); + } + workItems.sort(compareFunction); + return workItems; +} + +function initIndex(url) { + $.getJSON(url, { _: new Date().getTime() }, function (data) { + var workItems = getWorkItems(data); + console.log(data.length); + if (data.length > 0) + console.log(data[0]); + $("#HeaderGrid").igGrid({ + autoGenerateColumns: false, + dataSource: workItems, + height: "100%", + primaryKey: "Id", + width: "100%", + columns: [ + { key: "Id", dataType: "number" }, + { key: "Requester", dataType: "string" }, + { headerText: "Assigned To", key: "AssignedTo", dataType: "string" }, + { key: "Title", dataType: "string", width: "20%" }, + { headerText: "System(s)", key: "Tags", dataType: "string" }, + { key: "Priority", dataType: "string" }, + { headerText: "Qual/Eff", key: "TimeCriticality", dataType: "string" }, + { key: "State", dataType: "string" }, + { headerText: "Effort in Days", key: "Effort", dataType: "number" }, + { headerText: "UAT as of", key: "ResolvedDate", dataType: "date", format: "date" }, + { headerText: "CMP Date", key: "ClosedDate", dataType: "date", format: "date" }, + { headerText: "Target", key: "TargetDate", dataType: "date", format: "date" }, + { key: "AreaPath", dataType: "string", hidden: true }, + { key: "AssignedTo", dataType: "string", hidden: true }, + { key: "BusinessValue", dataType: "number", hidden: true }, + { key: "ChangedDate", dataType: "string", hidden: true }, + { key: "CommentCount", dataType: "number", hidden: true }, + { key: "CreatedDate", dataType: "string", hidden: true }, + { key: "Description", dataType: "string", hidden: true }, + { key: "IterationPath", dataType: "string", hidden: true }, + { key: "Revision", dataType: "number", hidden: true }, + { key: "RiskReductionMinusOpportunityEnablement", dataType: "string", hidden: true }, + { key: "StartDate", dataType: "string", hidden: true }, + { key: "WorkItemType", dataType: "string", hidden: true }, + { key: "WeightedShortestJobFirst", dataType: "number", hidden: true }, + ], + features: [ + { name: "Sorting", type: "local" }, + { name: "Filtering", type: "local" }, + { name: "Selection", mode: "row", multipleSelection: false, rowSelectionChanging: detailSelectionChangedRunInfo }, + { name: "Paging", type: "local", recordCountKey: "TotalRows", pageSize: 10, pageSizeUrlKey: "pageSize", "pageIndexUrlKey": "page", showPageSizeDropDown: true }, + ], + }); + }); + $("#HeaderGrid").on("dblclick", "tr", loadOne); +} \ No newline at end of file diff --git a/Static/leo.html b/Static/leo.html new file mode 100644 index 0000000..f5ccc2e --- /dev/null +++ b/Static/leo.html @@ -0,0 +1,43 @@ + + + + + + + FI Backlog HiRel (Leominster) + + + + + + + + + + +

    + Feature(s) +
    + +

    FI Backlog HiRel (Leominster)

    + +
    +
    +
    + +
      + +
    +
    +
    + + + + + diff --git a/Static/mes.html b/Static/mes.html new file mode 100644 index 0000000..db44d7b --- /dev/null +++ b/Static/mes.html @@ -0,0 +1,43 @@ + + + + + + + FI Backlog Mesa + + + + + + + + + + +
    + Feature(s) +
    + +

    FI Backlog Mesa

    + +
    +
    +
    + +
      + +
    +
    +
    + + + + + diff --git a/Static/run-headers.html b/Static/run-headers.html index d193831..4f67a76 100644 --- a/Static/run-headers.html +++ b/Static/run-headers.html @@ -50,6 +50,7 @@
  • Export
  • Archive
  • OI Web Services
    • +
  • FI Backlog

    •   diff --git a/Tests/OI.Metrology.Tests.csproj b/Tests/OI.Metrology.Tests.csproj index c51b4be..800d62a 100644 --- a/Tests/OI.Metrology.Tests.csproj +++ b/Tests/OI.Metrology.Tests.csproj @@ -26,19 +26,20 @@ Linux - + - - - - + + + + + diff --git a/Tests/UnitTestFileShareController.cs b/Tests/UnitTestFileShareController.cs index 7cfa2ff..5a758f4 100644 --- a/Tests/UnitTestFileShareController.cs +++ b/Tests/UnitTestFileShareController.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc.Testing; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using OI.Metrology.Shared.Models; using OI.Metrology.Shared.Models.Stateless; namespace OI.Metrology.Tests; @@ -14,7 +15,7 @@ public class UnitTestFileShareController private static ILogger? _Logger; private static string _ControllerName; private static TestContext _TestContext; - private static WebApplicationFactory? _WebApplicationFactory; + private static WebApplicationFactory? _WebApplicationFactory; #pragma warning restore @@ -22,10 +23,11 @@ public class UnitTestFileShareController public static void ClassInitAsync(TestContext testContext) { _TestContext = testContext; - _WebApplicationFactory = new WebApplicationFactory(); + _WebApplicationFactory = new WebApplicationFactory(); IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; - _Logger = serviceProvider.GetRequiredService>(); - _ControllerName = nameof(Server.ApiControllers.FileShareController)[..^10]; + _Logger = serviceProvider.GetRequiredService>(); + // _ControllerName = nameof(Server.ApiControllers.FileShareController)[..^10]; + _ControllerName = nameof(Wafer.Counter.ApiControllers.FileShareController)[..^10]; } private static void NonThrowTryCatch() @@ -82,4 +84,37 @@ public class UnitTestFileShareController NonThrowTryCatch(); } + [TestMethod] + public void GetArchiveData() + { + _Logger?.LogInformation("Starting Web Application"); + List? result; + CharacterizationParameters characterizationParameters; + IServiceProvider? serviceProvider = _WebApplicationFactory?.Services.CreateScope().ServiceProvider; + IFileShareRepository? fileShareRepository = serviceProvider?.GetRequiredService(); + characterizationParameters = new("FQA", "FQA-8INCH", "*.wc", null, null, "8INCH"); + result = fileShareRepository?.GetArchiveData(characterizationParameters); + Assert.IsNotNull(result); + characterizationParameters = new(string.Empty, "BIORAD4", "BIO*.json", null, null, "8INCH"); + result = fileShareRepository?.GetArchiveData(characterizationParameters); + Assert.IsNotNull(result); + characterizationParameters = new(string.Empty, "CDE5", "CDE*.json", null, null, "8INCH"); + result = fileShareRepository?.GetArchiveData(characterizationParameters); + Assert.IsNotNull(result); + _Logger?.LogInformation("{TestName} completed", _TestContext?.TestName); + NonThrowTryCatch(); + } + + [TestMethod] + public async Task ArchiveDataApi() + { + HttpClient? httpClient = _WebApplicationFactory?.CreateClient(); + _Logger?.LogInformation("Starting Web Application"); + Assert.IsTrue(httpClient is not null); + string? response = await httpClient.GetStringAsync($"api/v1/file-share/archive-data/?area=FQA&equipment-id=FQA-8INCH&search-pattern=*.wc&wafer-size=8INCH"); + Assert.IsNotNull(response); + _Logger?.LogInformation("{TestName} completed", _TestContext?.TestName); + NonThrowTryCatch(); + } + } \ No newline at end of file diff --git a/Tests/UnitTestWaferCounterController.cs b/Tests/UnitTestWaferCounterController.cs new file mode 100644 index 0000000..936e601 --- /dev/null +++ b/Tests/UnitTestWaferCounterController.cs @@ -0,0 +1,74 @@ +using Microsoft.AspNetCore.Mvc.Testing; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using OI.Metrology.Shared.DataModels; +using OI.Metrology.Shared.Models.Stateless; + +namespace OI.Metrology.Tests; + +[TestClass] +public class UnitTestWaferCounterController +{ + +#pragma warning disable CS8618 + + private static ILogger? _Logger; + private static string _ControllerName; + private static TestContext _TestContext; + private static WebApplicationFactory? _WebApplicationFactory; + +#pragma warning restore + + [ClassInitialize] + public static void ClassInitAsync(TestContext testContext) + { + _TestContext = testContext; + _WebApplicationFactory = new WebApplicationFactory(); + IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; + _Logger = serviceProvider.GetRequiredService>(); + _ControllerName = nameof(Wafer.Counter.ApiControllers.WaferCounterController)[..^10]; + } + + private static void NonThrowTryCatch() + { + try + { throw new Exception(); } + catch (Exception) { } + } + + [TestMethod] + public void TestControllerName() + { + _Logger?.LogInformation("Starting Web Application"); + Assert.AreEqual(IFileShareController.GetRouteName(), _ControllerName); + _Logger?.LogInformation("{TestName} completed", _TestContext?.TestName); + NonThrowTryCatch(); + } + + [Ignore] + [TestMethod] + public void GetLastQuantityAndSlotMap() + { + _Logger?.LogInformation("Starting Web Application"); + IServiceProvider? serviceProvider = _WebApplicationFactory?.Services.CreateScope().ServiceProvider; + IWaferCounterRepository? waferCounterRepository = serviceProvider?.GetRequiredService(); + WaferCounter? result = waferCounterRepository?.GetLastQuantityAndSlotMap(area: "FQA", waferSize: "8INCH", text: "Test"); + Assert.IsNotNull(result); + _Logger?.LogInformation("{TestName} completed", _TestContext?.TestName); + NonThrowTryCatch(); + } + + [Ignore] + [TestMethod] + public async Task LastQuantityAndSlotMapApi() + { + HttpClient? httpClient = _WebApplicationFactory?.CreateClient(); + _Logger?.LogInformation("Starting Web Application"); + Assert.IsTrue(httpClient is not null); + string? response = await httpClient.GetStringAsync($"api/v1/{_ControllerName}/FQA/last-quantity-and-slot-map/?waferSize=8INCH&text=Test"); + Assert.IsNotNull(response); + _Logger?.LogInformation("{TestName} completed", _TestContext?.TestName); + NonThrowTryCatch(); + } + +} \ No newline at end of file diff --git a/Wafer-Counter/.vscode/mklink.md b/Wafer-Counter/.vscode/mklink.md new file mode 100644 index 0000000..480a153 --- /dev/null +++ b/Wafer-Counter/.vscode/mklink.md @@ -0,0 +1,5 @@ +# mklink + +```bash Thu Aug 29 2024 09:47:22 GMT-0700 (Mountain Standard Time) +mklink /J "L:\DevOps\Mesa_FI\OI-Metrology\Wafer-Counter\.vscode\.UserSecrets" "C:\Users\phares\AppData\Roaming\Microsoft\UserSecrets\2a0acd34-8f61-47a3-8818-73fa8fe04902" +``` diff --git a/Wafer-Counter/ApiControllers/FileShareController.cs b/Wafer-Counter/ApiControllers/FileShareController.cs index 2b299c8..e16c2cf 100644 --- a/Wafer-Counter/ApiControllers/FileShareController.cs +++ b/Wafer-Counter/ApiControllers/FileShareController.cs @@ -1,5 +1,9 @@ using Microsoft.AspNetCore.Mvc; +using OI.Metrology.Shared.Models; using OI.Metrology.Shared.Models.Stateless; +using System.Collections.Specialized; +using System.Text.Json; +using System.Web; namespace OI.Metrology.Wafer.Counter.ApiControllers; @@ -33,4 +37,39 @@ public class FileShareController : Controller, IFileShareController return Results.Ok(); } + private static Dictionary GetKeyValuePairs(QueryString queryString) + { + Dictionary results = []; + if (queryString.HasValue) + { + NameValueCollection nameValueCollection = HttpUtility.ParseQueryString(queryString.Value); + foreach (string? key in nameValueCollection.AllKeys) + { + if (key is null) + continue; + results.Add(key, nameValueCollection[key]); + } + } + return results; + } + + private static CharacterizationParameters? GetCharacterizationParameters(QueryString queryString) + { + CharacterizationParameters? result; + Dictionary keyValuePairs = GetKeyValuePairs(queryString); + string json = JsonSerializer.Serialize(keyValuePairs); + result = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, CharacterizationParametersSourceGenerationContext.Default.CharacterizationParameters); + return result; + } + + [HttpGet("archive-data")] + public IActionResult ArchiveData() + { + List results; + CharacterizationParameters? characterizationParameters = GetCharacterizationParameters(Request.QueryString); + ArgumentNullException.ThrowIfNull(characterizationParameters); + results = _FileShareRepository.GetArchiveData(characterizationParameters); + return Json(results); + } + } \ No newline at end of file diff --git a/Wafer-Counter/Repositories/FileShareRepository.cs b/Wafer-Counter/Repositories/FileShareRepository.cs index 1fc78ff..9972634 100644 --- a/Wafer-Counter/Repositories/FileShareRepository.cs +++ b/Wafer-Counter/Repositories/FileShareRepository.cs @@ -1,5 +1,8 @@ using OI.Metrology.Shared.Models; using OI.Metrology.Shared.Models.Stateless; +using OI.Metrology.Wafer.Counter.Models; +using System.Collections.ObjectModel; +using System.Globalization; using System.Text.Json; namespace OI.Metrology.Wafer.Counter.Repository; @@ -7,6 +10,11 @@ namespace OI.Metrology.Wafer.Counter.Repository; public class FileShareRepository : IFileShareRepository { + private readonly AppSettings _AppSettings; + + public FileShareRepository(AppSettings appSettings) => + _AppSettings = appSettings; + Uri IFileShareRepository.Append(Uri uri, params string[] paths) => new(paths.Aggregate(uri.AbsoluteUri, (current, path) => string.Format("{0}/{1}", current.TrimEnd('/'), path.TrimStart('/')))); @@ -96,4 +104,140 @@ public class FileShareRepository : IFileShareRepository return results; } + private static ReadOnlyCollection GetValidDirectories(string equipmentDirectory, DateTime startDateTime, DateTime endDateTime) + { + List results = [equipmentDirectory]; + DateTime dateTime; + string weekOfYear; + Calendar calendar = new CultureInfo("en-US").Calendar; + for (int i = 0; i < int.MaxValue; i++) + { + dateTime = startDateTime.AddDays(i); + if (dateTime > endDateTime) + break; + weekOfYear = $"{dateTime:yyyy}_Week_{calendar.GetWeekOfYear(dateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday):00}"; + results.Add(Path.Combine(equipmentDirectory, weekOfYear, dateTime.ToString("yyyy-MM-dd"))); + } + return new(results); + } + + private static ReadOnlyCollection GetCollection(CharacterizationParameters characterizationParameters, string searchPattern, DateTime startDateTime, DateTime endDateTime, ReadOnlyCollection validDirectories) + { + FileInfo[] results; + string[] directories; + List collection = []; + string startDateTimeTicks = startDateTime.Ticks.ToString(); + string delta = (endDateTime.Ticks - startDateTime.Ticks).ToString(); + string ticksSearchPattern = $"{startDateTime.Ticks.ToString()[..(startDateTimeTicks.Length - delta.Length + 1)]}*"; + foreach (string validDirectory in validDirectories) + { + if (string.IsNullOrEmpty(validDirectory) || !Directory.Exists(validDirectory)) + continue; + if (characterizationParameters.SearchPattern is null || searchPattern == characterizationParameters.SearchPattern) + collection.AddRange(Directory.GetFiles(validDirectory, searchPattern, SearchOption.AllDirectories).Select(l => new FileInfo(l))); + else + { + directories = Directory.GetDirectories(validDirectory, ticksSearchPattern, SearchOption.AllDirectories); + foreach (string directory in directories) + collection.AddRange(Directory.GetFiles(directory, searchPattern, SearchOption.TopDirectoryOnly).Select(l => new FileInfo(l))); + } + } + results = (from l in collection where l.LastWriteTime >= startDateTime && l.LastWriteTime <= endDateTime orderby l.LastWriteTime descending select l).ToArray(); + return new(results); + } + + private static ReadOnlyCollection GetDirectoryNames(string directory) + { + List results = new(); + string? fileName; + string? checkDirectory = directory; + string? pathRoot = Path.GetPathRoot(directory); + string extension = Path.GetExtension(directory); + if (string.IsNullOrEmpty(pathRoot)) + throw new NullReferenceException(nameof(pathRoot)); + if (Directory.Exists(directory)) + { + fileName = Path.GetFileName(directory); + if (!string.IsNullOrEmpty(fileName)) + results.Add(fileName); + } + else if ((string.IsNullOrEmpty(extension) || extension.Length > 3) && !File.Exists(directory)) + { + fileName = Path.GetFileName(directory); + if (!string.IsNullOrEmpty(fileName)) + results.Add(fileName); + } + for (int i = 0; i < int.MaxValue; i++) + { + checkDirectory = Path.GetDirectoryName(checkDirectory); + if (string.IsNullOrEmpty(checkDirectory) || checkDirectory == pathRoot) + break; + fileName = Path.GetFileName(checkDirectory); + if (string.IsNullOrEmpty(fileName)) + continue; + results.Add(fileName); + } + results.Add(pathRoot); + results.Reverse(); + return new(results); + } + + private static ReadOnlyCollection GetCharacterizationData(CharacterizationParameters characterizationParameters, string equipmentDirectory, string searchPattern) + { + List results = []; + string[] lines; + string? directoryName; + string? checkDirectory; + CharacterizationInfo archiveInfo; + ReadOnlyCollection directoryNames; + DateTime endDateTime = characterizationParameters.EndTime is null ? DateTime.Now : DateTime.Parse(characterizationParameters.EndTime).ToLocalTime(); + DateTime startDateTime = characterizationParameters.StartTime is null ? DateTime.Now.AddHours(-6) : DateTime.Parse(characterizationParameters.StartTime).ToLocalTime(); + ReadOnlyCollection validDirectories = GetValidDirectories(equipmentDirectory, startDateTime, endDateTime); + ReadOnlyCollection collection = GetCollection(characterizationParameters, searchPattern, startDateTime, endDateTime, validDirectories); + foreach (FileInfo fileInfo in collection) + { + if (string.IsNullOrEmpty(fileInfo.DirectoryName)) + continue; + checkDirectory = fileInfo.DirectoryName; + directoryName = Path.GetFileName(fileInfo.DirectoryName); + directoryNames = GetDirectoryNames(fileInfo.DirectoryName); + foreach (string _ in directoryNames) + { + if (string.IsNullOrEmpty(checkDirectory)) + continue; + if (validDirectories.Contains(checkDirectory)) + { + directoryName = Path.GetFileName(checkDirectory); + break; + } + } + lines = File.ReadAllLines(fileInfo.FullName); + archiveInfo = new(directoryName, fileInfo.LastWriteTime, lines); + results.Add(archiveInfo); + } + return new(results); + } + + List IFileShareRepository.GetArchiveData(CharacterizationParameters characterizationParameters) + { + List results = []; + string searchPattern; + string equipmentDirectory; + if (!string.IsNullOrEmpty(characterizationParameters.Area) && !string.IsNullOrEmpty(characterizationParameters.WaferSize)) + { + searchPattern = characterizationParameters.SearchPattern is null ? "*" : characterizationParameters.SearchPattern; + equipmentDirectory = Path.Combine(_AppSettings.EcCharacterizationSi, "WaferCounter", characterizationParameters.Area, characterizationParameters.WaferSize); + if (Directory.Exists(equipmentDirectory)) + results.AddRange(GetCharacterizationData(characterizationParameters, equipmentDirectory, searchPattern)); + } + if (!string.IsNullOrEmpty(characterizationParameters.EquipmentId)) + { + searchPattern = "*.json"; + equipmentDirectory = Path.Combine(_AppSettings.EcCharacterizationSi, "Archive", characterizationParameters.EquipmentId); + if (Directory.Exists(equipmentDirectory)) + results.AddRange(GetCharacterizationData(characterizationParameters, equipmentDirectory, searchPattern)); + } + return new(results); + } + } \ No newline at end of file diff --git a/Wafer-Counter/Repositories/RegexHelper.cs b/Wafer-Counter/Repositories/RegexHelper.cs new file mode 100644 index 0000000..2067a20 --- /dev/null +++ b/Wafer-Counter/Repositories/RegexHelper.cs @@ -0,0 +1,11 @@ +using System.Text.RegularExpressions; + +namespace OI.Metrology.Wafer.Counter.Repository; + +public partial class RegexHelper +{ + + [GeneratedRegex(@"[\\,\/,\:,\*,\?,\"",\<,\>,\|]")] + internal static partial Regex WindowsFileSystem(); + +} diff --git a/Wafer-Counter/Repositories/WaferCounterRepository.cs b/Wafer-Counter/Repositories/WaferCounterRepository.cs index 066360a..e358c13 100644 --- a/Wafer-Counter/Repositories/WaferCounterRepository.cs +++ b/Wafer-Counter/Repositories/WaferCounterRepository.cs @@ -3,6 +3,8 @@ using OI.Metrology.Shared.Models; using OI.Metrology.Shared.Models.Stateless; using OI.Metrology.Wafer.Counter.Models; using System.Globalization; +using System.Text.Json; +using System.Text.RegularExpressions; namespace OI.Metrology.Wafer.Counter.Repository; @@ -13,6 +15,7 @@ public class WaferCounterRepository : IWaferCounterRepository int Total, string? SlotMap); + private readonly Regex _Regex; private readonly string _MockRoot; private readonly string _RepositoryName; private readonly AppSettings _AppSettings; @@ -24,19 +27,25 @@ public class WaferCounterRepository : IWaferCounterRepository _AppSettings = appSettings; _MockRoot = appSettings.MockRoot; _HttpClientFactory = httpClientFactory; + _Regex = RegexHelper.WindowsFileSystem(); _FileShareRepository = fileShareRepository; _RepositoryName = nameof(WaferCounterRepository)[..^10]; } - private void MoveFile(string area, string waferSize, string text, string waferSizeDirectory, NginxFileSystemSortable nginxFileSystemSortable) + private void MoveFile(string area, string waferSize, string windowsFileSystemSafeText, string waferSizeDirectory, NginxFileSystemSortable nginxFileSystemSortable) { + string equipmentId = $"{area}-{waferSize}"; Calendar calendar = new CultureInfo("en-US").Calendar; string from = Path.Combine(waferSizeDirectory, nginxFileSystemSortable.Name); - string archive = Path.Combine(_AppSettings.EcCharacterizationSi, "Archive", $"{area}-{waferSize}"); + string archive = Path.Combine(_AppSettings.EcCharacterizationSi, "Archive", equipmentId); + HeaderCommon headerCommon = new() { RDS = windowsFileSystemSafeText, MesEntity = equipmentId }; string weekOfYear = $"{nginxFileSystemSortable.DateTime:yyyy}_Week_{calendar.GetWeekOfYear(nginxFileSystemSortable.DateTime, CalendarWeekRule.FirstDay, DayOfWeek.Sunday):00}"; - string to = Path.Combine(archive, weekOfYear, nginxFileSystemSortable.DateTime.ToString("yyyy-MM-dd"), nginxFileSystemSortable.Name); + string directory = Path.Combine(archive, weekOfYear, nginxFileSystemSortable.DateTime.ToString("yyyy-MM-dd"), windowsFileSystemSafeText); + string file = Path.Combine(directory, nginxFileSystemSortable.DateTime.Ticks.ToString(), $"{nginxFileSystemSortable.Name}.json"); + string json = JsonSerializer.Serialize(headerCommon, new JsonSerializerOptions() { WriteIndented = true }); + _FileShareRepository.FileWrite(file, json); + string to = Path.Combine(directory, nginxFileSystemSortable.Name); _FileShareRepository.MoveFile(from, to); - _FileShareRepository.FileWrite($"{to}.txt", text); } private static Record GetRecord(string line1, string line2) @@ -185,9 +194,10 @@ public class WaferCounterRepository : IWaferCounterRepository result = WaferCounter.GetWaferCounter("No files!"); else { + string windowsFileSystemSafeText = _Regex.Replace(text, "."); result = GetLastQuantityAndSlotMap(waferSize, httpClient, nginxFileSystemSortableCollection[0]); for (int i = 0; i < nginxFileSystemSortableCollection.Count; i++) - MoveFile(area, waferSize, text, waferSizeDirectory, nginxFileSystemSortableCollection[i]); + MoveFile(area, waferSize, windowsFileSystemSafeText, waferSizeDirectory, nginxFileSystemSortableCollection[i]); } return result; }