Changeset 0a694bb for FarmatikoData/FarmatikoRepo

Timestamp:

02/07/21 16:25:56 (4 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

e0cdea2

Parents:

ac51326

Message:

Fix create new user bug.

File:

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

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -71 +71 @@
                 Address = x.Address,
                 WorkAllTime = x.WorkAllTime,
-                PheadId = x.PheadId
+                PheadId = x.PheadId,
+                PharmacyHead = x.PharmacyHead
             }).Take(5).ToListAsync();
             return Pharmacies;
@@ -91 +92 @@
         {
             var SearchQuery = await _context.HealthFacilities
-            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
+            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -100 +101 @@
         {
             var SearchQuery = await _context.Medicines
-            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
+            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -109 +110 @@
         {
             var SearchQuery = await _context.Pharmacies
-            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
+            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -118 +119 @@
         {
             var SearchQuery = await _context.HealthcareWorkers
-            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
+            .Where(x => x.Name.ToLowerInvariant().Contains(query.ToLowerInvariant()))
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -154 +155 @@
             if (pharmacyHead.Id == 0)
             {
-                var pheads = await _context.PharmacyHeads.ToListAsync();
-                if (!pheads.Select(x => x.Equals(pharmacyHead)).FirstOrDefault())
+                var pheads = await _context.PharmacyHeads.Select(x => new PharmacyHead 
+                {
+                    Name = x.Name,
+                    Email = x.Email
+                }).ToListAsync();
+                var pheadusr = pheads.Where(x => x.Email.Equals(pharmacyHead.Email)).ToList();
+                if (pheadusr == null || pheadusr.Count() == 0)
                 {
                     await _context.PharmacyHeads.AddAsync(pharmacyHead);
@@ -285 +291 @@
         }
 
-        public async Task AddUser(User user)
+        public async Task<bool> AddUser(User user)
         {
             if (user.Id == 0)
             {
-                var users = await _context.Users.ToListAsync();
-                if (!users.Select(x => x.Equals(user)).FirstOrDefault())
+                var users = await _context.Users.Select(x => new User
+                {
+                    Name = x.Name,
+                    Email = x.Email,
+                    Password = x.Password,
+                    UserRole = x.UserRole
+                }).ToListAsync();
+                var usr = users.Where(x => x.Email.Equals(user.Email)).ToList();
+                if (usr != null || usr.Count() > 0)
+                {
+                    return true;
+                }
+                else
                 {
                     await _context.Users.AddAsync(user);
                     await _context.SaveChangesAsync();
+                    return true;
                 }
             }
+            return false;
         }
 
         public async Task<List<PharmacyHeadMedicine>> GetAllPHMedicines()
         {
-            var list = await _context.PharmacyHeadMedicines.ToListAsync();
+            var list = await _context.PharmacyHeadMedicines.Select(x => new PharmacyHeadMedicine
+            {
+                PheadId = x.PheadId,
+                Head = x.Head,
+                MedicineId = x.MedicineId,
+                Medicine = x.Medicine
+            }
+            ).ToListAsync();
             return list;
         }