Changeset f554983 for FarmatikoServices/Services/ProcessJSONService.cs

Timestamp:

02/14/21 17:54:35 (3 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

472dd7e

Parents:

6e6f04b

Message:

Add cron job for updating data, with Quartz.NET

File:

• FarmatikoServices/Services/ProcessJSONService.cs (modified) (11 diffs)

FarmatikoServices/Services/ProcessJSONService.cs

@@ -13 +13 @@
 using GemBox.Spreadsheet;
 using System.Text;
+using FarmatikoData.FarmatikoRepoInterfaces;
 
 namespace FarmatikoServices.Services
@@ -20 +21 @@
 
         private readonly ILogger _logger;
+        private readonly IUpdateDataRepo _repo;
         private readonly IService _service;
-        public ProcessJSONService(ILogger logger, IService service)
+        public ProcessJSONService(ILogger logger, IUpdateDataRepo repo, IService service)
         {
             _logger = logger;
+            _repo = repo;
             _service = service;
         }
@@ -77 +80 @@
                 bool Success = ReadPharmaciesFromExcel(pathToSave1);
                 _logger.LogInformation(Success.ToString() + "1");
-               /* Success = await ReadPharmaciesFromExcel(pathToSave2);
-                _logger.LogInformation(Success.ToString() + "2");*/
+
+                
             }
             catch (Exception e)
@@ -88 +91 @@
 
         //Healthfacilities
-        public async void GetProcessedHealthFacilitiesFromJSON()
+        public void GetProcessedHealthFacilitiesFromJSON()
         {
             try
@@ -115 +118 @@
                     healthFacility.Email = Convert.ToString(Email);
                     healthFacility.Phone = Convert.ToString(Phone);
-                    await _service.AddFacility(healthFacility);
-
-                }
-
+                    _service.AddFacility(healthFacility);
+
+                }
+                
             }
             catch (Exception e)
@@ -126 +129 @@
             }
         }
-        //Pandemics
-        public async void GetProcessedPandemicsFromJSONApi()
-        {
-            try
-            {
-                var Date = DateTime.UtcNow.ToString("yyyy-MM-dd");
-                var client = new RestClient($"https://api.covid19tracking.narrativa.com/api/{Date}/country/north_macedonia");
-                var response = client.Execute(new RestRequest());
-                string original = response.Content;
-                var jsonResponsePandemic = JObject.Parse(original);
-                var global = JObject.Parse(jsonResponsePandemic.GetValue("total").ToString());
-                var TotalConfirmed = long.Parse(global.GetValue("today_confirmed").ToString());
-                var TotalDeaths = long.Parse(global.GetValue("today_deaths").ToString());
-                var TotalRecovered = long.Parse(global.GetValue("today_new_recovered").ToString());
-
-                var mk = JObject.Parse(jsonResponsePandemic.GetValue("dates").ToString());
-
-                var date = JObject.Parse(mk.GetValue(Date).ToString());
-                var country = JObject.Parse(date.GetValue("countries").ToString());
-                var mkd = JObject.Parse(country.GetValue("North Macedonia").ToString());
-                dynamic objP = mkd;
-                var TotalMk = Int32.Parse(objP.GetValue("today_confirmed").ToString());
-                var TotalDeathsMK = Int32.Parse(objP.GetValue("today_deaths").ToString());
-                var TotalRecoveredMK = Int32.Parse(objP.GetValue("today_recovered").ToString());
-                var NewMK = Int32.Parse(objP.GetValue("today_new_confirmed").ToString());
-
-                var Name = "Coronavirus";
-                var ActiveMk = TotalMk - (TotalRecoveredMK + TotalDeathsMK);
-                var ActiveGlobal = TotalConfirmed - (TotalRecovered + TotalDeaths);
-
-                Pandemic pandemic = new Pandemic(Name, TotalMk, ActiveMk, TotalDeathsMK, NewMK, TotalConfirmed, TotalDeaths, ActiveGlobal);
-                await _service.AddPandemic(pandemic);
-            }
-            catch (Exception e)
-            {
-                _logger.LogInformation(e.Message);
-            }
-        }
+              
         //Healthcare workers
-        public async void GetProcessedHealthcareWorkersFromJSON()
+        public void GetProcessedHealthcareWorkersFromJSON()
         {
             try
@@ -183 +149 @@
                     var Title = Convert.ToString(obj[3]);
 
-                    HealthFacility facility = _service.GetFacilityJSON(Convert.ToString(FacilityName));
+                    HealthFacility facility = _repo.GetFacilityJSON(Convert.ToString(FacilityName));
 
                     if (facility != null && facility != default)
@@ -196 +162 @@
                            );
                         HealthcareWorker healthcareWorker = new HealthcareWorker(Name, Branch, Facility, Title);
-                        await _service.AddWorker(healthcareWorker);
+                        _service.AddWorker(healthcareWorker);
                     }
                     else
@@ -209 +175 @@
                            );
                         HealthcareWorker healthcareWorker = new HealthcareWorker(Name, Branch, Facility, Title);
-                        await _service.AddWorker(healthcareWorker);
+                        _service.AddWorker(healthcareWorker);
                     }
                     
 
                 }
+                
             }
             catch (Exception e)
@@ -221 +188 @@
         }
         //Medicines
-        public async void GetProcessedMedicinesFromJSON()
+        public void GetProcessedMedicinesFromJSON()
         {
             try
@@ -244 +211 @@
                     Medicine medicine = new Medicine(Convert.ToString(Name), Convert.ToString(Strength), Convert.ToString(Form), Convert.ToString(WayOfIssuing), Convert.ToString(Manufacturer), Price, Convert.ToString(Packaging));
 
-                    await _service.AddMedicines(medicine);
+                    _service.AddMedicines(medicine);
                 }
             }