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

File:

• FarmatikoServices/Services/MedicineService.cs (modified) (2 diffs)

FarmatikoServices/Services/MedicineService.cs

@@ -5 +5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace FarmatikoServices.Services
@@ -17 +16 @@
         }
 
-        public async void Add(Medicine medicine)
+        public void Add(Medicine medicine)
         {
-            if (medicine != null)
-                await Task.Run(() => _medicineRepository.Add(medicine));
-            else throw new Exception("Can't Add medicine is null");
+            try
+            {
+                if (medicine != null)
+                    _medicineRepository.Add(medicine);
+            } 
+            catch (Exception e) 
+            {
+                e = new Exception("Can't Add medicine is null");
+                throw e;
+            }
         }
 
-        public async Task<IQueryable<Medicine>> GetAll()
+        public IQueryable<Medicine> GetAll()
         {
-            return await Task.Run(() => _medicineRepository.GetAll());
+            return _medicineRepository.GetAll();
         }
 
-        public async Task<IQueryable<Medicine>> GetByManufacturer(string Manufacturer)
+        public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
         {
-            if (Manufacturer != null)
-                return await Task.Run(() => _medicineRepository.GetByManufacturer(Manufacturer));
-            else throw new Exception("Can't get, name of manufacturer is null");
+            try
+            {
+                if (Manufacturer != null)
+                    return _medicineRepository.GetByManufacturer(Manufacturer);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't get, name of manufacturer is null");
+                throw e;
+            }
+            
+            return null;
         }
 
-        public async Task<IQueryable<Medicine>> GetByName(string Name)
+        public IQueryable<Medicine> GetByName(string Name)
         {
-            if (Name != null)
-                return await Task.Run(() => _medicineRepository.GetByName(Name));
-            else throw new Exception("Can't get, name is null");
+            try
+            {
+                if (Name != null)
+                    return _medicineRepository.GetByName(Name);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't get, name is null");
+            }
+            
+            return null;
         }
 
-        public async void Remove(Medicine Medicine)
+        public void Remove(string Medicine)
         {
-            if (Medicine != null)
-                await Task.Run(() => _medicineRepository.Remove(Medicine));
-            else throw new Exception("Can't Add medicine is null");
+            try
+            {
+                if (Medicine != null)
+                    _medicineRepository.Remove(Medicine);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't Add medicine is null");
+                throw e;
+            }
         }
     }