Changeset 63d885e for FarmatikoServices/Services/MedicineService.cs

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

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
@@ -16 +17 @@
         }
 
-        public void Add(Medicine medicine)
+        public async void Add(Medicine medicine)
         {
-            try
-            {
-                if (medicine != null)
-                    _medicineRepository.Add(medicine);
-            } 
-            catch (Exception e) 
-            {
-                e = new Exception("Can't Add medicine is null");
-                throw e;
-            }
+            if (medicine != null)
+                await Task.Run(() => _medicineRepository.Add(medicine));
+            else throw new Exception("Can't Add medicine is null");
         }
 
-        public IQueryable<Medicine> GetAll()
+        public async Task<IQueryable<Medicine>> GetAll()
         {
-            return _medicineRepository.GetAll();
+            return await Task.Run(() => _medicineRepository.GetAll());
         }
 
-        public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
+        public async Task<IQueryable<Medicine>> GetByManufacturer(string Manufacturer)
         {
-            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;
+            if (Manufacturer != null)
+                return await Task.Run(() => _medicineRepository.GetByManufacturer(Manufacturer));
+            else throw new Exception("Can't get, name of manufacturer is null");
         }
 
-        public IQueryable<Medicine> GetByName(string Name)
+        public async Task<IQueryable<Medicine>> GetByName(string Name)
         {
-            try
-            {
-                if (Name != null)
-                    return _medicineRepository.GetByName(Name);
-            }
-            catch (Exception e)
-            {
-                e = new Exception("Can't get, name is null");
-            }
-            
-            return null;
+            if (Name != null)
+                return await Task.Run(() => _medicineRepository.GetByName(Name));
+            else throw new Exception("Can't get, name is null");
         }
 
-        public void Remove(string Medicine)
+        public async void Remove(Medicine Medicine)
         {
-            try
-            {
-                if (Medicine != null)
-                    _medicineRepository.Remove(Medicine);
-            }
-            catch (Exception e)
-            {
-                e = new Exception("Can't Add medicine is null");
-                throw e;
-            }
+            if (Medicine != null)
+                await Task.Run(() => _medicineRepository.Remove(Medicine));
+            else throw new Exception("Can't Add medicine is null");
         }
     }