Changes in FarmatikoData/FarmatikoRepo/MedicineRepository.cs [c406ae5:a55ef91]

File:

• FarmatikoData/FarmatikoRepo/MedicineRepository.cs (modified) (1 diff)

FarmatikoData/FarmatikoRepo/MedicineRepository.cs

@@ -21 +21 @@
         public IQueryable<Medicine> GetAll()
         {
-            return _context.Medicines.Take(50).Select(x => new Medicine
-            {
-                Name = x.Name,
-                Strength = x.Strength,
-                Form = x.Form,
-                WayOfIssuing = x.WayOfIssuing,
-                Manufacturer = x.Manufacturer,
-                Price = x.Price,
-                Packaging = x.Packaging
-            }).OrderBy(x => x.Name);
+            return _context.Medicines.OrderBy(x => x.Name);
         }
 
         public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
         {
-            return _context.Medicines.Take(50).Where(x => x.Name.Contains(Manufacturer))
-                .Select(x => new Medicine
-                {
-                    Name = x.Name,
-                    Strength = x.Strength,
-                    Form = x.Form,
-                    WayOfIssuing = x.WayOfIssuing,
-                    Manufacturer = x.Manufacturer,
-                    Price = x.Price,
-                    Packaging = x.Packaging
-                }).OrderBy(x => x.Manufacturer);
+            return _context.Medicines.Where(x => x.Name.Contains(Manufacturer)).OrderBy(x => x.Manufacturer);
         }
 
         public IQueryable<Medicine> GetByName(string Name)
         {
-            return _context.Medicines.Take(50).Where(medicine => medicine.Name.Contains(Name))
-                .Select(x => new Medicine
-                {
-                    Name = x.Name,
-                    Strength = x.Strength,
-                    Form = x.Form,
-                    WayOfIssuing = x.WayOfIssuing,
-                    Manufacturer = x.Manufacturer,
-                    Price = x.Price,
-                    Packaging = x.Packaging
-                }).OrderBy(x => x.Name);
+            return _context.Medicines.Where(medicine => medicine.Name.Contains(Name)).OrderBy(x => x.Name);
         }
 
-        public void Remove(Medicine medicine)
+        public void Remove(string medicine)
         {
-            Medicine med = _context.Medicines.Where(medicine => medicine.Name.Equals(medicine.Name)).FirstOrDefault();
-            if (med != null)
-            {
-                _context.Medicines.Remove(med);
-                _context.SaveChangesAsync();
-            }
-
+            Medicine med = (Medicine)_context.Medicines.Where(medicine => medicine.Name.Equals(medicine));
+            _context.Medicines.Remove(med);
         }
     }