Changes in / [6e6f04b:dae4cde]

Files:

• FarmatikoData/FarmatikoRepo/PHRepo.cs (modified) (2 diffs)
• FarmatikoData/FarmatikoRepo/Repository.cs (modified) (1 diff)
• FarmatikoServices/Services/PHService.cs (modified) (4 diffs)

FarmatikoData/FarmatikoRepo/PHRepo.cs

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

FarmatikoServices/Services/PHService.cs

@@ -86 +86 @@
                     if (!pharmacyHead.Medicines.Equals(PHMedicines))
                     {
-                        /*
-                         * USELESS
-                         * if (pharmacyHead.Medicines.Count() == 0)
+                        //phead.Medicines = pharmacyHead.Medicines;
+                        if (pharmacyHead.Medicines.Count() == 0)
                         {
                             phead.Medicines = null;
@@ -96 +95 @@
                             _iPHRepo.DeletePHMedicine(PHMId, phId, medId);
                             return;
-                        }*/
+                        }
                         if (phead.Medicines != null && phead.Medicines.Count() > 0)
                         {
@@ -120 +119 @@
                                     Medicine = medicine
                                 };
-
+                                
                                 bool ifExists = phead.Medicines.Contains(phm);
                                 if (!ifExists)
@@ -154 +153 @@
                     }
                 }
+
                 PharmacyHead head = new PharmacyHead()
                 {
                     Name = pharmacyHead.Name,
                     Email = pharmacyHead.Email,
-                    Password = pharmacyHead.Password,
-                    Medicines = phead.Medicines,
-                    Pharmacies = phead.Pharmacies
+                    Password = pharmacyHead.Password
                 };
-                if (!phead.Name.Equals(head.Name) && !phead.Password.Equals(head.Email))
+
+                if (pharmacyHead.Pharmacies != null)
+                {
+                    if (pharmacyHead.Pharmacies.Count() > 0)
+                    {
+                        phead.Pharmacies = pharmacyHead.Pharmacies;
+                        head.Pharmacies = pharmacyHead.Pharmacies;
+                    }
+                }
+                
+                if (!phead.Equals(head))
                 {
                     await _iPHRepo.UpdatePharmacyHead(head);
                 }
-                List<Pharmacy> pharmacies = new List<Pharmacy>();
-                pharmacies = phead.Pharmacies;
-                if (head.Pharmacies != null && pharmacyHead.Pharmacies != null)
-                {
-                    if (head.Pharmacies.Count() > 0 && pharmacyHead.Pharmacies.Count() > 0)
-                    {
-                        foreach (var pharmacy in pharmacyHead.Pharmacies)
-                        {
-                            if (!head.Pharmacies.Contains(pharmacy))
-                            {
-                                pharmacy.PheadId = phead.Id;
-                                pharmacy.PharmacyHead = phead;
-                                pharmacies.Add(pharmacy);
-                            }
-                        }
-                        head.Pharmacies = pharmacies;
-                        await _iPHRepo.UpdatePharmacyHead(head);
-                    }
-                }
-            }
-            else throw new Exception("Cannot update pharmacy head since there was no changes.");
+                else throw new Exception("Cannot update pharmacy head since there was no changes.");
+            }
+            else throw new Exception("PharmacyHead has a null value.");
         }
         public async Task<bool> Add(PharmacyHeadDto pharmacyHead)