Changeset a55ef91 for FarmatikoData/FarmatikoRepo

Timestamp:

07/31/20 10:15:02 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

d8fafb8

Parents:

4e72684

Message:

Update & add service

Location:

FarmatikoData/FarmatikoRepo

Files:

• HealthFacilityRepository.cs (modified) (2 diffs)
• HealthcareWorkerRepository.cs (modified) (3 diffs)
• MedicineListRepository.cs (modified) (4 diffs)
• MedicineRepository.cs (modified) (2 diffs)
• PandemicRepository.cs (modified) (2 diffs)
• PharmacyHeadRepository.cs (modified) (2 diffs)
• PharmacyRepository.cs (modified) (4 diffs)

FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
-using System;
 using System.Linq;
-using System.Collections.Generic;
-using System.Text;
 using FarmatikoData.Models;
-using Microsoft.EntityFrameworkCore;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -21 +17 @@
         {
             _context.Add(healthFacility);
-            _context.SaveChangesAsync();
+            _context.SaveChanges();
         }
 
-        public IEnumerable<HealthFacilities> GetAll()
+        public IQueryable<HealthFacilities> GetAll()
         {
-            return _context.HealthFacilities.OrderBy(x => x.Name).ToList();
+            return _context.HealthFacilities.OrderBy(x => x.Name);
         }
 
+        public void Remove(HealthFacilities healthFacility)
+        {
+            var facility = _context.HealthFacilities.Where(x => x.Name.Equals(healthFacility.Name));
+            _context.HealthFacilities.Remove((HealthFacilities)facility);
+        }
     }
 }

FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs

@@ -2 +2 @@
 using FarmatikoData.Models;
 using System.Linq;
-using System.Collections.Generic;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -18 +17 @@
         public void Add(HealthcareWorkers HealthcareWorker)
         {
-            _context.Add(HealthcareWorker);
+            _context.HealthcareWorkers.Add(HealthcareWorker);
             _context.SaveChangesAsync();
         }
 
-        public IEnumerable<HealthcareWorkers> GetAll()
+        public IQueryable<HealthcareWorkers> GetAll()
         {
             return _context.HealthcareWorkers.OrderBy(x => x.Name);
@@ -29 +28 @@
         public void Remove(HealthcareWorkers healthcareWorker)
         {
-            _context.Remove(healthcareWorker);
+            var healthCareWorker = _context.HealthcareWorkers.Where(x => x.Name.Equals(healthcareWorker.Name));
+            _context.HealthcareWorkers.Remove((HealthcareWorkers)healthCareWorker);
         }
     }

FarmatikoData/FarmatikoRepo/MedicineListRepository.cs

@@ -1 +1 @@
 using FarmatikoData.Models;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
@@ -17 +18 @@
             _context.SaveChangesAsync();
         }
-        public MedicineList CheckMedicine(string Name)
+        /*public MedicineList CheckMedicine(string Name)
         {
             return (MedicineList)_context.MedicineLists
                 .Where(medicineList => medicineList.Medicine.Name.Contains(Name))
-                .OrderBy(x => x.Medicine.Name);
-        }
-
-        public IEnumerable<MedicineList> GetAll()
+                .OrderBy(x => x.Medicine.Name)
+                .Include(x => x.HasMedicine)
+                .Cast<MedicineList>();
+        }*/
+         
+        public IQueryable<MedicineList> GetAll()
         {
             return _context.MedicineLists.OrderBy(x => x.Medicine.Name);
@@ -33 +36 @@
             return (ICollection<MedicineList>)_context.MedicineLists
                 .Where(x => x.Medicine.Manufacturer.Contains(Manufacturer))
-                .OrderBy(x => x.Medicine.Name);
+                .OrderBy(x => x.Medicine.Name)
+                .Cast<ICollection<MedicineList>>();
         }
         public ICollection<MedicineList> GetByName(string Name)
@@ -39 +43 @@
             return (ICollection<MedicineList>)_context.MedicineLists
                 .Where(x => x.Medicine.Name.Contains(Name))
-                .OrderBy(x => x.Medicine.Name);
+                .OrderBy(x => x.Medicine.Name)
+                .Cast<ICollection<MedicineList>>();
         }
 
         public void Remove(MedicineList medicineList)
         {
-            var list = (MedicineList)_context.MedicineLists.Where(x => x.Equals(medicineList));
+            var list = (MedicineList)_context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine));
             _context.MedicineLists.Remove(list);
-        }
-
-        public bool SetHasMedicine(MedicineList medicineList, bool HasMedicine)
-        {
-            MedicineList medicine = (MedicineList)_context.MedicineLists.Where(x => x.Medicine.Name.Equals(medicineList.Medicine.Name));
-            
-            if (medicine != null || medicineList != null)
-            {
-                if (HasMedicine == true)
-                {
-                    medicine.HasMedicine = HasMedicine;
-                    _context.MedicineLists.Add(medicine);
-                    _context.SaveChangesAsync();
-                    return true;
-                }
-                else
-                {
-                    medicine.HasMedicine = HasMedicine;
-                    _context.MedicineLists.Add(medicine);
-                    _context.SaveChangesAsync();
-                    return true;
-                }
-            }else
-            {
-                return false;
-            }
         }
     }

FarmatikoData/FarmatikoRepo/MedicineRepository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 
@@ -15 +15 @@
         public void Add(Medicine Medicine)
         {
-            _context.Add(Medicine);
+            _context.Medicines.Add(Medicine);
             _context.SaveChangesAsync();
         }
 
-        public IEnumerable<Medicine> GetAll()
+        public IQueryable<Medicine> GetAll()
         {
             return _context.Medicines.OrderBy(x => x.Name);
         }
 
-        public IEnumerable<Medicine> GetByManufacturer(string Manufacturer)
+        public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
         {
             return _context.Medicines.Where(x => x.Name.Contains(Manufacturer)).OrderBy(x => x.Manufacturer);
         }
 
-        public IEnumerable<Medicine> GetByName(string Name)
+        public IQueryable<Medicine> GetByName(string Name)
         {
-            return _context.Medicines.Where(medicine => medicine.Name == Name);
+            return _context.Medicines.Where(medicine => medicine.Name.Contains(Name)).OrderBy(x => x.Name);
         }
 

FarmatikoData/FarmatikoRepo/PandemicRepository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -24 +20 @@
         }
 
-        public IEnumerable<Pandemic> GetAll()
+        public IQueryable<Pandemic> GetAll()
         {
-            return _context.Pandemics;
+            return _context.Pandemics.OrderBy(x => x.Name);
         }
 

FarmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -45 +42 @@
         public void Remove(PharmacyHead pharmacyHead, string Name)
         {
-            var phead = (PharmacyHead)_context.PharmacyHeads.Where(phead => phead.Name.Equals(Name));
+            var phead = (PharmacyHead)_context.PharmacyHeads.Where(phead => phead.Name.Equals(Name)).FirstOrDefault();
             _context.PharmacyHeads.Remove(phead);
             _context.SaveChangesAsync();

FarmatikoData/FarmatikoRepo/PharmacyRepository.cs

@@ -1 +1 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -23 +21 @@
         }
         //Just for users
-        public IEnumerable<Pharmacy> GetAll()
+        public IQueryable<Pharmacy> GetAll()
         {
             return _context.Pharmacies.OrderBy(x => x.Name);
@@ -36 +34 @@
                 pharmacy.Location,
                 pharmacy.WorkAllTime
-            });
+            }).OrderBy(x => x.Name);
         }
 
         public void Remove(Pharmacy pharmacy)
         {
-            var pharma = _context.Pharmacies.Where(pharm => pharm.Equals(pharmacy));
+            var pharma = _context.Pharmacies.Where(pharm => pharm.Name.Equals(pharmacy.Name)).Cast<Pharmacy>();
             _context.Pharmacies.Remove((Pharmacy)pharma);
             _context.SaveChangesAsync();
@@ -48 +46 @@
         public void UpdatePharmacy(Pharmacy pharmacy, string Name)
         {
-            var oldPharmacy = _context.Pharmacies.Where(pharma => pharma.Name.Equals(Name));
+            var oldPharmacy = _context.Pharmacies.Where(pharma => pharma.Name.Equals(Name)).Cast<Pharmacy>();
             _context.Pharmacies.Remove((Pharmacy)oldPharmacy);
             _context.Pharmacies.Add(pharmacy);