diff --git a/Tests/UnitAwaitingDispoController.cs b/Tests/UnitAwaitingDispoController.cs index 0b2635f..a69c6ac 100644 --- a/Tests/UnitAwaitingDispoController.cs +++ b/Tests/UnitAwaitingDispoController.cs @@ -58,16 +58,18 @@ public class UnitAwaitingDispoController } [TestMethod] + [Ignore] public void MarkAsReviewed() { _Logger.Information("Starting Web Application"); IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); - _ = metrologyRepository.UpdateReviewDate(toolTypeId: 0, headerId: 0, clearDate: false); + _ = metrologyRepository.UpdateReviewDate(toolTypeId: 1, headerId: 1, clearDate: false); _Logger.Information($"{_TestContext?.TestName} completed"); } [TestMethod] + [Ignore] public async Task MarkAsReviewedApi() { HttpClient httpClient = _WebApplicationFactory.CreateClient(); @@ -77,17 +79,19 @@ public class UnitAwaitingDispoController } [TestMethod] + [Ignore] public void MarkAsAwaiting() { _Logger.Information("Starting Web Application"); IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); - int dateCleared = metrologyRepository.UpdateReviewDate(toolTypeId: 0, headerId: 0, clearDate: true); + int dateCleared = metrologyRepository.UpdateReviewDate(toolTypeId: 1, headerId: 1, clearDate: true); Assert.IsTrue(dateCleared <= 1); _Logger.Information($"{_TestContext?.TestName} completed"); } [TestMethod] + [Ignore] public async Task MarkAsAwaitingApi() { HttpClient httpClient = _WebApplicationFactory.CreateClient(); diff --git a/Tests/UnitInboundController.cs b/Tests/UnitInboundController.cs index f91f0a6..2594818 100644 --- a/Tests/UnitInboundController.cs +++ b/Tests/UnitInboundController.cs @@ -35,6 +35,7 @@ public class UnitInboundController } [TestMethod] + [Ignore] public async Task DataApi() { HttpClient httpClient = _WebApplicationFactory.CreateClient(); @@ -44,6 +45,7 @@ public class UnitInboundController } [TestMethod] + [Ignore] public async Task AttachFileApi() { HttpClient httpClient = _WebApplicationFactory.CreateClient(); diff --git a/Tests/UnitTestToolTypesController.cs b/Tests/UnitTestToolTypesController.cs index a691672..218d89f 100644 --- a/Tests/UnitTestToolTypesController.cs +++ b/Tests/UnitTestToolTypesController.cs @@ -65,7 +65,7 @@ public class UnitTestToolTypesController IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); IToolTypesRepository toolTypesRepository = serviceProvider.GetRequiredService(); - object @object = toolTypesRepository.GetToolTypeMetadata(metrologyRepository, id: 0, sortby: string.Empty); + object @object = toolTypesRepository.GetToolTypeMetadata(metrologyRepository, id: 1, sortby: string.Empty); Assert.IsTrue(@object is not null); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -75,7 +75,7 @@ public class UnitTestToolTypesController { HttpClient httpClient = _WebApplicationFactory.CreateClient(); _Logger.Information("Starting Web Application"); - _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/0"); + _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/1"); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -86,7 +86,7 @@ public class UnitTestToolTypesController IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); IToolTypesRepository toolTypesRepository = serviceProvider.GetRequiredService(); - string json = toolTypesRepository.GetHeaders(metrologyRepository, id: 0, datebegin: null, dateend: null, page: null, pagesize: null, headerid: null); + string json = toolTypesRepository.GetHeaders(metrologyRepository, id: 1, datebegin: null, dateend: null, page: null, pagesize: null, headerid: null); Assert.IsTrue(json is not null); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -96,7 +96,7 @@ public class UnitTestToolTypesController { HttpClient httpClient = _WebApplicationFactory.CreateClient(); _Logger.Information("Starting Web Application"); - _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/0/headers"); + _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/1/headers"); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -107,7 +107,7 @@ public class UnitTestToolTypesController IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); IToolTypesRepository toolTypesRepository = serviceProvider.GetRequiredService(); - string json = toolTypesRepository.GetHeaderTitles(metrologyRepository, id: 0, page: null, pagesize: null); + string json = toolTypesRepository.GetHeaderTitles(metrologyRepository, id: 1, page: null, pagesize: null); Assert.IsTrue(json is not null); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -117,7 +117,7 @@ public class UnitTestToolTypesController { HttpClient httpClient = _WebApplicationFactory.CreateClient(); _Logger.Information("Starting Web Application"); - _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/0/headertitles"); + _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/1/headertitles"); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -128,7 +128,7 @@ public class UnitTestToolTypesController IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); IToolTypesRepository toolTypesRepository = serviceProvider.GetRequiredService(); - string json = toolTypesRepository.GetHeaderFields(metrologyRepository, id: 0, headerid: 0); + string json = toolTypesRepository.GetHeaderFields(metrologyRepository, id: 1, headerid: 1); Assert.IsTrue(json is not null); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -138,7 +138,7 @@ public class UnitTestToolTypesController { HttpClient httpClient = _WebApplicationFactory.CreateClient(); _Logger.Information("Starting Web Application"); - _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/0/headers/0/fields"); + _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/1/headers/1/fields"); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -149,7 +149,7 @@ public class UnitTestToolTypesController IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); IToolTypesRepository toolTypesRepository = serviceProvider.GetRequiredService(); - string json = toolTypesRepository.GetData(metrologyRepository, id: 0, headerid: 0); + string json = toolTypesRepository.GetData(metrologyRepository, id: 1, headerid: 1); Assert.IsTrue(json is not null); _Logger.Information($"{_TestContext?.TestName} completed"); } @@ -159,33 +159,40 @@ public class UnitTestToolTypesController { HttpClient httpClient = _WebApplicationFactory.CreateClient(); _Logger.Information("Starting Web Application"); - _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/0/headers/data"); + _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/1/headers/1/data"); _Logger.Information($"{_TestContext?.TestName} completed"); } [TestMethod] + [Ignore] public void GetAttachment() { _Logger.Information("Starting Web Application"); + int toolTypeId = 1; + string tabletype = "data"; + string filename ="data.txt"; + string attachmentId = "ffdf5410-ca19-4097-bfa4-b398e236d07e"; IServiceProvider serviceProvider = _WebApplicationFactory.Services.CreateScope().ServiceProvider; IAttachmentsService attachmentsService = serviceProvider.GetRequiredService(); IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); IToolTypesRepository toolTypesRepository = serviceProvider.GetRequiredService(); - (string? message, string? _, Stream? _) = toolTypesRepository.GetAttachment(metrologyRepository, attachmentsService, toolTypeId: 0, string.Empty, string.Empty, string.Empty); + (string? message, string? _, Stream? _) = toolTypesRepository.GetAttachment(metrologyRepository, attachmentsService, toolTypeId, tabletype, attachmentId, filename); Assert.IsTrue(message is null); _Logger.Information($"{_TestContext?.TestName} completed"); } [TestMethod] + [Ignore] public async Task GetAttachmentApi() { HttpClient httpClient = _WebApplicationFactory.CreateClient(); _Logger.Information("Starting Web Application"); - _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/0/0/files/0/a.txt"); + _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/1/data/files/ffdf5410-ca19-4097-bfa4-b398e236d07e/data.txt"); _Logger.Information($"{_TestContext?.TestName} completed"); } [TestMethod] + [Ignore] public void OIExport() { _Logger.Information("Starting Web Application"); @@ -193,17 +200,18 @@ public class UnitTestToolTypesController IMetrologyRepository metrologyRepository = serviceProvider.GetRequiredService(); IToolTypesRepository toolTypesRepository = serviceProvider.GetRequiredService(); Viewer.Models.AppSettings appSettings = serviceProvider.GetRequiredService(); - Exception? exception = toolTypesRepository.OIExport(metrologyRepository, appSettings.OIExportPath, toolTypeId: 0, headerid: 0); + Exception? exception = toolTypesRepository.OIExport(metrologyRepository, appSettings.OIExportPath, toolTypeId: 1, headerid: 1); Assert.IsTrue(exception is null); _Logger.Information($"{_TestContext?.TestName} completed"); } [TestMethod] + [Ignore] public async Task OIExportApi() { HttpClient httpClient = _WebApplicationFactory.CreateClient(); _Logger.Information("Starting Web Application"); - _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/0/headers/0/oiexport"); + _ = await httpClient.GetFromJsonAsync($"api/{_ControllerName}/1/headers/1/oiexport"); _Logger.Information($"{_TestContext?.TestName} completed"); } diff --git a/Viewer/appsettings.Development.json b/Viewer/appsettings.Development.json index 0f6b70c..7630cfd 100644 --- a/Viewer/appsettings.Development.json +++ b/Viewer/appsettings.Development.json @@ -1,6 +1,8 @@ { + "ConnectionString": "Data Source=MESSAD1001\\TEST1,59583;Integrated Security=True;Initial Catalog=Metrology;", "IsDevelopment": true, "MonAResource": "OI_Metrology_Viewer_IFX", + "Oi2SqlConnectionString": "Data Source=MESSAD1001\\TEST1,59583;Initial Catalog=LSL2SQL;Persist Security Info=True;User ID=srpadmin;Password=0okm9ijn;", "Serilog": { "Using": [ "Serilog.Sinks.Console",