Merge pull request #698 from bcgov/HotFix

Hot fix for openshift filepath issue
bcgov · Oct 10, 2024 · 1304e42 · 1304e42
2 parents 49acca2 + 184d123
commit 1304e42
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/app/Agri.CalculateService/CalculateFertigationNutrients.cs b/app/Agri.CalculateService/CalculateFertigationNutrients.cs
@@ -113,9 +113,8 @@ private Fertilizer getFertilizer(int id){
 
         private Fertigation GetFertigationData()
         {
-            var filePath = "../../../Agri.Data/SeedData/FertigationData.json";
-            var jsonData = System.IO.File.ReadAllText(filePath);
-            return JsonConvert.DeserializeObject<Fertigation>(jsonData);
+            var jsonData = SeedDataLoader.GetSeedJsonData<Fertigation>(Constants.SeedDataFiles.Fertigation);
+            return jsonData;
         }
     }
 }
diff --git a/app/Agri.Data/Agri.Data.csproj b/app/Agri.Data/Agri.Data.csproj
@@ -16,6 +16,7 @@
     <EmbeddedResource Include="SeedData\DepthsData.json" />
     <EmbeddedResource Include="SeedData\ExternalLinksData.json" />
     <EmbeddedResource Include="SeedData\JourneyData.json" />
+    <EmbeddedResource Include="SeedData\FertigationData.json" />
     <EmbeddedResource Include="SeedData\LocationsData.json" />
     <EmbeddedResource Include="SeedData\MiniAppLabelData.json" />
     <EmbeddedResource Include="SeedData\NutrientIconsData.json" />

diff --git a/app/Agri.Data/Constants.cs b/app/Agri.Data/Constants.cs
@@ -17,6 +17,7 @@ public static class SeedDataFiles
             public const string NutrientIcons = "Agri.Data.SeedData.NutrientIconsData.json";
             public const string SubMenus = "Agri.Data.SeedData.SubMenusData.json";
             public const string UserPrompts = "Agri.Data.SeedData.UserPromptsData.json";
+            public const string Fertigation = "Agri.Data.SeedData.FertigationData.json";
         }
     }
 }
diff --git a/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs b/app/Server/src/SERVERAPI/Controllers/NutrientsController.cs
@@ -1241,9 +1241,8 @@ private void FertigationUpdate(FertigationDetailsViewModel fgvm)
 
         public Fertigation GetFertigationData()
         {
-            var filePath = "../../../Agri.Data/SeedData/FertigationData.json";
-            var jsonData = System.IO.File.ReadAllText(filePath);
-            return JsonConvert.DeserializeObject<Fertigation>(jsonData);
+            var jsonData = SeedDataLoader.GetSeedJsonData<Fertigation>(Constants.SeedDataFiles.Fertigation);
+            return jsonData;
         }
 
         [HttpGet]

diff --git a/app/Server/src/SERVERAPI/ViewComponents/CalcFertigationViewComponent.cs b/app/Server/src/SERVERAPI/ViewComponents/CalcFertigationViewComponent.cs
@@ -72,9 +72,8 @@ private Task<CalcFertigationViewModel> GetFertigationAsync(string fldName)
         }
         public Fertigation GetFertigationData()
         {
-            var filePath = "../../../Agri.Data/SeedData/FertigationData.json";
-            var jsonData = System.IO.File.ReadAllText(filePath);
-            return JsonConvert.DeserializeObject<Fertigation>(jsonData);
+            var jsonData = SeedDataLoader.GetSeedJsonData<Fertigation>(Constants.SeedDataFiles.Fertigation);
+            return jsonData;
         }
         private Fertilizer GetFertigationFertilizer(int id)
         {