Changeset 63d885e for Farmatiko

Timestamp:

08/07/20 11:01:25 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

5d02859

Parents:

ee137aa (diff), c406ae5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

Location:

Farmatiko

Files:

• Controllers/HealthFacilitiesController.cs (modified) (1 diff)
• Controllers/HealthcareWorkerController.cs (modified) (2 diffs)
• Controllers/MedicineController.cs (modified) (2 diffs)
• Controllers/MedicineListController.cs (modified) (2 diffs)
• Controllers/PandemicController.cs (modified) (2 diffs)
• Controllers/PharmacyController.cs (modified) (2 diffs)
• Controllers/PharmacyHeadController.cs (modified) (1 diff)
• Startup.cs (modified) (2 diffs)

Farmatiko/Controllers/HealthFacilitiesController.cs

@@ -26 +26 @@
         }
         [HttpGet]
-        public IQueryable<HealthFacilities> Get()
+        public Task<IQueryable<HealthFacilities>> Get()
         {
             return _healthFacilitiesService.GetAll();

Farmatiko/Controllers/HealthcareWorkerController.cs

@@ -1 +1 @@
 using System.Linq;
+using System.Threading.Tasks;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -17 +18 @@
 
         [HttpGet]
-        public IQueryable<HealthcareWorkers> Get()
+        public Task<IQueryable<HealthcareWorkers>> Get()
         {
             return _healthcareWorkerService.GetAll();

Farmatiko/Controllers/MedicineController.cs

@@ -1 +1 @@
 using System.Linq;
+using System.Threading.Tasks;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -16 +17 @@
         }
         [HttpGet]
-        public IQueryable<Medicine> Get()
+        public Task<IQueryable<Medicine>> Get()
         {
             return _medicineService.GetAll();

Farmatiko/Controllers/MedicineListController.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -17 +18 @@
         }
         [HttpGet]
-        public IQueryable<MedicineList> Get()
+        public Task<IQueryable<MedicineList>> Get()
         {
             return _medicineListService.GetAll();
         }
         [HttpGet]
-        public ICollection<MedicineList> GetByName(string Name)
+        public Task<ICollection<MedicineList>> GetByName(string Name)
         {
             return _medicineListService.GetByName(Name);
         }
         [HttpGet]
-        public ICollection<MedicineList> GetByManufacturer(string Manufacturer)
+        public Task<ICollection<MedicineList>> GetByManufacturer(string Manufacturer)
         {
             return _medicineListService.GetByManufacturer(Manufacturer);

Farmatiko/Controllers/PandemicController.cs

@@ -1 +1 @@
 using System.Linq;
+using System.Threading.Tasks;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -16 +17 @@
         }
         [HttpGet]
-        public IQueryable<Pandemic> Get()
+        public Task<IQueryable<Pandemic>> Get()
         {
             return _pandemicService.GetAll();

Farmatiko/Controllers/PharmacyController.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -17 +18 @@
         }
         [HttpGet]
-        public IQueryable<Pharmacy> Get()
+        public Task<IQueryable<Pharmacy>> Get()
         {
             return _pharmacyService.GetAll();
         }
         [HttpGet]
-        public ICollection<Pharmacy> GetPharmacies()
+        public Task<ICollection<Pharmacy>> GetPharmacies()
         {
             return _pharmacyService.GetPharmacies();
         }
         [HttpPost]
-        public void UpdatePharmacy(Pharmacy pharmacy, string Name)
+        public void UpdatePharmacy(Pharmacy pharmacy)
         {
-            _pharmacyService.UpdatePharmacy(pharmacy,Name);
+            _pharmacyService.UpdatePharmacy(pharmacy);
         }
         [HttpPost]

Farmatiko/Controllers/PharmacyHeadController.cs

@@ -36 +36 @@
         }
         [HttpPost]
-        public void Remove(PharmacyHead pharmacyHead, string Name)
+        public void Remove(PharmacyHead pharmacyHead)
         {
-            _pharmacyHeadRepository.Remove(pharmacyHead, Name);
+            _pharmacyHeadRepository.Remove(pharmacyHead);
         }
     }

Farmatiko/Startup.cs

@@ -12 +12 @@
 using FarmatikoServices.FarmatikoServiceInterfaces;
 using FarmatikoServices.Services;
+using Microsoft.Extensions.Logging;
 
 namespace Farmatiko
@@ -69 +70 @@
 
             services.AddTransient<IProcessJSONService, ProcessJSONService>();
+
+            services.AddTransient<ILogger, Logger<ProcessJSONService>>();
         }