Changeset 63d885e for FarmatikoData/FarmatikoRepo/MedicineListRepository.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:

• FarmatikoData/FarmatikoRepo/MedicineListRepository.cs (modified) (3 diffs)

FarmatikoData/FarmatikoRepo/MedicineListRepository.cs

@@ -29 +29 @@
         public IQueryable<MedicineList> GetAll()
         {
-            return _context.MedicineLists.OrderBy(x => x.Medicine.Name);
+            return _context.MedicineLists.Take(50).Select(x => new MedicineList 
+            { 
+                Medicine = x.Medicine,
+                HasMedicine = x.HasMedicine 
+            }).OrderBy(x => x.Medicine.Name);
         }
 
         public ICollection<MedicineList> GetByManufacturer(string Manufacturer)
         {
-            return (ICollection<MedicineList>)_context.MedicineLists
+            return (ICollection<MedicineList>)_context.MedicineLists.Take(50)
                 .Where(x => x.Medicine.Manufacturer.Contains(Manufacturer))
+                .Select(x => new MedicineList
+                {
+                    Medicine = x.Medicine,
+                    HasMedicine = x.HasMedicine
+                })
                 .OrderBy(x => x.Medicine.Name)
                 .Cast<ICollection<MedicineList>>();
@@ -41 +50 @@
         public ICollection<MedicineList> GetByName(string Name)
         {
-            return (ICollection<MedicineList>)_context.MedicineLists
+            return (ICollection<MedicineList>)_context.MedicineLists.Take(50)
                 .Where(x => x.Medicine.Name.Contains(Name))
+                .Select(x => new MedicineList
+                {
+                    Medicine = x.Medicine,
+                    HasMedicine = x.HasMedicine
+                })
                 .OrderBy(x => x.Medicine.Name)
                 .Cast<ICollection<MedicineList>>();
@@ -49 +63 @@
         public void Remove(MedicineList medicineList)
         {
-            var list = (MedicineList)_context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine));
-            _context.MedicineLists.Remove(list);
+            var list = _context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine)).FirstOrDefault();
+            if (list != null)
+            {
+                _context.MedicineLists.Remove(list);
+                _context.SaveChangesAsync();
+            }
         }
     }