Changeset 1db5673 for FarmatikoData/FarmatikoRepo

Timestamp:

11/14/20 12:27:30 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

68454c6

Parents:

ad60966

Message:

Fix bugs, add some more

Location:

FarmatikoData/FarmatikoRepo

Files:

• PHRepo.cs (modified) (3 diffs)
• Repository.cs (modified) (3 diffs)

FarmatikoData/FarmatikoRepo/PHRepo.cs

@@ -31 +31 @@
                     Email = x.Email,
                     Password = x.Password,
-                    MedicineLists = x.MedicineLists,
+                    MedicineList = x.MedicineList,
                     PharmaciesList = x.PharmaciesList
                 }).ToListAsync();
@@ -39 +39 @@
         public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
         {
-            var EditedPHead = await _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefaultAsync();
+            var Phead = await _context.PharmacyHeads.Where(x => x.Email == pharmacyHead.Email).FirstOrDefaultAsync();
+            var EditedPHead = await _context.PharmacyHeads.AsNoTracking<PharmacyHead>().Where(x => x.Email == pharmacyHead.Email).FirstOrDefaultAsync();
             EditedPHead.Email = pharmacyHead.Email;
             EditedPHead.Name = pharmacyHead.Name;
             EditedPHead.Password = pharmacyHead.Password;
-            EditedPHead.MedicineLists = pharmacyHead.MedicineLists;
+            /*if (pharmacyHead.MedicineList.Count() == 0)
+                pharmacyHead.MedicineList = null;*/
+            EditedPHead.MedicineList = pharmacyHead.MedicineList;
             EditedPHead.PharmaciesList = pharmacyHead.PharmaciesList;
+            EditedPHead.PHMedicineList = pharmacyHead.PHMedicineList;
+            //_context.Entry<PharmacyHead>(Phead).State = EntityState.Detached;
+            Phead = EditedPHead;
             await _context.SaveChangesAsync();
         }
@@ -72 +78 @@
         }
 
+
         public PharmacyHead GetPharmacyHeadByUserName(string userName)
         {
-            return _context.PharmacyHeads
+            var PHead = _context.PharmacyHeads
                 .Where(x => x.Email.Equals(userName))
                 .FirstOrDefault();
+
+            return PHead;
+        }
+
+        public List<PharmacyHeadMedicine> GetPharmacyHeadMedicines(string email)
+        {
+            /*var meds = _context.Medicines.ToList();
+            var medicines = Medicines;*/
+            var Phead = _context.PharmacyHeads.Where(x => x.Email.Equals(email)).FirstOrDefault();
+            var Medicines = _context.PharmacyHeadMedicines.Where(x => x.PheadId == Phead.Id).ToList();
+                /*.Select(x => x.Head.MedicineList)
+                .SelectMany(mList => mList)
+                .ToList();*/
+
+
+            return Medicines;
+        }
+
+        public IEnumerable<PharmacyHead> GetPharmacyHeads()
+        {
+            var heads = _context.PharmacyHeads.ToList();
+            return heads;
+        }
+
+        public PharmacyHead GetPharmacyHead(string head)
+        {
+            var phead = _context.PharmacyHeads.Where(x => x.Email.Equals(head)).FirstOrDefault();
+            return phead;
+        }
+
+        public List<Pharmacy> GetPharmacies()
+        {
+            var pharms = _context.Pharmacies.ToList();
+            return pharms;
         }
     }

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -41 +41 @@
         }
 
-        public async Task<IEnumerable<Medicine>> GetMedicines()
-        {
-            var Medicines = await _context.Medicines.Take(3).ToListAsync();
+        public async Task<IEnumerable<Medicine>> GetMedicinesAsync()
+        {
+            var Medicines = await _context.Medicines.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
+
+            }).Take(3).ToListAsync();
             return Medicines;
         }
@@ -205 +215 @@
         public Task UpdateMedicine(Medicine medicine)
         {
-            throw new System.NotImplementedException();
+            throw new NotImplementedException();
         }
 
@@ -227 +237 @@
             return users;
         }
+
+        public User GetRole(string userName)
+        {
+            var user = _context.Users.Where(x => x.Email.Equals(userName)).FirstOrDefault();
+            return user;
+        }
+
+        public ICollection<Medicine> GetMedicines()
+        {
+            var Medicines = _context.Medicines.Select(x => new Medicine
+            {
+                Id = x.Id,
+                Name = x.Name,
+                Strength = x.Strength,
+                Form = x.Form,
+                WayOfIssuing = x.WayOfIssuing,
+                Manufacturer = x.Manufacturer,
+                Price = x.Price,
+                Packaging = x.Packaging,
+                MedicineList = x.MedicineList
+
+            }).ToList();
+            return Medicines;
+        }
+
+        public ICollection<PharmacyHeadMedicine> GetPHMedicines(string email)
+        {
+            var head = _context.PharmacyHeads.Where(x => x.Email.Equals(email)).FirstOrDefault();
+            var phmeds = _context.PharmacyHeadMedicines.Where(x => x.PheadId == head.Id).ToList();
+            return phmeds;
+        }
     }
 }