phares3757/mesareportingservices
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed several synchronous database calls to asynchronous calls.

Browse Source
This commit is contained in:
Daniel Wathen
2023-01-04 17:17:24 -07:00
parent 81f7e1a57b
commit 8bc7d7bdde
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
View File

@ -11,7 +11,7 @@ namespace ReportingServices.Shared.HelperClasses
private static readonly string _baseUrlFabtime = "https://localhost:7196/api/FabTime/"; private static readonly string _baseUrlFabtime = "https://localhost:7196/api/FabTime/";
private static readonly string _baseUrlScrapeDb = "https://localhost:7196/api/ScrapeDB/"; private static readonly string _baseUrlScrapeDb = "https://localhost:7196/api/ScrapeDB/";
public async static Task<DailyReport> SetUpDailyReport() public static DailyReport SetUpDailyReport()
{ {
List<Task<List<EquipmentStateByDay>>> tasksEQState = new(); List<Task<List<EquipmentStateByDay>>> tasksEQState = new();
List<Task<List<ToolStateCurrent>>> tasksState = new(); List<Task<List<ToolStateCurrent>>> tasksState = new();
@ -33,7 +33,9 @@ namespace ReportingServices.Shared.HelperClasses
tasksState.Add(ApiCaller.GetApi<List<ToolStateCurrent>>(_baseUrlFabtime + "ToolState?toolType=Metrology")); tasksState.Add(ApiCaller.GetApi<List<ToolStateCurrent>>(_baseUrlFabtime + "ToolState?toolType=Metrology"));
tasksState.Add(ApiCaller.GetApi<List<ToolStateCurrent>>(_baseUrlFabtime + "ToolState?toolType=Cleans")); tasksState.Add(ApiCaller.GetApi<List<ToolStateCurrent>>(_baseUrlFabtime + "ToolState?toolType=Cleans"));
report.QuarterlyTargets = await ApiCaller.GetApi<QuarterlyTargets>(_baseUrlScrapeDb + "Targets"); Task<QuarterlyTargets> targets = ApiCaller.GetApi<QuarterlyTargets>(_baseUrlScrapeDb + "Targets");
Task<List<RDS>> rds = ApiCaller.GetApi<List<RDS>>(_baseUrlScrapeDb + "RDS?date=" + report.StartDate.ToString());
Task<List<Reactor>> reactors = ApiCaller.GetApi<List<Reactor>>(_baseUrlScrapeDb + "Reactors");
report.AddToolAvailibilityByType("ASM", tasksEQState[0].Result); report.AddToolAvailibilityByType("ASM", tasksEQState[0].Result);
report.AddToolAvailibilityByType("EPP", tasksEQState[1].Result); report.AddToolAvailibilityByType("EPP", tasksEQState[1].Result);
@ -45,8 +47,10 @@ namespace ReportingServices.Shared.HelperClasses
report.AddToolStateByType("Metrology", tasksState[3].Result); report.AddToolStateByType("Metrology", tasksState[3].Result);
report.AddToolStateByType("Cleans", tasksState[4].Result); report.AddToolStateByType("Cleans", tasksState[4].Result);
report.SetRDSInfo(await ApiCaller.GetApi<List<RDS>>(_baseUrlScrapeDb + "RDS?date=" + report.StartDate.ToString())); report.QuarterlyTargets = targets.Result;
report.SetReactorInfo(await ApiCaller.GetApi<List<Reactor>>(_baseUrlScrapeDb + "Reactors"), GetUnscheduledReactors(report));
report.SetRDSInfo(rds.Result);
report.SetReactorInfo(reactors.Result, GetUnscheduledReactors(report));
report.CurrentWeek.SetYieldInformation(task1.Result); report.CurrentWeek.SetYieldInformation(task1.Result);
report.PreviousWeek.SetYieldInformation(task2.Result); report.PreviousWeek.SetYieldInformation(task2.Result);

3
ReportingServices.UI/Controllers/ProductionReportController.cs
View File

@ -26,7 +26,7 @@ namespace ReportingServices.UI.Controllers
{ {
try try
{ {
DailyReport dailyReport = DailyReportHelper.SetUpDailyReport().Result; DailyReport dailyReport = DailyReportHelper.SetUpDailyReport();
Dictionary<string, List<string>> toolStateOwners = JsonFileHandler.LoadJSONFile<Dictionary<string, List<string>>>(_toolStateOwnerFilePath); Dictionary<string, List<string>> toolStateOwners = JsonFileHandler.LoadJSONFile<Dictionary<string, List<string>>>(_toolStateOwnerFilePath);
dailyReport.ToolStatesByOwner = toolStateOwners; dailyReport.ToolStatesByOwner = toolStateOwners;
@ -38,7 +38,6 @@ namespace ReportingServices.UI.Controllers
_logger.LogCritical(ex, "Failed to load report"); _logger.LogCritical(ex, "Failed to load report");
return View(); return View();
} }
} }
public IActionResult EditDailyReport() public IActionResult EditDailyReport()