Changeset a55ef91 for FarmatikoData/FarmatikoRepo/MedicineListRepository.cs

Timestamp:

07/31/20 10:15:02 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

d8fafb8

Parents:

4e72684

Message:

Update & add service

File:

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

FarmatikoData/FarmatikoRepo/MedicineListRepository.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
@@ -17 +18 @@
             _context.SaveChangesAsync();
         }
-        public MedicineList CheckMedicine(string Name)
+        /*public MedicineList CheckMedicine(string Name)
         {
             return (MedicineList)_context.MedicineLists
                 .Where(medicineList => medicineList.Medicine.Name.Contains(Name))
-                .OrderBy(x => x.Medicine.Name);
-        }
-
-        public IEnumerable<MedicineList> GetAll()
+                .OrderBy(x => x.Medicine.Name)
+                .Include(x => x.HasMedicine)
+                .Cast<MedicineList>();
+        }*/
+         
+        public IQueryable<MedicineList> GetAll()
         {
             return _context.MedicineLists.OrderBy(x => x.Medicine.Name);
@@ -33 +36 @@
             return (ICollection<MedicineList>)_context.MedicineLists
                 .Where(x => x.Medicine.Manufacturer.Contains(Manufacturer))
-                .OrderBy(x => x.Medicine.Name);
+                .OrderBy(x => x.Medicine.Name)
+                .Cast<ICollection<MedicineList>>();
         }
         public ICollection<MedicineList> GetByName(string Name)
@@ -39 +43 @@
             return (ICollection<MedicineList>)_context.MedicineLists
                 .Where(x => x.Medicine.Name.Contains(Name))
-                .OrderBy(x => x.Medicine.Name);
+                .OrderBy(x => x.Medicine.Name)
+                .Cast<ICollection<MedicineList>>();
         }
 
         public void Remove(MedicineList medicineList)
         {
-            var list = (MedicineList)_context.MedicineLists.Where(x => x.Equals(medicineList));
+            var list = (MedicineList)_context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine));
             _context.MedicineLists.Remove(list);
-        }
-
-        public bool SetHasMedicine(MedicineList medicineList, bool HasMedicine)
-        {
-            MedicineList medicine = (MedicineList)_context.MedicineLists.Where(x => x.Medicine.Name.Equals(medicineList.Medicine.Name));
-            
-            if (medicine != null || medicineList != null)
-            {
-                if (HasMedicine == true)
-                {
-                    medicine.HasMedicine = HasMedicine;
-                    _context.MedicineLists.Add(medicine);
-                    _context.SaveChangesAsync();
-                    return true;
-                }
-                else
-                {
-                    medicine.HasMedicine = HasMedicine;
-                    _context.MedicineLists.Add(medicine);
-                    _context.SaveChangesAsync();
-                    return true;
-                }
-            }else
-            {
-                return false;
-            }
         }
     }