Changeset 63d885e for FarmatikoData/FarmatikoRepo

Timestamp:

08/07/20 11:01:25 (4 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

5d02859

Parents:

ee137aa (diff), c406ae5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://develop.finki.ukim.mk/git/farmatiko

Location:

FarmatikoData/FarmatikoRepo

Files:

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

FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs

@@ -16 +16 @@
         public void Add(HealthFacilities healthFacility)
         {
-            _context.Add(healthFacility);
-            _context.SaveChanges();
+             _context.HealthFacilities.Add(healthFacility);
+            _context.SaveChangesAsync();
         }
 
         public IQueryable<HealthFacilities> GetAll()
         {
-            return _context.HealthFacilities.OrderBy(x => x.Name);
+            return _context.HealthFacilities.Take(50).Select(x => new HealthFacilities
+            {
+                Name = x.Name,
+                Municipality = x.Municipality,
+                Address = x.Address,
+                Type = x.Type,
+                Email = x.Email,
+                Phone = x.Phone
+            }).OrderBy(x => x.Name);
+        }
+
+        public IQueryable<HealthFacilities> GetByName(string Name)
+        {
+            return _context.HealthFacilities.Where(x => x.Name.Equals(Name));
         }
 
         public void Remove(HealthFacilities healthFacility)
         {
-            var facility = _context.HealthFacilities.Where(x => x.Name.Equals(healthFacility.Name));
-            _context.HealthFacilities.Remove((HealthFacilities)facility);
+            var facility = _context.HealthFacilities.Where(x => x.Name.Equals(healthFacility.Name)).FirstOrDefault();
+            if (facility != null)
+            {
+                _context.HealthFacilities.Remove(facility);
+                _context.SaveChangesAsync();
+            }
+            
         }
     }

FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs

@@ -2 +2 @@
 using FarmatikoData.Models;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -23 +24 @@
         public IQueryable<HealthcareWorkers> GetAll()
         {
-            return _context.HealthcareWorkers.OrderBy(x => x.Name);
+            return _context.HealthcareWorkers.Take(50).Select(x => new HealthcareWorkers
+            { 
+                Name = x.Name,
+                Branch = x.Branch,
+                Facility = x.Facility,
+                Title = x.Title
+            }).OrderBy(x => x.Name);
         }
 
         public void Remove(HealthcareWorkers healthcareWorker)
         {
-            var healthCareWorker = _context.HealthcareWorkers.Where(x => x.Name.Equals(healthcareWorker.Name));
-            _context.HealthcareWorkers.Remove((HealthcareWorkers)healthCareWorker);
+            var healthCareWorker = _context.HealthcareWorkers.Where(x => x.Name.Equals(healthcareWorker.Name)).FirstOrDefault();
+            if (healthCareWorker != null)
+            {
+                _context.HealthcareWorkers.Remove(healthCareWorker);
+                _context.SaveChangesAsync();
+            }
+            
         }
     }

FarmatikoData/FarmatikoRepo/MedicineListRepository.cs

@@ -29 +29 @@
         public IQueryable<MedicineList> GetAll()
         {
-            return _context.MedicineLists.OrderBy(x => x.Medicine.Name);
+            return _context.MedicineLists.Take(50).Select(x => new MedicineList 
+            { 
+                Medicine = x.Medicine,
+                HasMedicine = x.HasMedicine 
+            }).OrderBy(x => x.Medicine.Name);
         }
 
         public ICollection<MedicineList> GetByManufacturer(string Manufacturer)
         {
-            return (ICollection<MedicineList>)_context.MedicineLists
+            return (ICollection<MedicineList>)_context.MedicineLists.Take(50)
                 .Where(x => x.Medicine.Manufacturer.Contains(Manufacturer))
+                .Select(x => new MedicineList
+                {
+                    Medicine = x.Medicine,
+                    HasMedicine = x.HasMedicine
+                })
                 .OrderBy(x => x.Medicine.Name)
                 .Cast<ICollection<MedicineList>>();
@@ -41 +50 @@
         public ICollection<MedicineList> GetByName(string Name)
         {
-            return (ICollection<MedicineList>)_context.MedicineLists
+            return (ICollection<MedicineList>)_context.MedicineLists.Take(50)
                 .Where(x => x.Medicine.Name.Contains(Name))
+                .Select(x => new MedicineList
+                {
+                    Medicine = x.Medicine,
+                    HasMedicine = x.HasMedicine
+                })
                 .OrderBy(x => x.Medicine.Name)
                 .Cast<ICollection<MedicineList>>();
@@ -49 +63 @@
         public void Remove(MedicineList medicineList)
         {
-            var list = (MedicineList)_context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine));
-            _context.MedicineLists.Remove(list);
+            var list = _context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine)).FirstOrDefault();
+            if (list != null)
+            {
+                _context.MedicineLists.Remove(list);
+                _context.SaveChangesAsync();
+            }
         }
     }

FarmatikoData/FarmatikoRepo/MedicineRepository.cs

@@ -21 +21 @@
         public IQueryable<Medicine> GetAll()
         {
-            return _context.Medicines.OrderBy(x => x.Name);
+            return _context.Medicines.Take(50).Select(x => new Medicine
+            {
+                Name = x.Name,
+                Strength = x.Strength,
+                Form = x.Form,
+                WayOfIssuing = x.WayOfIssuing,
+                Manufacturer = x.Manufacturer,
+                Price = x.Price,
+                Packaging = x.Packaging
+            }).OrderBy(x => x.Name);
         }
 
         public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
         {
-            return _context.Medicines.Where(x => x.Name.Contains(Manufacturer)).OrderBy(x => x.Manufacturer);
+            return _context.Medicines.Take(50).Where(x => x.Name.Contains(Manufacturer))
+                .Select(x => new Medicine
+                {
+                    Name = x.Name,
+                    Strength = x.Strength,
+                    Form = x.Form,
+                    WayOfIssuing = x.WayOfIssuing,
+                    Manufacturer = x.Manufacturer,
+                    Price = x.Price,
+                    Packaging = x.Packaging
+                }).OrderBy(x => x.Manufacturer);
         }
 
         public IQueryable<Medicine> GetByName(string Name)
         {
-            return _context.Medicines.Where(medicine => medicine.Name.Contains(Name)).OrderBy(x => x.Name);
+            return _context.Medicines.Take(50).Where(medicine => medicine.Name.Contains(Name))
+                .Select(x => new Medicine
+                {
+                    Name = x.Name,
+                    Strength = x.Strength,
+                    Form = x.Form,
+                    WayOfIssuing = x.WayOfIssuing,
+                    Manufacturer = x.Manufacturer,
+                    Price = x.Price,
+                    Packaging = x.Packaging
+                }).OrderBy(x => x.Name);
         }
 
-        public void Remove(string medicine)
+        public void Remove(Medicine medicine)
         {
-            Medicine med = (Medicine)_context.Medicines.Where(medicine => medicine.Name.Equals(medicine));
-            _context.Medicines.Remove(med);
+            Medicine med = _context.Medicines.Where(medicine => medicine.Name.Equals(medicine.Name)).FirstOrDefault();
+            if (med != null)
+            {
+                _context.Medicines.Remove(med);
+                _context.SaveChangesAsync();
+            }
+
         }
     }

FarmatikoData/FarmatikoRepo/PandemicRepository.cs

@@ -22 +22 @@
         public IQueryable<Pandemic> GetAll()
         {
-            return _context.Pandemics.OrderBy(x => x.Name);
+            return _context.Pandemics.Select(x => new Pandemic
+            {
+                Name = x.Name,
+                TotalMK = x.TotalMK,
+                ActiveMK = x.ActiveMK,
+                DeathsMK = x.DeathsMK,
+                NewMK = x.NewMK,
+                TotalGlobal = x.TotalGlobal,
+                DeathsGlobal = x.DeathsGlobal,
+                ActiveGlobal = x.ActiveGlobal
+            }).OrderBy(x => x.Name);
         }
 
         public void Remove(Pandemic pandemic)
         {
-            _context.Pandemics.Remove(pandemic);
-            _context.SaveChangesAsync();
+            var Pandem = _context.Pandemics.Where(x => x.Name.Equals(pandemic.Name)).FirstOrDefault();
+            if (Pandem != null)
+            {
+                _context.Pandemics.Remove(Pandem);
+                _context.SaveChangesAsync();
+            }
         }
     }

FarmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs

@@ -22 +22 @@
         public IQueryable<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHeads)
         {
-            return _context.PharmacyHeads
-                .Where(pharmacyHead => pharmacyHead.Name.Contains(NameOfPharmacyHeads))
-                .OrderBy(x => x.Name);
+            return _context.PharmacyHeads.Where(pharmacyHead => pharmacyHead.Name.Contains(NameOfPharmacyHeads))
+                .Take(10).Select(x => new PharmacyHead
+                {
+                    MedicineLists = x.MedicineLists,
+                    PharmaciesList = x.PharmaciesList,
+                    Email = x.Email,
+                    Name = x.Name,
+                }).OrderBy(x => x.Name);
         }
         //Not needed
         public IQueryable<PharmacyHead> GetPharmacyByName(string Name)
         {
-            return _context.PharmacyHeads.Where(pharmacyHead => pharmacyHead.Name.Equals(Name));
+            return _context.PharmacyHeads.Take(10)
+                .Where(pharmacyHead => pharmacyHead.Name.Equals(Name))
+                .Select(x => new PharmacyHead
+                {
+                    MedicineLists = x.MedicineLists,
+                    PharmaciesList = x.PharmaciesList,
+                    Email = x.Email,
+                    Name = x.Name,
+                }).OrderBy(x => x.Name);
         }
 
@@ -35 +48 @@
         {
 
-            IQueryable<MedicineList> Pharmacy = (IQueryable<MedicineList>)_context.PharmacyHeads.Where(x => x.Name.Equals(NameOfPharmacy));
-            
+            IQueryable<MedicineList> Pharmacy = (IQueryable<MedicineList>)_context.PharmacyHeads
+                .Take(50)
+                .Where(x => x.Name.Equals(NameOfPharmacy))
+                .Select(x => new PharmacyHead
+                {
+                    MedicineLists = x.MedicineLists
+                }).OrderBy(x => x.Name);
+
             return Pharmacy;
         }
 
-        public void Remove(PharmacyHead pharmacyHead, string Name)
+        public void Remove(PharmacyHead pharmacyHead)
         {
-            var phead = (PharmacyHead)_context.PharmacyHeads.Where(phead => phead.Name.Equals(Name)).FirstOrDefault();
-            _context.PharmacyHeads.Remove(phead);
-            _context.SaveChangesAsync();
+            var phead = _context.PharmacyHeads.Where(phead => phead.Name.Equals(pharmacyHead.Name)).FirstOrDefault();
+            if (phead != null)
+            {
+                _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;
@@ -18 +19 @@
         {
             _context.Pharmacies.Add(pharmacy);
-            _context.SaveChangesAsync();
+            _context.SaveChanges();
         }
         //Just for users
         public IQueryable<Pharmacy> GetAll()
         {
-            return _context.Pharmacies.OrderBy(x => x.Name);
+            return _context.Pharmacies.Take(50)
+                .Select(x => new Pharmacy
+                {
+                    Name = x.Name,
+                    Location = x.Location,
+                    Address = x.Address,
+                    WorkAllTime = x.WorkAllTime
+                }).OrderBy(x => x.Name);
         }
 
         public ICollection<Pharmacy> GetPharmacies()
         {
-            return (ICollection<Pharmacy>)_context.Pharmacies.Select(pharmacy => new
-            {
-                pharmacy.Name,
-                pharmacy.Address,
-                pharmacy.Location,
-                pharmacy.WorkAllTime
-            }).OrderBy(x => x.Name);
+            return (ICollection<Pharmacy>)_context.Pharmacies.Take(50)
+                .Select(pharmacy => new
+                {
+                    pharmacy.Name,
+                    pharmacy.Address,
+                    pharmacy.Location,
+                    pharmacy.WorkAllTime
+                }).OrderBy(x => x.Name);
         }
 
         public void Remove(Pharmacy pharmacy)
         {
-            var pharma = _context.Pharmacies.Where(pharm => pharm.Name.Equals(pharmacy.Name)).Cast<Pharmacy>();
-            _context.Pharmacies.Remove((Pharmacy)pharma);
-            _context.SaveChangesAsync();
+            var pharma = _context.Pharmacies.Where(pharm => pharm.Name.Equals(pharmacy.Name)).FirstOrDefault();
+            if (pharma != null)
+            {
+                _context.Pharmacies.Remove(pharmacy);
+                _context.SaveChangesAsync();
+            }
         }
 
-        public void UpdatePharmacy(Pharmacy pharmacy, string Name)
+        public void UpdatePharmacy(Pharmacy pharmacy)
         {
-            var oldPharmacy = _context.Pharmacies.Where(pharma => pharma.Name.Equals(Name)).Cast<Pharmacy>();
-            _context.Pharmacies.Remove((Pharmacy)oldPharmacy);
-            _context.Pharmacies.Add(pharmacy);
-            _context.SaveChangesAsync();
+            var oldPharmacy = _context.Pharmacies.Where(pharma => pharma.Name.Equals(pharmacy.Name)).FirstOrDefault();
+            if (oldPharmacy != null)
+            {
+                _context.Pharmacies.Remove(oldPharmacy);
+                _context.Pharmacies.Add(pharmacy);
+                _context.SaveChangesAsync();
+            }
+            throw new Exception("Pharmacy not found");
         }
     }