Changeset e0cdea2 for FarmatikoData/FarmatikoRepo

Timestamp:

02/08/21 16:39:25 (4 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

8eb1e21, dae4cde

Parents:

0a694bb

Message:

Fix all bugs

Location:

FarmatikoData/FarmatikoRepo

Files:

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

FarmatikoData/FarmatikoRepo/AdminRepo.cs

@@ -20 +20 @@
         public async Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests()
         {
-            var reqs = await _context.PHRequests.OrderBy(x => x.Head.Name).ToListAsync();
+            var reqs = await _context.PHRequests.Select(x => new RequestPharmacyHead 
+            {
+                Head = x.Head,
+                Pharmacy = x.Pharmacy
+            }).OrderBy(x => x.Head.Name).ToListAsync();
             return reqs;
         }
@@ -35 +39 @@
         }
         //POST
-        public async void RemoveClaimRequest(int Id)
+        public void RemoveClaimRequest(RequestPharmacyHead request)
         {
-            var req = _context.PHRequests.Where(x => x.Id == Id).FirstOrDefault();
+            var req = _context.PHRequests.Select(x => new RequestPharmacyHead { Head = x.Head, Pharmacy = x.Pharmacy, Id = x.Id})
+                .Where(x => x.Head.Email.Equals(request.Head.Email)).FirstOrDefault();
             _context.PHRequests.Remove(req);
-            await _context.SaveChangesAsync();
+            _context.SaveChanges();
         }
     }

FarmatikoData/FarmatikoRepo/PHRepo.cs

@@ -41 +41 @@
         public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
         {
-            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();
+            var user = await _context.Users.Where(x => x.Email == pharmacyHead.Email).FirstOrDefaultAsync();
+            var EditedPHead = await _context.PharmacyHeads.Where(x => x.Email.Equals(pharmacyHead.Email)).FirstOrDefaultAsync();
 
-            if (!EditedPHead.Email.Equals(pharmacyHead.Email))
+            /*if (!EditedPHead.Email.Equals(pharmacyHead.Email) && !user.Email.Equals(pharmacyHead.Email))
+            {
                 EditedPHead.Email = pharmacyHead.Email;
+                user.Email = pharmacyHead.Email;
+            }*/
 
-            if (!EditedPHead.Name.Equals(pharmacyHead.Name))
+            if (!EditedPHead.Name.Equals(pharmacyHead.Name) || !user.Name.Equals(pharmacyHead.Name))
+            {
                 EditedPHead.Name = pharmacyHead.Name;
+                user.Name = pharmacyHead.Name;
+            }
 
-            if (!EditedPHead.Password.Equals(pharmacyHead.Password))
+            if (!EditedPHead.Password.Equals(pharmacyHead.Password) || !user.Password.Equals(pharmacyHead.Password))
+            {
                 EditedPHead.Password = pharmacyHead.Password;
+                user.Password = pharmacyHead.Password;
+            }
+            /*if (EditedPHead.Pharmacies != null)
+            {
+                if (EditedPHead.Pharmacies.Count() > 0)
+                    if (!EditedPHead.Pharmacies.Equals(pharmacyHead.Pharmacies))
+                        EditedPHead.Pharmacies = pharmacyHead.Pharmacies;
+            }
+            if (EditedPHead.Medicines != null)
+            {
+                if (EditedPHead.Medicines.Count() > 0)
+                {
+                    if (!EditedPHead.Medicines.Equals(pharmacyHead.Medicines))
+                        EditedPHead.Medicines = pharmacyHead.Medicines;
+                    
+                }
+                    
+            }*/
 
-            if (!EditedPHead.Pharmacies.Equals(pharmacyHead.Pharmacies))
-                EditedPHead.Pharmacies = pharmacyHead.Pharmacies;
-
-            if (!EditedPHead.Medicines.Equals(pharmacyHead.Medicines))
-                EditedPHead.Medicines = pharmacyHead.Medicines;
-
-            await _context.SaveChangesAsync();
+            _context.SaveChanges();
         }
         public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
         {
+            var phead = _context.PharmacyHeads.Where(x => x.Email.Equals(pharmacy.Head.Email)).FirstOrDefault();
+            pharmacy.Head = phead;
             await _context.PHRequests.AddAsync(pharmacy);
             await _context.SaveChangesAsync();

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -19 +19 @@
         public async Task<IEnumerable<HealthcareWorker>> GetAllWorkers()
         {
-            var Workers = await _context.HealthcareWorkers.Take(5).ToListAsync();
+            var Workers = await _context.HealthcareWorkers.Select(x => new HealthcareWorker 
+            { 
+                Id = x.Id,
+                Name = x.Name,
+                Branch = x.Branch,
+                Facility = x.Facility,
+                Title = x.Title
+            }).Take(5).ToListAsync();
             return Workers;
         }
@@ -54 +61 @@
                 Packaging = x.Packaging
 
-            }).Take(3).ToListAsync();
+            }).Take(5).ToListAsync();
             return Medicines;
         }
@@ -92 +99 @@
         {
             var SearchQuery = await _context.HealthFacilities
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            .Where(x => x.Name.ToLower().Contains(query.ToLower())
+            || x.Municipality.ToLower().Contains(query.ToLower())
+            || x.Type.ToLower().Contains(query.ToLower())).Take(5)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -101 +110 @@
         {
             var SearchQuery = await _context.Medicines
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            .Where(x => x.Name.ToLower().Contains(query.ToLower()) 
+            || x.Form.ToLower().Contains(query.ToLower()) 
+            || x.Strength.ToLower().Contains(query.ToLower()) 
+            || x.Packaging.ToLower().Contains(query.ToLower())).Take(20)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -110 +122 @@
         {
             var SearchQuery = await _context.Pharmacies
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            .Where(x => x.Name.ToLower().Contains(query.ToLower())
+            || x.PharmacyHead.Name.ToLower().Contains(query.ToLower())).Take(5)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -118 +131 @@
         public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query)
         {
-            var SearchQuery = await _context.HealthcareWorkers
-            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
+            var SearchQuery = await _context.HealthcareWorkers.Include(x => x.Facility)
+            .Where(x => x.Name.ToLower().Contains(query.ToLower())
+            || x.Facility.Name.ToLower().Contains(query.ToLower())).Take(20)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -146 +160 @@
         public async Task AddPharmacy(Pharmacy pharmacy)
         {
-            await _context.Pharmacies.AddAsync(pharmacy);
-            _context.SaveChanges();
+            pharmacy.Id = 0;
+            if (pharmacy.Id == 0)
+            {
+                var phars = _context.Pharmacies.Select(x => new Pharmacy
+                {
+                    Name = x.Name,
+                    Location = x.Location,
+                    Address = x.Address
+                }).ToList();
+                var pharms = phars.Where(x => x.Name.Equals(pharmacy.Name) && x.Location.Equals(pharmacy.Location) && x.Address.Equals(pharmacy.Address)).ToList();
+                if (pharms is null || pharms.Count() == 0)
+                {
+                    await _context.Pharmacies.AddAsync(pharmacy);
+                    _context.SaveChanges();
+                }
+                
+            }
         }
 
@@ -242 +271 @@
         {
             var PHead = await _context.PharmacyHeads.Where(x => x.Id == Id).FirstOrDefaultAsync();
-            PHead.DeletedOn = DateTime.UtcNow;
-            await _context.SaveChangesAsync();
+            var user = await _context.Users.Where(x => x.Email.Equals(PHead.Email)).FirstOrDefaultAsync();
+            _context.PharmacyHeads.Remove(PHead);
+            _context.Users.Remove(user);
+            _context.SaveChanges();
         }
 
@@ -290 +321 @@
             return phmeds;
         }
-
-        public async Task<bool> AddUser(User user)
+        
+        /*public async Task<bool> AddUser(User user)
         {
             if (user.Id == 0)
@@ -303 +334 @@
                 }).ToListAsync();
                 var usr = users.Where(x => x.Email.Equals(user.Email)).ToList();
-                if (usr != null || usr.Count() > 0)
+                if (usr != null && usr.Count() > 0)
                 {
                     return true;
@@ -315 +346 @@
             }
             return false;
-        }
+        }*/
 
         public async Task<List<PharmacyHeadMedicine>> GetAllPHMedicines()
@@ -329 +360 @@
             return list;
         }
+
+        public ICollection<PharmacyHeadMedicine> GetPHMedicines()
+        {
+            var meds = _context.PharmacyHeadMedicines.Select(x => new PharmacyHeadMedicine
+            {
+                PheadId = x.PheadId,
+                Head = x.Head,
+                MedicineId = x.MedicineId,
+                Medicine = x.Medicine
+            }).ToList();
+            return meds;
+        }
     }
 }