From 8bc7d7bdde9026df2f05d68b26f4212439ccae74 Mon Sep 17 00:00:00 2001
From: Daniel Wathen <daniel.wathen@infineon.com>
Date: Wed, 4 Jan 2023 17:17:24 -0700
Subject: [PATCH] Changed several synchronous database calls to asynchronous
 calls.

---
 .../HelperClasses/DailyReportHelper.cs               | 12 ++++++++----
 .../Controllers/ProductionReportController.cs        |  3 +--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
index 8016d77..13bee65 100644
--- a/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
+++ b/ReportingServices.Shared/HelperClasses/DailyReportHelper.cs
@@ -11,7 +11,7 @@ namespace ReportingServices.Shared.HelperClasses
         private static readonly string _baseUrlFabtime = "https://localhost:7196/api/FabTime/";
         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<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=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("EPP", tasksEQState[1].Result);
@@ -45,8 +47,10 @@ namespace ReportingServices.Shared.HelperClasses
             report.AddToolStateByType("Metrology", tasksState[3].Result);
             report.AddToolStateByType("Cleans", tasksState[4].Result);
 
-            report.SetRDSInfo(await ApiCaller.GetApi<List<RDS>>(_baseUrlScrapeDb + "RDS?date=" + report.StartDate.ToString()));
-            report.SetReactorInfo(await ApiCaller.GetApi<List<Reactor>>(_baseUrlScrapeDb + "Reactors"), GetUnscheduledReactors(report));
+            report.QuarterlyTargets = targets.Result;
+
+            report.SetRDSInfo(rds.Result);
+            report.SetReactorInfo(reactors.Result, GetUnscheduledReactors(report));
 
             report.CurrentWeek.SetYieldInformation(task1.Result);
             report.PreviousWeek.SetYieldInformation(task2.Result);
diff --git a/ReportingServices.UI/Controllers/ProductionReportController.cs b/ReportingServices.UI/Controllers/ProductionReportController.cs
index 6d84225..1c23c7d 100644
--- a/ReportingServices.UI/Controllers/ProductionReportController.cs
+++ b/ReportingServices.UI/Controllers/ProductionReportController.cs
@@ -26,7 +26,7 @@ namespace ReportingServices.UI.Controllers
         {
             try
             {
-                DailyReport dailyReport = DailyReportHelper.SetUpDailyReport().Result;
+                DailyReport dailyReport = DailyReportHelper.SetUpDailyReport();
                 Dictionary<string, List<string>> toolStateOwners = JsonFileHandler.LoadJSONFile<Dictionary<string, List<string>>>(_toolStateOwnerFilePath);
 
                 dailyReport.ToolStatesByOwner = toolStateOwners;
@@ -38,7 +38,6 @@ namespace ReportingServices.UI.Controllers
                 _logger.LogCritical(ex, "Failed to load report");
                 return View();
             }
-            
         }
 
         public IActionResult EditDailyReport()