Changeset afefe75 for FarmatikoData

Timestamp:

02/04/21 21:46:29 (4 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

ac51326

Parents:

de9d697

Message:

Update searches, fix bugs

Location:

FarmatikoData

Files:

• DTOs/MedicineDTO.cs (added)
• DTOs/PharmacyDTO.cs (added)
• FarmatikoRepo/Repository.cs (modified) (6 diffs)
• FarmatikoRepoInterfaces/IRepository.cs (modified) (1 diff)
• Migrations/20210124191844_InitialMigration.cs (modified) (1 diff)

FarmatikoData/FarmatikoRepo/Repository.cs

@@ -63 +63 @@
             return Pandemic;
         }
-
-        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
-        {
-            var Pharmacies = await _context.Pharmacies.Take(5).ToListAsync();
+        public async Task<List<Pharmacy>> GetPharmacies()
+        {
+            var Pharmacies = await _context.Pharmacies.Select(x => new Pharmacy 
+            {
+                Name = x.Name,
+                Location = x.Location,
+                Address = x.Address,
+                WorkAllTime = x.WorkAllTime,
+                PheadId = x.PheadId
+            }).Take(5).ToListAsync();
             return Pharmacies;
         }
@@ -85 +91 @@
         {
             var SearchQuery = await _context.HealthFacilities
-            .Where(x => x.Name.Contains(query))
+            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -94 +100 @@
         {
             var SearchQuery = await _context.Medicines
-            .Where(x => x.Name.Contains(query))
+            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -102 +108 @@
         public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string query)
         {
-            var SearchQuery = await _context.Pharmacies.Take(5)
-            .Where(x => x.Name.Contains(query))
+            var SearchQuery = await _context.Pharmacies
+            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -111 +117 @@
         public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query)
         {
-            var SearchQuery = await _context.HealthcareWorkers.Take(5)
-            .Where(x => x.Name.Contains(query))
+            var SearchQuery = await _context.HealthcareWorkers
+            .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0)
             .OrderBy(x => x.Name).ToListAsync();
 
@@ -291 +297 @@
             }
         }
+
+        public async Task<List<PharmacyHeadMedicine>> GetAllPHMedicines()
+        {
+            var list = await _context.PharmacyHeadMedicines.ToListAsync();
+            return list;
+        }
     }
 }

FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs

@@ -18 +18 @@
         ICollection<Medicine> GetMedicines();
         Task<Pandemic> GetPandemic();
-        Task<IEnumerable<Pharmacy>> GetPharmacies();
+        Task<List<PharmacyHeadMedicine>> GetAllPHMedicines();
+        Task<List<Pharmacy>> GetPharmacies();
         Task<Pharmacy> GetPharmacy(int id);
         Task<HealthcareWorker> GetWorker(int id);

FarmatikoData/Migrations/20210124191844_InitialMigration.cs

@@ -172 +172 @@
                     CreatedOn = table.Column<DateTime>(nullable: false, defaultValueSql: "now()"),
                     DeletedOn = table.Column<DateTime>(nullable: true),
-                    PheadId = table.Column<int>(nullable: false),
+                    PheadId = table.Column<int>(nullable: true),
                     HeadId = table.Column<int>(nullable: true),
-                    MedicineId = table.Column<int>(nullable: false)
+                    MedicineId = table.Column<int>(nullable: true)
                 },
                 constraints: table =>