Changeset 8eb1e21 for FarmatikoData

Timestamp:

02/11/21 03:49:55 (4 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

6e6f04b

Parents:

e0cdea2

Message:

Fix delete pharmacy head method.

Location:

FarmatikoData/FarmatikoRepo

Files:

• PHRepo.cs (modified) (2 diffs)
• Repository.cs (modified) (1 diff)

FarmatikoData/FarmatikoRepo/PHRepo.cs

@@ -61 +61 @@
                 user.Password = pharmacyHead.Password;
             }
-            /*if (EditedPHead.Pharmacies != null)
+            foreach(var pharmacy in pharmacyHead.Pharmacies)
             {
-                if (EditedPHead.Pharmacies.Count() > 0)
-                    if (!EditedPHead.Pharmacies.Equals(pharmacyHead.Pharmacies))
-                        EditedPHead.Pharmacies = pharmacyHead.Pharmacies;
+                if (!EditedPHead.Pharmacies.Contains(pharmacy))
+                {
+                    pharmacy.PheadId = EditedPHead.Id;
+                    pharmacy.PharmacyHead = EditedPHead;
+                    EditedPHead.Pharmacies.Add(pharmacy);
+                }
             }
-            if (EditedPHead.Medicines != null)
-            {
-                if (EditedPHead.Medicines.Count() > 0)
-                {
-                    if (!EditedPHead.Medicines.Equals(pharmacyHead.Medicines))
-                        EditedPHead.Medicines = pharmacyHead.Medicines;
-                    
-                }
-                    
-            }*/
-
+            _context.Entry(EditedPHead).State = EntityState.Modified;
+            
             _context.SaveChanges();
         }
@@ -153 +147 @@
         public PharmacyHead GetPharmacyHead(string head)
         {
-            var phead = _context.PharmacyHeads.Where(x => x.Email.Equals(head)).FirstOrDefault();
+            var phead = _context.PharmacyHeads.Where(x => x.Email.Equals(head)).Include(x => x.Pharmacies).FirstOrDefault();
             return phead;
         }

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -270 +270 @@
         public async Task RemovePharmacyHead(int Id)
         {
-            var PHead = await _context.PharmacyHeads.Where(x => x.Id == Id).FirstOrDefaultAsync();
+            var PHead = await _context.PharmacyHeads.Where(x => x.Id == Id).Include(x => x.Pharmacies).Include(x => x.Medicines).FirstOrDefaultAsync();
             var user = await _context.Users.Where(x => x.Email.Equals(PHead.Email)).FirstOrDefaultAsync();
+            var PHreqs = await _context.PHRequests.Where(x => x.Head.Id.Equals(PHead.Id)).FirstOrDefaultAsync();
+            PHead.Pharmacies.Select(x => x.PheadId = null);
+            //PHead.Pharmacies.Select(x => x.PharmacyHead = null);
+            _context.PHRequests.Remove(PHreqs);
             _context.PharmacyHeads.Remove(PHead);
             _context.Users.Remove(user);