Changeset db484c9 for FarmatikoData/FarmatikoRepo

Timestamp:

01/26/21 10:33:09 (3 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

7d80751

Parents:

8e74e2f

Message:

Fix bugs

Location:

FarmatikoData/FarmatikoRepo

Files:

• AdminRepo.cs (modified) (1 diff)
• PHRepo.cs (modified) (5 diffs)
• Repository.cs (modified) (11 diffs)

FarmatikoData/FarmatikoRepo/AdminRepo.cs

@@ -27 +27 @@
         public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeads()
         {
-            var PHeads = await _context.PharmacyHeads.OrderBy(x => x.Name).ToListAsync();
+            var PHeads = await _context.PharmacyHeads
+                .Include(x => x.Medicines)
+                .Include(x => x.Pharmacies)
+                .OrderBy(x => x.Name)
+                .ToListAsync();
             return PHeads;
         }
         //POST
-        public void RemoveClaimRequest(int Id)
+        public async void RemoveClaimRequest(int Id)
         {
             var req = _context.PHRequests.Where(x => x.Id == Id).FirstOrDefault();
             _context.PHRequests.Remove(req);
-            _context.SaveChanges();
+            await _context.SaveChangesAsync();
         }
     }

FarmatikoData/FarmatikoRepo/PHRepo.cs

@@ -24 +24 @@
         public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo()
         {
-            var PHeadInfo = await _context.PharmacyHeads.Take(10).Where(x => x.DeletedOn == null)
+            var PHeadInfo = await _context.PharmacyHeads.Take(10)
+                .Where(x => x.DeletedOn == null)
                 .Select(x => new PharmacyHead
                 {
@@ -31 +32 @@
                     Email = x.Email,
                     Password = x.Password,
-                    MedicineList = x.MedicineList,
-                    PharmaciesList = x.PharmaciesList
+                    Pharmacies = x.Pharmacies,
+                    Medicines = x.Medicines
+
                 }).ToListAsync();
             return PHeadInfo;
@@ -41 +43 @@
             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;
-            /*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;
+
+            if (!EditedPHead.Email.Equals(pharmacyHead.Email))
+                EditedPHead.Email = pharmacyHead.Email;
+
+            if (!EditedPHead.Name.Equals(pharmacyHead.Name))
+                EditedPHead.Name = pharmacyHead.Name;
+
+            if (!EditedPHead.Password.Equals(pharmacyHead.Password))
+                EditedPHead.Password = pharmacyHead.Password;
+
+            if (!EditedPHead.Pharmacies.Equals(pharmacyHead.Pharmacies))
+                EditedPHead.Pharmacies = pharmacyHead.Pharmacies;
+
+            if (!EditedPHead.Medicines.Equals(pharmacyHead.Medicines))
+                EditedPHead.Medicines = pharmacyHead.Medicines;
+
             await _context.SaveChangesAsync();
         }
@@ -81 +89 @@
         public PharmacyHead GetPharmacyHeadByUserName(string userName)
         {
+
+                       
             var PHead = _context.PharmacyHeads
                 .Where(x => x.Email.Equals(userName))
-                .FirstOrDefault();
+                .Select(x => new PharmacyHead 
+                {
+                   Email = x.Email,
+                   Name = x.Name,
+                   Password = x.Password,
+                   Medicines = x.Medicines,
+                   Pharmacies = x.Pharmacies
+                }).FirstOrDefault();
+
+            
 
             return PHead;
@@ -90 +109 @@
         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();*/
+            var Medicines = _context.PharmacyHeadMedicines.Select(x => new PharmacyHeadMedicine 
+            { 
+                PheadId = x.PheadId,
+                Head = x.Head,
+                MedicineId = x.MedicineId,
+                Medicine = x.Medicine
+            }).ToList();
+            if (Medicines == null || Medicines == default)
+                Medicines = null;
+            var meds = Medicines.Where(x => x.PheadId == Phead.Id).ToList();
 
-
-            return Medicines;
+            return meds;
         }
 

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -86 +86 @@
             var SearchQuery = await _context.HealthFacilities
             .Where(x => x.Name.Contains(query))
-            .OrderBy(x => x.Name).Take(3).ToListAsync();
+            .OrderBy(x => x.Name).ToListAsync();
 
             return SearchQuery;
@@ -95 +95 @@
             var SearchQuery = await _context.Medicines
             .Where(x => x.Name.Contains(query))
-            .OrderBy(x => x.Name).Take(5).ToListAsync();
+            .OrderBy(x => x.Name).ToListAsync();
 
             return SearchQuery;
@@ -104 +104 @@
             var SearchQuery = await _context.Pharmacies.Take(5)
             .Where(x => x.Name.Contains(query))
-            .OrderBy(x => x.Name).Take(5).ToListAsync();
+            .OrderBy(x => x.Name).ToListAsync();
 
             return SearchQuery;
@@ -113 +113 @@
             var SearchQuery = await _context.HealthcareWorkers.Take(5)
             .Where(x => x.Name.Contains(query))
-            .OrderBy(x => x.Name).Take(5).ToListAsync();
+            .OrderBy(x => x.Name).ToListAsync();
 
             return SearchQuery;
@@ -170 +170 @@
             Facility.Phone = healthFacility.Phone;
             Facility.Type = healthFacility.Type;
-            _context.SaveChanges();
+            await _context.SaveChangesAsync();
         }
 
         public async Task RemoveMedicine(Medicine medicine)
         {
-            await Task.Run(() => _context.Medicines.Remove(medicine));
-            _context.SaveChanges();
+            _context.Medicines.Remove(medicine);
+            await _context.SaveChangesAsync();
         }
 
@@ -190 +190 @@
             Pandemic.TotalGlobal = pandemic.TotalGlobal;
             Pandemic.TotalMK = pandemic.TotalMK;
-            _context.SaveChanges();
+            await _context.SaveChangesAsync();
         }
 
         public async Task RemovePharmacy(Pharmacy pharmacy)
         {
-            await Task.Run(() => _context.Pharmacies.Remove(pharmacy));
-            _context.SaveChanges();
+            _context.Pharmacies.Remove(pharmacy);
+            await _context.SaveChangesAsync();
         }
         //not impl
@@ -211 +211 @@
             Pharmacy.WorkAllTime = pharmacy.WorkAllTime;
             Pharmacy.Address = pharmacy.Address;
-            _context.SaveChanges();
-        }
-        //ke vidime
+            await _context.SaveChangesAsync();
+        }
+        //not implemented, not needed 
         public Task UpdateMedicine(Medicine medicine)
         {
@@ -223 +223 @@
             var PHead = await _context.PharmacyHeads.Where(x => x.Id == Id).FirstOrDefaultAsync();
             PHead.DeletedOn = DateTime.UtcNow;
-            _context.SaveChanges();
+            await _context.SaveChangesAsync();
         }
 
@@ -236 +236 @@
                 UserRole = x.UserRole
             });
+            
             return users;
         }
@@ -257 +258 @@
                 Price = x.Price,
                 Packaging = x.Packaging,
-                MedicineList = x.MedicineList
+                Medicines = x.Medicines
 
             }).ToList();
@@ -266 +267 @@
         {
             var head = _context.PharmacyHeads.Where(x => x.Email.Equals(email)).FirstOrDefault();
-            var phmeds = _context.PharmacyHeadMedicines.Where(x => x.PheadId == head.Id).ToList();
+            var phmeds = _context.PharmacyHeadMedicines.Where(x => x.PheadId == head.Id).Include(x => x.Medicine).ToList();
             return phmeds;
         }