Changeset 63d885e for FarmatikoData/FarmatikoRepo/PharmacyRepository.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/PharmacyRepository.cs (modified) (2 diffs)

FarmatikoData/FarmatikoRepo/PharmacyRepository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18 +19 @@
         {
             _context.Pharmacies.Add(pharmacy);
-            _context.SaveChangesAsync();
+            _context.SaveChanges();
         }
         //Just for users
         public IQueryable<Pharmacy> GetAll()
         {
-            return _context.Pharmacies.OrderBy(x => x.Name);
+            return _context.Pharmacies.Take(50)
+                .Select(x => new Pharmacy
+                {
+                    Name = x.Name,
+                    Location = x.Location,
+                    Address = x.Address,
+                    WorkAllTime = x.WorkAllTime
+                }).OrderBy(x => x.Name);
         }
 
         public ICollection<Pharmacy> GetPharmacies()
         {
-            return (ICollection<Pharmacy>)_context.Pharmacies.Select(pharmacy => new
-            {
-                pharmacy.Name,
-                pharmacy.Address,
-                pharmacy.Location,
-                pharmacy.WorkAllTime
-            }).OrderBy(x => x.Name);
+            return (ICollection<Pharmacy>)_context.Pharmacies.Take(50)
+                .Select(pharmacy => new
+                {
+                    pharmacy.Name,
+                    pharmacy.Address,
+                    pharmacy.Location,
+                    pharmacy.WorkAllTime
+                }).OrderBy(x => x.Name);
         }
 
         public void Remove(Pharmacy pharmacy)
         {
-            var pharma = _context.Pharmacies.Where(pharm => pharm.Name.Equals(pharmacy.Name)).Cast<Pharmacy>();
-            _context.Pharmacies.Remove((Pharmacy)pharma);
-            _context.SaveChangesAsync();
+            var pharma = _context.Pharmacies.Where(pharm => pharm.Name.Equals(pharmacy.Name)).FirstOrDefault();
+            if (pharma != null)
+            {
+                _context.Pharmacies.Remove(pharmacy);
+                _context.SaveChangesAsync();
+            }
         }
 
-        public void UpdatePharmacy(Pharmacy pharmacy, string Name)
+        public void UpdatePharmacy(Pharmacy pharmacy)
         {
-            var oldPharmacy = _context.Pharmacies.Where(pharma => pharma.Name.Equals(Name)).Cast<Pharmacy>();
-            _context.Pharmacies.Remove((Pharmacy)oldPharmacy);
-            _context.Pharmacies.Add(pharmacy);
-            _context.SaveChangesAsync();
+            var oldPharmacy = _context.Pharmacies.Where(pharma => pharma.Name.Equals(pharmacy.Name)).FirstOrDefault();
+            if (oldPharmacy != null)
+            {
+                _context.Pharmacies.Remove(oldPharmacy);
+                _context.Pharmacies.Add(pharmacy);
+                _context.SaveChangesAsync();
+            }
+            throw new Exception("Pharmacy not found");
         }
     }