Changeset db484c9 for FarmatikoData/FarmatikoRepo/Repository.cs

Timestamp:

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

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

7d80751

Parents:

8e74e2f

Message:

Fix bugs

File:

• FarmatikoData/FarmatikoRepo/Repository.cs (modified) (11 diffs)

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;
         }