diff --git a/ReportingServicesAPIs/Controllers/FabTimeController.cs b/ReportingServices.API/Controllers/FabTimeController.cs similarity index 100% rename from ReportingServicesAPIs/Controllers/FabTimeController.cs rename to ReportingServices.API/Controllers/FabTimeController.cs diff --git a/ReportingServicesAPIs/Controllers/ScrapeDBController.cs b/ReportingServices.API/Controllers/ScrapeDBController.cs similarity index 100% rename from ReportingServicesAPIs/Controllers/ScrapeDBController.cs rename to ReportingServices.API/Controllers/ScrapeDBController.cs diff --git a/ReportingServicesAPIs/Program.cs b/ReportingServices.API/Program.cs similarity index 100% rename from ReportingServicesAPIs/Program.cs rename to ReportingServices.API/Program.cs diff --git a/ReportingServices.APIs/Properties/launchSettings.json b/ReportingServices.API/Properties/launchSettings.json similarity index 100% rename from ReportingServices.APIs/Properties/launchSettings.json rename to ReportingServices.API/Properties/launchSettings.json diff --git a/ReportingServicesAPIs/ReportingServices.API.csproj b/ReportingServices.API/ReportingServices.API.csproj similarity index 100% rename from ReportingServicesAPIs/ReportingServices.API.csproj rename to ReportingServices.API/ReportingServices.API.csproj diff --git a/ReportingServices.APIs/appsettings.Development.json b/ReportingServices.API/appsettings.Development.json similarity index 100% rename from ReportingServices.APIs/appsettings.Development.json rename to ReportingServices.API/appsettings.Development.json diff --git a/ReportingServices.APIs/appsettings.json b/ReportingServices.API/appsettings.json similarity index 100% rename from ReportingServices.APIs/appsettings.json rename to ReportingServices.API/appsettings.json diff --git a/ReportingServices.APIs/Controllers/FabTimeController.cs b/ReportingServices.APIs/Controllers/FabTimeController.cs deleted file mode 100644 index 6bf4b68..0000000 --- a/ReportingServices.APIs/Controllers/FabTimeController.cs +++ /dev/null @@ -1,37 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using ReportingServices.Shared.Models.ProductionReport; -using ReportingServices.Shared.Repositories; - -namespace ReportingServices.API.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class FabTimeController : ControllerBase - { - private readonly IFabTimeReportingRepository _fabTimeReportingRepository; - - public FabTimeController(IFabTimeReportingRepository fabTimeReportingRepository) - { - _fabTimeReportingRepository = fabTimeReportingRepository; - } - - [HttpGet("ReactorOuts")] - public async Task> GetReactorOuts(string startDate, string endDate) - { - return await _fabTimeReportingRepository.GetMovesTrendData(startDate, endDate); - } - - [HttpGet("ToolStateTrend")] - public async Task> GetToolStateTrendData(string toolType) - { - return await _fabTimeReportingRepository.GetToolStateTrendData(toolType); - } - - [HttpGet("ToolState")] - public async Task> GetToolStateData(string toolType) - { - return await _fabTimeReportingRepository.GetToolStateData(toolType); - } - } -} diff --git a/ReportingServices.APIs/Controllers/ScrapeDBController.cs b/ReportingServices.APIs/Controllers/ScrapeDBController.cs deleted file mode 100644 index 451d5eb..0000000 --- a/ReportingServices.APIs/Controllers/ScrapeDBController.cs +++ /dev/null @@ -1,58 +0,0 @@ -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Mvc; -using ReportingServices.Shared.Models.PlanningReport; -using ReportingServices.Shared.Models.ProductionReport; -using ReportingServices.Shared.Repositories; - -namespace ReportingServices.API.Controllers -{ - [Route("api/[controller]")] - [ApiController] - public class ScrapeDBController : ControllerBase - { - private readonly IScrapeDatabaseRepository _scrapeDBRepository; - - public ScrapeDBController(IScrapeDatabaseRepository scrapeDBRepository) - { - _scrapeDBRepository = scrapeDBRepository; - } - - [HttpGet("Scrap")] - public List GetScrapByDay(List outs) - { - return _scrapeDBRepository.GetScrapByDay(outs); - } - - [HttpGet("PSNWO")] - public List GetReactorPSNWORuns(string startDate, string endDate) - { - var path = Environment.CurrentDirectory; - - return _scrapeDBRepository.GetReactorPSNWORuns(startDate, endDate); - } - - [HttpGet("PartChanges")] - public int GetNumberOfPartChanges(string startDate, string endDate) - { - return _scrapeDBRepository.GetNumberOfPartChanges(startDate, endDate); - } - - [HttpGet("Targets")] - public QuarterlyTargets GetQuarterlyTargets() - { - return _scrapeDBRepository.GetQuarterlyTargets(); - } - - [HttpGet("Reactors")] - public List GetReactors() - { - return _scrapeDBRepository.GetReactors(); - } - - [HttpGet("RDS")] - public List GetRDSForLastDay() - { - return _scrapeDBRepository.GetRDSForLastDay(); - } - } -} diff --git a/ReportingServices.APIs/Program.cs b/ReportingServices.APIs/Program.cs deleted file mode 100644 index 08dfa70..0000000 --- a/ReportingServices.APIs/Program.cs +++ /dev/null @@ -1,29 +0,0 @@ -using ReportingServices.Shared.Repositories; - -var builder = WebApplication.CreateBuilder(args); - -// Add services to the container. - -builder.Services.AddControllers(); -// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle -builder.Services.AddEndpointsApiExplorer(); -builder.Services.AddSwaggerGen(); -builder.Services.AddScoped(); -builder.Services.AddScoped(); - -var app = builder.Build(); - -// Configure the HTTP request pipeline. -if (app.Environment.IsDevelopment()) -{ - app.UseSwagger(); - app.UseSwaggerUI(); -} - -app.UseHttpsRedirection(); - -app.UseAuthorization(); - -app.MapControllers(); - -app.Run(); diff --git a/ReportingServices.APIs/ReportingServices.API.csproj b/ReportingServices.APIs/ReportingServices.API.csproj deleted file mode 100644 index 7a18bdd..0000000 --- a/ReportingServices.APIs/ReportingServices.API.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - net6.0 - disable - enable - - - - - - - - - - - diff --git a/ReportingServices.Test/ReportingServices.Test.csproj b/ReportingServices.Test/ReportingServices.Test.csproj index 27d6bf9..f485b7e 100644 --- a/ReportingServices.Test/ReportingServices.Test.csproj +++ b/ReportingServices.Test/ReportingServices.Test.csproj @@ -36,7 +36,7 @@ - + diff --git a/ReportingServices.sln b/ReportingServices.sln index b5fb82c..3fbe636 100644 --- a/ReportingServices.sln +++ b/ReportingServices.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportingServices.UI", "Rep EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportingServices.Test", "ReportingServices.Test\ReportingServices.Test.csproj", "{9E631987-FBF0-4795-B552-1196718F9EBC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportingServices.API", "ReportingServicesAPIs\ReportingServices.API.csproj", "{C53BD9A4-EBAF-4C62-9105-F0B01254E72C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportingServices.API", "ReportingServices.API\ReportingServices.API.csproj", "{C53BD9A4-EBAF-4C62-9105-F0B01254E72C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReportingServices.Shared", "ReportingServices.Shared\ReportingServices.Shared.csproj", "{0A8FDF86-8BF8-4A3B-9D8B-DBC8DAA35AD5}" EndProject diff --git a/ReportingServicesAPIs/Properties/launchSettings.json b/ReportingServicesAPIs/Properties/launchSettings.json deleted file mode 100644 index 9f304c7..0000000 --- a/ReportingServicesAPIs/Properties/launchSettings.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:43372", - "sslPort": 44364 - } - }, - "profiles": { - "ReportingServicesAPIs": { - "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "https://localhost:7196;http://localhost:5196", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "launchUrl": "swagger", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/ReportingServicesAPIs/appsettings.Development.json b/ReportingServicesAPIs/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/ReportingServicesAPIs/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/ReportingServicesAPIs/appsettings.json b/ReportingServicesAPIs/appsettings.json deleted file mode 100644 index 10f68b8..0000000 --- a/ReportingServicesAPIs/appsettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - }, - "AllowedHosts": "*" -}