Changes in FarmatikoServices/Services/PharmacyHeadService.cs [c406ae5:a55ef91]

File:

• FarmatikoServices/Services/PharmacyHeadService.cs (modified) (4 diffs)

FarmatikoServices/Services/PharmacyHeadService.cs

@@ -4 +4 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace FarmatikoServices.Services
@@ -16 +15 @@
         }
 
-        public async void Add(PharmacyHead pharmacyHead)
+        public void Add(PharmacyHead pharmacyHead)
         {
-            if (pharmacyHead != null)
-                await Task.Run(() => _pharmacyHeadRepository.Add(pharmacyHead));
-            else throw new Exception("Can't add, pharmacy head is null.");
+            try
+            {
+                if (pharmacyHead != null)
+                {
+                    _pharmacyHeadRepository.Add(pharmacyHead);
+                }
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't add, pharmacy head is null.");
+            }
+
         }
 
-        public async Task<IQueryable<PharmacyHead>> GetAllPharmacies(string NameOfPharmacyHead)
+        public IQueryable<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHead)
         {
             if (NameOfPharmacyHead != null)
             {
-                IQueryable<PharmacyHead> pharmacies = await Task.Run(() => _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacyHead));
-                if (pharmacies != null)
-                    return pharmacies;
+                IQueryable<PharmacyHead> Pharmacy = _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacyHead);
+                if (Pharmacy != null)
+                    return Pharmacy;
             }
             return null;
         }
 
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyByName(string Name)
+        public IQueryable<PharmacyHead> GetPharmacyByName(string Name)
         {
             if (Name != null)
             {
-                IQueryable<PharmacyHead> PharmacyHead = await Task.Run(() => _pharmacyHeadRepository.GetPharmacyByName(Name));
+                IQueryable<PharmacyHead> PharmacyHead = _pharmacyHeadRepository.GetPharmacyByName(Name);
                 if (PharmacyHead != null)
                     return PharmacyHead;
@@ -45 +53 @@
         }
 
-        public async Task<IQueryable<MedicineList>> GetPharmacyMedicines(string NameOfPharmacy)
+        public IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy)
         {
             if (NameOfPharmacy != null)
             {
-                IQueryable<MedicineList> Medicines = await Task.Run(() => _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy));
+                IQueryable<MedicineList> Medicines = _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy);
                 if (Medicines != null)
                     return Medicines;
@@ -56 +64 @@
         }
 
-        public async void Remove(PharmacyHead pharmacyHead)
+        public void Remove(PharmacyHead pharmacyHead, string Name)
         {
-            if (pharmacyHead != null)
-                await Task.Run(() => _pharmacyHeadRepository.Remove(pharmacyHead));
-            else throw new Exception("Can't remove, name of pharmacy head is null.");
+            try
+            {
+                if (Name != null)
+                {
+                    _pharmacyHeadRepository.Remove(pharmacyHead, Name);
+                }
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't remove, name of pharmacy head is null.");
+            }
+
         }
     }