Changeset 63d885e for FarmatikoServices/FarmatikoServiceInterfaces

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:

FarmatikoServices/FarmatikoServiceInterfaces

Files:

• IHealthFacilityService.cs (modified) (2 diffs)
• IHealthcareWorkerService.cs (modified) (2 diffs)
• IMedicineListService.cs (modified) (2 diffs)
• IMedicineService.cs (modified) (2 diffs)
• IPandemicService.cs (modified) (2 diffs)
• IPharmacyHeadService.cs (modified) (2 diffs)
• IPharmacyService.cs (modified) (2 diffs)
• IProcessJSONService.cs (modified) (2 diffs)

FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoData
@@ -6 +7 @@
     public interface IHealthFacilityService
     {
-        IQueryable<HealthFacilities> GetAll();
+        Task<IQueryable<HealthFacilities>> GetAll();
         void Add(HealthFacilities healthFacility);
         void Remove(HealthFacilities healthFacility);

FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -6 +7 @@
     public interface IHealthcareWorkerService
     {
-        IQueryable<HealthcareWorkers> GetAll();
+        Task<IQueryable<HealthcareWorkers>> GetAll();
         void Add(HealthcareWorkers healthcareWorker);
         void Remove(HealthcareWorkers healthcareWorker);

FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -7 +8 @@
     public interface IMedicineListService
     {
-        IQueryable<MedicineList> GetAll();
+        Task<IQueryable<MedicineList>> GetAll();
         //SetHasMedicine(MedicineList medicineList, bool HasMedicine);
-        ICollection<MedicineList> GetByName(string Name);
-        ICollection<MedicineList> GetByManufacturer(string Manufacturer);
+        Task<ICollection<MedicineList>> GetByName(string Name);
+        Task<ICollection<MedicineList>> GetByManufacturer(string Manufacturer);
         void Add(MedicineList medicineList);
         void Remove(MedicineList medicineList);

FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -6 +7 @@
     public interface IMedicineService
     {
-        IQueryable<Medicine> GetAll();
+        Task<IQueryable<Medicine>> GetAll();
         void Add(Medicine medicine);
-        void Remove(string Medicine);
-        IQueryable<Medicine> GetByName(string Name);
-        IQueryable<Medicine> GetByManufacturer(string Manufacturer);
+        void Remove(Medicine Medicine);
+        Task<IQueryable<Medicine>> GetByName(string Name);
+        Task<IQueryable<Medicine>> GetByManufacturer(string Manufacturer);
     }
 }

FarmatikoServices/FarmatikoServiceInterfaces/IPandemicService.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -7 +8 @@
     {
         void Add(Pandemic pandemic);
-        IQueryable<Pandemic> GetAll();
+        Task<IQueryable<Pandemic>> GetAll();
         void Remove(Pandemic pandemic);
     }

FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyHeadService.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -7 +8 @@
     {
         void Add(PharmacyHead pharmacyHead);
-        void Remove(PharmacyHead pharmacyHead, string Name);
-        IQueryable<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHead);
+        void Remove(PharmacyHead pharmacyHead);
+        Task<IQueryable<PharmacyHead>> GetAllPharmacies(string NameOfPharmacyHead);
         //Not actually needed
-        IQueryable<PharmacyHead> GetPharmacyByName(string Name);
-        IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy);
+        Task<IQueryable<PharmacyHead>> GetPharmacyByName(string Name);
+        Task<IQueryable<MedicineList>> GetPharmacyMedicines(string NameOfPharmacy);
     }
 }

FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyService.cs

@@ -2 +2 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -8 +9 @@
     {
         void Add(Pharmacy pharmacy);
-        ICollection<Pharmacy> GetPharmacies();
-        IQueryable<Pharmacy> GetAll();
+        Task<ICollection<Pharmacy>> GetPharmacies();
+        Task<IQueryable<Pharmacy>> GetAll();
         void Remove(Pharmacy pharmacy);
-        void UpdatePharmacy(Pharmacy pharmacy, string Name);
+        void UpdatePharmacy(Pharmacy pharmacy);
     }
 }

FarmatikoServices/FarmatikoServiceInterfaces/IProcessJSONService.cs

@@ -3 +3 @@
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -8 +9 @@
     public interface IProcessJSONService
     {
-        List<HealthFacilities> GetProcessedHealthFacilitiesFromJSON();
+        Task<HashSet<HealthFacilities>> GetProcessedHealthFacilitiesFromJSON();
+        Task<HashSet<Pandemic>> GetProcessedPandemicsFromJSONApi();
+        Task<HashSet<HealthcareWorkers>> GetProcessedHealthcareWorkersFromJSON();
+        Task<HashSet<Medicine>> GetProcessedMedicinesFromJSON();
     }
 }