Index: Farmatiko/Controllers/HealthFacilitiesController.cs
===================================================================
--- Farmatiko/Controllers/HealthFacilitiesController.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Controllers/HealthFacilitiesController.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,7 +1,14 @@
 using FarmatikoData;
 using FarmatikoData.Models;
-using Microsoft.AspNetCore.Cors;
+using FarmatikoServices.FarmatikoServiceInterfaces;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading.Tasks;
 
 namespace Farmatiko.Controllers
@@ -12,13 +19,22 @@
     {
         private IHealthFacilityService _healthFacilitiesService;
-        public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService)
+        private IProcessJSONService _processJSONService;
+        /*private IProcessJSONService _processJSONService;*/
+        private string Path = @"C:\Users\dslez\Desktop\ustanovi.json";
+        public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService, IProcessJSONService processJSONService)
         {
             _healthFacilitiesService = healthFacilitiesService;
+            _processJSONService = processJSONService;
         }
         [HttpGet]
-        public IEnumerable<HealthFacilities> Get()
+        public IQueryable<HealthFacilities> Get()
         {
             return _healthFacilitiesService.GetAll();
         }
+       /* public void Index()
+        
+        {
+            _processJSONService.GetProcessedHealthFacilitiesFromJSON();
+        }*/
     }
 }
Index: Farmatiko/Controllers/HealthcareWorkerController.cs
===================================================================
--- Farmatiko/Controllers/HealthcareWorkerController.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Controllers/HealthcareWorkerController.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -20,5 +17,5 @@
 
         [HttpGet]
-        public IEnumerable<HealthcareWorkers> Get()
+        public IQueryable<HealthcareWorkers> Get()
         {
             return _healthcareWorkerService.GetAll();
Index: Farmatiko/Controllers/MedicineController.cs
===================================================================
--- Farmatiko/Controllers/MedicineController.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Controllers/MedicineController.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -19,8 +16,28 @@
         }
         [HttpGet]
-        public IEnumerable<Medicine> Get()
+        public IQueryable<Medicine> Get()
         {
             return _medicineService.GetAll();
         }
+        /*[HttpPost]
+        public void Add(Medicine medicine)
+        {
+            _medicineService.Add(medicine);
+        }
+        [HttpPost]
+        public void Remove(string Medicine)
+        {
+            _medicineService.Remove(Medicine);
+        }
+        [HttpGet]
+        public IQueryable<Medicine> GetByName(string Name)
+        {
+            return _medicineService.GetByName(Name);
+        }
+        [HttpGet]
+        public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
+        {
+            return _medicineService.GetByManufacturer(Manufacturer);
+        }*/
     }
 }
Index: Farmatiko/Controllers/MedicineListController.cs
===================================================================
--- Farmatiko/Controllers/MedicineListController.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Controllers/MedicineListController.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,3 +1,4 @@
 using System.Collections.Generic;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -16,8 +17,33 @@
         }
         [HttpGet]
-        public IEnumerable<MedicineList> Get()
+        public IQueryable<MedicineList> Get()
         {
             return _medicineListService.GetAll();
         }
+        [HttpGet]
+        public ICollection<MedicineList> GetByName(string Name)
+        {
+            return _medicineListService.GetByName(Name);
+        }
+        [HttpGet]
+        public ICollection<MedicineList> GetByManufacturer(string Manufacturer)
+        {
+            return _medicineListService.GetByManufacturer(Manufacturer);
+        }
+        /*[HttpPost]
+        public void SetHasMedicine(MedicineList medicineList, bool HasMedicine)
+        {
+            _medicineListService.SetHasMedicine(medicineList, HasMedicine);
+        }*/
+        [HttpPost]
+        public void Add(MedicineList medicineList)
+        {
+            _medicineListService.Add(medicineList);
+        }
+        [HttpPost]
+        public void Remove(MedicineList medicineList)
+        {
+            _medicineListService.Remove(medicineList);
+        }
     }
 }
Index: Farmatiko/Controllers/PandemicController.cs
===================================================================
--- Farmatiko/Controllers/PandemicController.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Controllers/PandemicController.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -19,5 +16,5 @@
         }
         [HttpGet]
-        public IEnumerable<Pandemic> Get()
+        public IQueryable<Pandemic> Get()
         {
             return _pandemicService.GetAll();
Index: Farmatiko/Controllers/PharmacyController.cs
===================================================================
--- Farmatiko/Controllers/PharmacyController.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Controllers/PharmacyController.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -19,8 +17,28 @@
         }
         [HttpGet]
-        public IEnumerable<Pharmacy> Get()
+        public IQueryable<Pharmacy> Get()
         {
             return _pharmacyService.GetAll();
         }
+        [HttpGet]
+        public ICollection<Pharmacy> GetPharmacies()
+        {
+            return _pharmacyService.GetPharmacies();
+        }
+        [HttpPost]
+        public void UpdatePharmacy(Pharmacy pharmacy, string Name)
+        {
+            _pharmacyService.UpdatePharmacy(pharmacy,Name);
+        }
+        [HttpPost]
+        public void AddPharmacy(Pharmacy pharmacy)
+        {
+            _pharmacyService.Add(pharmacy);
+        }
+        [HttpPost]
+        public void RemovePharmacy(Pharmacy pharmacy)
+        {
+            _pharmacyService.Remove(pharmacy);
+        }
     }
 }
Index: Farmatiko/Controllers/PharmacyHeadController.cs
===================================================================
--- Farmatiko/Controllers/PharmacyHeadController.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Controllers/PharmacyHeadController.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Linq;
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
@@ -23,4 +20,24 @@
             return _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacy);
         }
+        [HttpGet]
+        public IQueryable<PharmacyHead> GetPharmacyByName(string Name)
+        {
+            return _pharmacyHeadRepository.GetPharmacyByName(Name);
+        }
+        [HttpGet]
+        public IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy)
+        {
+            return _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy);
+        }
+        [HttpPost]
+        public void Add(PharmacyHead pharmacyHead)
+        {
+            _pharmacyHeadRepository.Add(pharmacyHead);
+        }
+        [HttpPost]
+        public void Remove(PharmacyHead pharmacyHead, string Name)
+        {
+            _pharmacyHeadRepository.Remove(pharmacyHead, Name);
+        }
     }
 }
Index: Farmatiko/Startup.cs
===================================================================
--- Farmatiko/Startup.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ Farmatiko/Startup.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -67,4 +67,6 @@
             services.AddTransient<IPharmacyRepository, PharmacyRepository>();
             services.AddTransient<IPharmacyService, PharmacyService>();
+
+            services.AddTransient<IProcessJSONService, ProcessJSONService>();
         }
 
Index: FarmatikoData/FarmatikoData.csproj
===================================================================
--- FarmatikoData/FarmatikoData.csproj	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoData.csproj	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -23,4 +23,5 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
   </ItemGroup>
Index: FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,9 +1,5 @@
 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,12 +17,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);
+        }
     }
 }
Index: FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -2,5 +2,4 @@
 using FarmatikoData.Models;
 using System.Linq;
-using System.Collections.Generic;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -18,9 +17,9 @@
         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,5 +28,6 @@
         public void Remove(HealthcareWorkers healthcareWorker)
         {
-            _context.Remove(healthcareWorker);
+            var healthCareWorker = _context.HealthcareWorkers.Where(x => x.Name.Equals(healthcareWorker.Name));
+            _context.HealthcareWorkers.Remove((HealthcareWorkers)healthCareWorker);
         }
     }
Index: FarmatikoData/FarmatikoRepo/MedicineListRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/MedicineListRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepo/MedicineListRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,3 +1,4 @@
 using FarmatikoData.Models;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,12 +18,14 @@
             _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,5 +36,6 @@
             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,37 +43,12 @@
             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;
-            }
         }
     }
Index: FarmatikoData/FarmatikoRepo/MedicineRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/MedicineRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepo/MedicineRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,5 +1,5 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 
@@ -15,21 +15,21 @@
         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);
         }
 
Index: FarmatikoData/FarmatikoRepo/PandemicRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/PandemicRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepo/PandemicRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,9 +1,5 @@
 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,7 +20,7 @@
         }
 
-        public IEnumerable<Pandemic> GetAll()
+        public IQueryable<Pandemic> GetAll()
         {
-            return _context.Pandemics;
+            return _context.Pandemics.OrderBy(x => x.Name);
         }
 
Index: FarmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,8 +1,5 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -45,5 +42,5 @@
         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();
Index: FarmatikoData/FarmatikoRepo/PharmacyRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/PharmacyRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepo/PharmacyRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,8 +1,6 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -23,5 +21,5 @@
         }
         //Just for users
-        public IEnumerable<Pharmacy> GetAll()
+        public IQueryable<Pharmacy> GetAll()
         {
             return _context.Pharmacies.OrderBy(x => x.Name);
@@ -36,10 +34,10 @@
                 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,5 +46,5 @@
         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);
Index: FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoData.FarmatikoRepoInterfaces
@@ -8,6 +6,7 @@
     public interface IHealthFacilityRepository
     {
-        IEnumerable<HealthFacilities> GetAll();
+        IQueryable<HealthFacilities> GetAll();
         void Add(HealthFacilities healthFacility);
+        void Remove(HealthFacilities healthFacility);
     }
 }
Index: FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoData.FarmatikoRepoInterfaces
@@ -8,5 +6,5 @@
     public interface IHealthcareWorkerRepository
     {
-        IEnumerable<HealthcareWorkers> GetAll();
+        IQueryable<HealthcareWorkers> GetAll();
         void Add(HealthcareWorkers HealthcareWorker);
         void Remove(HealthcareWorkers healthcareWorker);
Index: FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,4 +1,5 @@
 using FarmatikoData.Models;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace FarmatikoData.FarmatikoRepo
@@ -8,11 +9,11 @@
         void Add(MedicineList medicineList);
         void Remove(MedicineList medicineList);
-        IEnumerable<MedicineList> GetAll();
-        //Not needed, maybe later
-        /*MedicineList CheckMedicine(MedicineList medicineList, bool HasMedicine);
-         public MedicineList CheckMedicine(string Name);*/
+        IQueryable<MedicineList> GetAll();
+        /*MedicineList CheckMedicine(MedicineList medicineList, bool HasMedicine);*/
+        //public MedicineList CheckMedicine(string Name);
         ICollection<MedicineList> GetByName(string Name);
         ICollection<MedicineList> GetByManufacturer(string Manufacturer);
-        bool SetHasMedicine(MedicineList medicineList, bool HasMedicine);
+        //bool SetHasMedicine(MedicineList medicineList, bool HasMedicine);
+        //void SetHasMedicine(MedicineList medicineList);        
     }
 }
Index: FarmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoData.FarmatikoRepoInterfaces
@@ -8,9 +6,9 @@
     public interface IMedicineRepository
     {
-        IEnumerable<Medicine> GetAll();
-        IEnumerable<Medicine> GetByName(string Name);
+        IQueryable<Medicine> GetAll();
+        IQueryable<Medicine> GetByName(string Name);
         void Add(Medicine medicine);
         void Remove(string medicine);
-        IEnumerable<Medicine> GetByManufacturer(string Manufacturer);
+        IQueryable<Medicine> GetByManufacturer(string Manufacturer);
 
     }
Index: FarmatikoData/FarmatikoRepoInterfaces/IPandemicRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IPandemicRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepoInterfaces/IPandemicRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoData.FarmatikoRepoInterfaces
@@ -8,5 +6,5 @@
     public interface IPandemicRepository
     {
-        IEnumerable<Pandemic> GetAll();
+        IQueryable<Pandemic> GetAll();
         void Add(Pandemic pandemic);
         void Remove(Pandemic pandemic);
Index: FarmatikoData/FarmatikoRepoInterfaces/IPharmacyHeadRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IPharmacyHeadRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepoInterfaces/IPharmacyHeadRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,7 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoData.FarmatikoRepoInterfaces
Index: FarmatikoData/FarmatikoRepoInterfaces/IPharmacyRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IPharmacyRepository.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/FarmatikoRepoInterfaces/IPharmacyRepository.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,5 @@
 using FarmatikoData.Models;
-using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoData.FarmatikoRepoInterfaces
@@ -10,5 +9,5 @@
         void Add(Pharmacy pharmacy);
         ICollection<Pharmacy> GetPharmacies();
-        IEnumerable<Pharmacy> GetAll();
+        IQueryable<Pharmacy> GetAll();
         void Remove(Pharmacy pharmacy);
         void UpdatePharmacy(Pharmacy pharmacy, string Name);
Index: rmatikoData/Migrations/20200729100744_Second Migration.Designer.cs
===================================================================
--- FarmatikoData/Migrations/20200729100744_Second Migration.Designer.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ 	(revision )
@@ -1,322 +1,0 @@
-// <auto-generated />
-using System;
-using FarmatikoData;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
-
-namespace FarmatikoData.Migrations
-{
-    [DbContext(typeof(FarmatikoDataContext))]
-    [Migration("20200729100744_Second Migration")]
-    partial class SecondMigration
-    {
-        protected override void BuildTargetModel(ModelBuilder modelBuilder)
-        {
-#pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn)
-                .HasAnnotation("ProductVersion", "3.1.6")
-                .HasAnnotation("Relational:MaxIdentifierLength", 63);
-
-            modelBuilder.Entity("FarmatikoData.Models.HealthFacilities", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Address")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DeletedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Municipality")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Phone")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Type")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("HealthFacilities");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Branch")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DeletedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<int>("FacilityId")
-                        .HasColumnType("integer");
-
-                    b.Property<string>("Name")
-                        .IsRequired()
-                        .HasColumnType("text");
-
-                    b.Property<string>("Title")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("FacilityId");
-
-                    b.ToTable("HealthcareWorkers");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.Medicine", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DeletedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<string>("Form")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Manufacturer")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Packaging")
-                        .HasColumnType("text");
-
-                    b.Property<float>("Price")
-                        .HasColumnType("real");
-
-                    b.Property<string>("Strength")
-                        .HasColumnType("text");
-
-                    b.Property<string>("WayOfIssuing")
-                        .HasColumnType("text");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Medicines");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.MedicineList", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DeletedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<bool>("HasMedicine")
-                        .HasColumnType("boolean");
-
-                    b.Property<int?>("MedicineId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("PharmacyHeadId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("MedicineId");
-
-                    b.HasIndex("PharmacyHeadId");
-
-                    b.ToTable("MedicineLists");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.Pandemic", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<long>("ActiveGlobal")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("ActiveMK")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<long>("DeathsGlobal")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("DeathsMK")
-                        .HasColumnType("integer");
-
-                    b.Property<DateTime?>("DeletedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<int>("NewMK")
-                        .HasColumnType("integer");
-
-                    b.Property<long>("TotalGlobal")
-                        .HasColumnType("bigint");
-
-                    b.Property<int>("TotalMK")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.ToTable("Pandemics");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<string>("Address")
-                        .HasColumnType("text");
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DeletedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<string>("Location")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<int?>("PharmacyHeadId")
-                        .HasColumnType("integer");
-
-                    b.Property<bool>("WorkAllTime")
-                        .HasColumnType("boolean");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PharmacyHeadId");
-
-                    b.ToTable("Pharmacies");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b =>
-                {
-                    b.Property<int>("Id")
-                        .ValueGeneratedOnAdd()
-                        .HasColumnType("integer")
-                        .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn);
-
-                    b.Property<DateTime>("CreatedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<DateTime?>("DeletedOn")
-                        .HasColumnType("timestamp without time zone");
-
-                    b.Property<string>("Email")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Name")
-                        .HasColumnType("text");
-
-                    b.Property<string>("Password")
-                        .HasColumnType("text");
-
-                    b.Property<int?>("PharmacyId")
-                        .HasColumnType("integer");
-
-                    b.Property<int?>("PharmacyMedicinesId")
-                        .HasColumnType("integer");
-
-                    b.HasKey("Id");
-
-                    b.HasIndex("PharmacyId");
-
-                    b.HasIndex("PharmacyMedicinesId");
-
-                    b.ToTable("PharmacyHeads");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.HealthcareWorkers", b =>
-                {
-                    b.HasOne("FarmatikoData.Models.HealthFacilities", "Facility")
-                        .WithMany()
-                        .HasForeignKey("FacilityId")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.MedicineList", b =>
-                {
-                    b.HasOne("FarmatikoData.Models.Medicine", "Medicine")
-                        .WithMany()
-                        .HasForeignKey("MedicineId");
-
-                    b.HasOne("FarmatikoData.Models.PharmacyHead", null)
-                        .WithMany("MedicineLists")
-                        .HasForeignKey("PharmacyHeadId");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.Pharmacy", b =>
-                {
-                    b.HasOne("FarmatikoData.Models.PharmacyHead", null)
-                        .WithMany("PharmaciesList")
-                        .HasForeignKey("PharmacyHeadId");
-                });
-
-            modelBuilder.Entity("FarmatikoData.Models.PharmacyHead", b =>
-                {
-                    b.HasOne("FarmatikoData.Models.Pharmacy", "Pharmacy")
-                        .WithMany()
-                        .HasForeignKey("PharmacyId");
-
-                    b.HasOne("FarmatikoData.Models.MedicineList", "PharmacyMedicines")
-                        .WithMany()
-                        .HasForeignKey("PharmacyMedicinesId");
-                });
-#pragma warning restore 612, 618
-        }
-    }
-}
Index: rmatikoData/Migrations/20200729100744_Second Migration.cs
===================================================================
--- FarmatikoData/Migrations/20200729100744_Second Migration.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ 	(revision )
@@ -1,143 +1,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace FarmatikoData.Migrations
-{
-    public partial class SecondMigration : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-           
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropForeignKey(
-                name: "FK_MedicineLists_Medicines_MedicineId",
-                table: "MedicineLists");
-
-            migrationBuilder.DropIndex(
-                name: "IX_MedicineLists_MedicineId",
-                table: "MedicineLists");
-
-            migrationBuilder.DropColumn(
-                name: "MedicineId",
-                table: "MedicineLists");
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "DeletedOn",
-                table: "PharmacyHeads",
-                type: "timestamp without time zone",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "DeletedOn",
-                table: "Pharmacies",
-                type: "timestamp without time zone",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<int>(
-                name: "TotalGlobal",
-                table: "Pandemics",
-                type: "integer",
-                nullable: false,
-                oldClrType: typeof(long));
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "DeletedOn",
-                table: "Pandemics",
-                type: "timestamp without time zone",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<int>(
-                name: "DeathsGlobal",
-                table: "Pandemics",
-                type: "integer",
-                nullable: false,
-                oldClrType: typeof(long));
-
-            migrationBuilder.AlterColumn<int>(
-                name: "ActiveGlobal",
-                table: "Pandemics",
-                type: "integer",
-                nullable: false,
-                oldClrType: typeof(long));
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "DeletedOn",
-                table: "Medicines",
-                type: "timestamp without time zone",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "MedicineListId",
-                table: "Medicines",
-                type: "integer",
-                nullable: true);
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "DeletedOn",
-                table: "MedicineLists",
-                type: "timestamp without time zone",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
-            migrationBuilder.AddColumn<int>(
-                name: "MedicinesId",
-                table: "MedicineLists",
-                type: "integer",
-                nullable: true);
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "DeletedOn",
-                table: "HealthFacilities",
-                type: "timestamp without time zone",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
-            migrationBuilder.AlterColumn<DateTime>(
-                name: "DeletedOn",
-                table: "HealthcareWorkers",
-                type: "timestamp without time zone",
-                nullable: false,
-                oldClrType: typeof(DateTime),
-                oldNullable: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Medicines_MedicineListId",
-                table: "Medicines",
-                column: "MedicineListId");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_MedicineLists_MedicinesId",
-                table: "MedicineLists",
-                column: "MedicinesId");
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_MedicineLists_Medicines_MedicinesId",
-                table: "MedicineLists",
-                column: "MedicinesId",
-                principalTable: "Medicines",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-
-            migrationBuilder.AddForeignKey(
-                name: "FK_Medicines_MedicineLists_MedicineListId",
-                table: "Medicines",
-                column: "MedicineListId",
-                principalTable: "MedicineLists",
-                principalColumn: "Id",
-                onDelete: ReferentialAction.Restrict);
-        }
-    }
-}
Index: FarmatikoData/Models/HealthFacilities.cs
===================================================================
--- FarmatikoData/Models/HealthFacilities.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoData/Models/HealthFacilities.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,3 +1,4 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
Index: FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoData
@@ -8,6 +6,7 @@
     public interface IHealthFacilityService
     {
-        IEnumerable<HealthFacilities> GetAll();
+        IQueryable<HealthFacilities> GetAll();
         void Add(HealthFacilities healthFacility);
+        void Remove(HealthFacilities healthFacility);
     }
 }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -8,8 +6,7 @@
     public interface IHealthcareWorkerService
     {
-        IEnumerable<HealthcareWorkers> GetAll();
+        IQueryable<HealthcareWorkers> GetAll();
         void Add(HealthcareWorkers healthcareWorker);
-        //Not needed
-        /*void Remove(HealthcareWorkers healthcareWorker);*/
+        void Remove(HealthcareWorkers healthcareWorker);
     }
 }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,4 +1,5 @@
 using FarmatikoData.Models;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -6,8 +7,10 @@
     public interface IMedicineListService
     {
-        IEnumerable<MedicineList> GetAll();
-        bool SetHasMedicine(MedicineList medicineList, bool HasMedicine);
+        IQueryable<MedicineList> GetAll();
+        //SetHasMedicine(MedicineList medicineList, bool HasMedicine);
         ICollection<MedicineList> GetByName(string Name);
         ICollection<MedicineList> GetByManufacturer(string Manufacturer);
+        void Add(MedicineList medicineList);
+        void Remove(MedicineList medicineList);
     }
 }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -8,9 +6,9 @@
     public interface IMedicineService
     {
-        IEnumerable<Medicine> GetAll();
+        IQueryable<Medicine> GetAll();
         void Add(Medicine medicine);
         void Remove(string Medicine);
-        IEnumerable<Medicine> GetByName(string Name);
-        IEnumerable<Medicine> GetByManufacturer(string Manufacturer);
+        IQueryable<Medicine> GetByName(string Name);
+        IQueryable<Medicine> GetByManufacturer(string Manufacturer);
     }
 }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IPandemicService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IPandemicService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IPandemicService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -9,5 +7,5 @@
     {
         void Add(Pandemic pandemic);
-        IEnumerable<Pandemic> GetAll();
+        IQueryable<Pandemic> GetAll();
         void Remove(Pandemic pandemic);
     }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyHeadService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyHeadService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyHeadService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,7 +1,4 @@
 using FarmatikoData.Models;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
Index: FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,6 +1,5 @@
 using FarmatikoData.Models;
-using System;
 using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoServices.FarmatikoServiceInterfaces
@@ -10,5 +9,5 @@
         void Add(Pharmacy pharmacy);
         ICollection<Pharmacy> GetPharmacies();
-        IEnumerable<Pharmacy> GetAll();
+        IQueryable<Pharmacy> GetAll();
         void Remove(Pharmacy pharmacy);
         void UpdatePharmacy(Pharmacy pharmacy, string Name);
Index: FarmatikoServices/FarmatikoServiceInterfaces/IProcessJSONService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IProcessJSONService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IProcessJSONService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -0,0 +1,12 @@
+using FarmatikoData.Models;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace FarmatikoServices.FarmatikoServiceInterfaces
+{
+    public interface IProcessJSONService
+    {
+        List<HealthFacilities> GetProcessedHealthFacilitiesFromJSON();
+    }
+}
Index: FarmatikoServices/FarmatikoServices.csproj
===================================================================
--- FarmatikoServices/FarmatikoServices.csproj	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/FarmatikoServices.csproj	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -7,4 +7,5 @@
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="RestSharp" Version="106.11.4" />
   </ItemGroup>
 
Index: FarmatikoServices/Services/HealthFacilityService.cs
===================================================================
--- FarmatikoServices/Services/HealthFacilityService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/Services/HealthFacilityService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -2,5 +2,5 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 
@@ -18,11 +18,34 @@
         public void Add(HealthFacilities healthFacility)
         {
-            _healthFacilityRepository.Add(healthFacility);
+            try
+            {
+                if (healthFacility != null)
+                    _healthFacilityRepository.Add(healthFacility);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't Add health facility is null");
+                throw e;
+            }
         }
 
-        public IEnumerable<HealthFacilities> GetAll()
+        public IQueryable<HealthFacilities> GetAll()
         {
             return _healthFacilityRepository.GetAll();
         }
+
+        public void Remove(HealthFacilities healthFacility)
+        {
+            try
+            {
+                if (healthFacility != null)
+                    _healthFacilityRepository.Remove(healthFacility);
+            } 
+            catch(Exception e)
+            {
+                e = new Exception("Can't Remove health facility is null");
+                throw e;
+            }
+        }
     }
 }
Index: FarmatikoServices/Services/HealthcareWorkerService.cs
===================================================================
--- FarmatikoServices/Services/HealthcareWorkerService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/Services/HealthcareWorkerService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -1,9 +1,7 @@
-using FarmatikoData.FarmatikoRepo;
-using FarmatikoData.FarmatikoRepoInterfaces;
+using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
 using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Linq;
 
 namespace FarmatikoServices.Services
@@ -18,11 +16,34 @@
         public void Add(HealthcareWorkers healthcareWorker)
         {
-            _healthcareWorkerRepo.Add(healthcareWorker);
+            try
+            {
+                if (healthcareWorker != null)
+                    _healthcareWorkerRepo.Add(healthcareWorker);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't Add healthcare worker is null");
+                throw e;
+            }
         }
 
-        public IEnumerable<HealthcareWorkers> GetAll()
+        public IQueryable<HealthcareWorkers> GetAll()
         {
             return _healthcareWorkerRepo.GetAll();
         }
+
+        public void Remove(HealthcareWorkers healthcareWorker)
+        {
+            try
+            {
+                if (healthcareWorker != null)
+                    _healthcareWorkerRepo.Remove(healthcareWorker);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't Remove healthcare worker is null");
+                throw e;
+            }
+        }
     }
 }
Index: FarmatikoServices/Services/MedicineListService.cs
===================================================================
--- FarmatikoServices/Services/MedicineListService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/Services/MedicineListService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -2,5 +2,7 @@
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace FarmatikoServices.Services
@@ -14,5 +16,19 @@
         }
 
-        public IEnumerable<MedicineList> GetAll()
+        public void Add(MedicineList medicineList)
+        {
+            try
+            {
+                if (medicineList != null)
+                    _medicineListRepository.Add(medicineList);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't add the medicine list is null.");
+                throw e;
+            }
+        }
+
+        public IQueryable<MedicineList> GetAll()
         {
             return _medicineListRepository.GetAll();
@@ -21,24 +37,49 @@
         public ICollection<MedicineList> GetByManufacturer(string Manufacturer)
         {
-            return _medicineListRepository.GetByManufacturer(Manufacturer);
+            try
+            {
+                if (Manufacturer != null)
+                {
+
+                    return _medicineListRepository.GetByManufacturer(Manufacturer);
+                }
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't get name of manufacturer is null");
+                throw e;
+            }
+            return null;
         }
 
         public ICollection<MedicineList> GetByName(string Name)
         {
-            if(Name != null)
+            try
             {
-                return _medicineListRepository.GetByName(Name);
+                if (Name != null)
+                {
+                    return _medicineListRepository.GetByName(Name);
+                }
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't get name is null");
+                throw e;
             }
             return null;
         }
 
-        public bool SetHasMedicine(MedicineList medicineList, bool HasMedicine)
+        public void Remove(MedicineList medicineList)
         {
-            if (medicineList != null)
+            try
             {
-                _medicineListRepository.SetHasMedicine(medicineList, HasMedicine);
-                return true;
+                if (medicineList != null)
+                    _medicineListRepository.Remove(medicineList);
             }
-            else return false;
+            catch (Exception e)
+            {
+                e = new Exception("Can't remove the medicine list is null.");
+                throw e;
+            }
         }
     }
Index: FarmatikoServices/Services/MedicineService.cs
===================================================================
--- FarmatikoServices/Services/MedicineService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/Services/MedicineService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -2,5 +2,7 @@
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace FarmatikoServices.Services
@@ -16,25 +18,64 @@
         public void Add(Medicine medicine)
         {
-            _medicineRepository.Add(medicine);
+            try
+            {
+                if (medicine != null)
+                    _medicineRepository.Add(medicine);
+            } 
+            catch (Exception e) 
+            {
+                e = new Exception("Can't Add medicine is null");
+                throw e;
+            }
         }
 
-        public IEnumerable<Medicine> GetAll()
+        public IQueryable<Medicine> GetAll()
         {
             return _medicineRepository.GetAll();
         }
 
-        public IEnumerable<Medicine> GetByManufacturer(string Manufacturer)
+        public IQueryable<Medicine> GetByManufacturer(string Manufacturer)
         {
-            return _medicineRepository.GetByManufacturer(Manufacturer);
+            try
+            {
+                if (Manufacturer != null)
+                    return _medicineRepository.GetByManufacturer(Manufacturer);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't get, name of manufacturer is null");
+                throw e;
+            }
+            
+            return null;
         }
 
-        public IEnumerable<Medicine> GetByName(string Name)
+        public IQueryable<Medicine> GetByName(string Name)
         {
-            return _medicineRepository.GetByName(Name);
+            try
+            {
+                if (Name != null)
+                    return _medicineRepository.GetByName(Name);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't get, name is null");
+            }
+            
+            return null;
         }
 
         public void Remove(string Medicine)
         {
-            _medicineRepository.Remove(Medicine);
+            try
+            {
+                if (Medicine != null)
+                    _medicineRepository.Remove(Medicine);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't Add medicine is null");
+                throw e;
+            }
         }
     }
Index: FarmatikoServices/Services/PandemicService.cs
===================================================================
--- FarmatikoServices/Services/PandemicService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/Services/PandemicService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -3,5 +3,5 @@
 using FarmatikoServices.FarmatikoServiceInterfaces;
 using System;
-using System.Collections.Generic;
+using System.Linq;
 
 namespace FarmatikoServices.Services
@@ -17,8 +17,19 @@
         public void Add(Pandemic pandemic)
         {
-            _pandemicRepository.Add(pandemic);
+            try
+            {
+                if (pandemic != null)
+                {
+                    _pandemicRepository.Add(pandemic);
+                }
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't add pandemic is null.");
+                throw e;
+            }
         }
 
-        public IEnumerable<Pandemic> GetAll()
+        public IQueryable<Pandemic> GetAll()
         {
             return _pandemicRepository.GetAll();
@@ -27,5 +38,13 @@
         public void Remove(Pandemic pandemic)
         {
-            _pandemicRepository.Remove(pandemic);
+            try
+            {
+                if (pandemic != null)
+                    _pandemicRepository.Remove(pandemic);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't remove, pandemic is null.");
+            }
         }
     }
Index: FarmatikoServices/Services/PharmacyHeadService.cs
===================================================================
--- FarmatikoServices/Services/PharmacyHeadService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/Services/PharmacyHeadService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -3,7 +3,5 @@
 using FarmatikoServices.FarmatikoServiceInterfaces;
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
 namespace FarmatikoServices.Services
@@ -19,19 +17,25 @@
         public void Add(PharmacyHead pharmacyHead)
         {
-            if (pharmacyHead != null)
+            try
             {
-                _pharmacyHeadRepository.Add(pharmacyHead);
+                if (pharmacyHead != null)
+                {
+                    _pharmacyHeadRepository.Add(pharmacyHead);
+                }
             }
+            catch (Exception e)
+            {
+                e = new Exception("Can't add, pharmacy head is null.");
+            }
+
         }
 
         public IQueryable<PharmacyHead> GetAllPharmacies(string NameOfPharmacyHead)
         {
-            if(NameOfPharmacyHead != null)
+            if (NameOfPharmacyHead != null)
             {
                 IQueryable<PharmacyHead> Pharmacy = _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacyHead);
                 if (Pharmacy != null)
-                {
                     return Pharmacy;
-                }
             }
             return null;
@@ -40,5 +44,5 @@
         public IQueryable<PharmacyHead> GetPharmacyByName(string Name)
         {
-            if(Name != null)
+            if (Name != null)
             {
                 IQueryable<PharmacyHead> PharmacyHead = _pharmacyHeadRepository.GetPharmacyByName(Name);
@@ -51,5 +55,5 @@
         public IQueryable<MedicineList> GetPharmacyMedicines(string NameOfPharmacy)
         {
-            if(NameOfPharmacy != null)
+            if (NameOfPharmacy != null)
             {
                 IQueryable<MedicineList> Medicines = _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy);
@@ -62,8 +66,16 @@
         public void Remove(PharmacyHead pharmacyHead, string Name)
         {
-            if (pharmacyHead != null && Name != null)
+            try
             {
-                _pharmacyHeadRepository.Remove(pharmacyHead, Name);
+                if (Name != null)
+                {
+                    _pharmacyHeadRepository.Remove(pharmacyHead, Name);
+                }
             }
+            catch (Exception e)
+            {
+                e = new Exception("Can't remove, name of pharmacy head is null.");
+            }
+
         }
     }
Index: FarmatikoServices/Services/PharmacyService.cs
===================================================================
--- FarmatikoServices/Services/PharmacyService.cs	(revision 4e726847651ae8cf85c884b60509bf41812ce49e)
+++ FarmatikoServices/Services/PharmacyService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -2,5 +2,7 @@
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace FarmatikoServices.Services
@@ -15,11 +17,20 @@
         public void Add(Pharmacy pharmacy)
         {
-            if(pharmacy != null)
+            try
             {
-                _pharmacyRepository.Add(pharmacy);
+                if (pharmacy != null)
+                {
+                    _pharmacyRepository.Add(pharmacy);
+                }
             }
+            catch (Exception e)
+            {
+                e = new Exception("Can't add, pharmacy has null value.");
+                throw e;
+            }
+            
         }
 
-        public IEnumerable<Pharmacy> GetAll()
+        public IQueryable<Pharmacy> GetAll()
         {
             return _pharmacyRepository.GetAll();
@@ -33,13 +44,31 @@
         public void Remove(Pharmacy pharmacy)
         {
-            _pharmacyRepository.Remove(pharmacy);
+            try
+            {
+                if (pharmacy != null)
+                    _pharmacyRepository.Remove(pharmacy);
+            }
+            catch (Exception e)
+            {
+                e = new Exception("Can't remove, pharmacy has null value.");
+                throw e;
+            }
         }
 
         public void UpdatePharmacy(Pharmacy pharmacy, string Name)
         {
-            if(pharmacy != null && Name != null)
+            try
             {
-                _pharmacyRepository.UpdatePharmacy(pharmacy, Name);
+                if (pharmacy != null && Name != null)
+                {
+                    _pharmacyRepository.UpdatePharmacy(pharmacy, Name);
+                }
             }
+            catch (Exception e)
+            {
+                e = new Exception("Can not update pharmacy, has null value.");
+                throw e;
+            }
+            
         }
     }
Index: FarmatikoServices/Services/ProcessJSONService.cs
===================================================================
--- FarmatikoServices/Services/ProcessJSONService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
+++ FarmatikoServices/Services/ProcessJSONService.cs	(revision a55ef9155e536ba2c85ff77a58769809e65968f0)
@@ -0,0 +1,80 @@
+using FarmatikoData.FarmatikoRepoInterfaces;
+using FarmatikoData.Models;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using Microsoft.Extensions.Logging;
+using System.Net;
+using System.Linq;
+using FarmatikoServices.FarmatikoServiceInterfaces;
+using RestSharp;
+
+namespace FarmatikoServices.Services
+{
+    public class ProcessJSONService : IProcessJSONService
+    {
+        private IHealthFacilityRepository _healthFacilityRepository;
+        //private readonly ILogger _logger;
+        public ProcessJSONService(IHealthFacilityRepository healthFacilityRepository)
+        {
+            //_logger = logger;
+            _healthFacilityRepository = healthFacilityRepository;
+        }
+        
+        public List<HealthFacilities> GetProcessedHealthFacilitiesFromJSON()
+        {
+            try
+            {
+                var client = new WebClient();
+                var json = client.DownloadString(@"C:\Users\dslez\Desktop\ustanovi.json");
+
+                var jsonResponse = JObject.Parse(json);
+                var records = JArray.Parse(jsonResponse.GetValue("records").ToString());
+
+
+                foreach(var rec in records)
+                {
+                    dynamic obj = JsonConvert.DeserializeObject(rec.ToString());
+                    var Name = obj[2];
+                    var Municipality = obj[6];
+                    var Address = obj[9];
+                    var Email = obj[10];
+                    var Phone = obj[11];
+                    var Type = obj[5];
+                    HealthFacilities healthFacility = new HealthFacilities();
+                    healthFacility.Name = Name;
+                    healthFacility.Municipality = Municipality;
+                    healthFacility.Address = Address;
+                    healthFacility.Email = Email;
+                    healthFacility.Phone = Phone;
+                    healthFacility.Type = Type;
+                    var obje = healthFacility;
+                    _healthFacilityRepository.Add(healthFacility);
+                    
+                }
+
+
+
+                /*var client1 = new RestClient("https://api.covid19api.com/summary");
+                var response = client1.Execute(new RestRequest());
+                string original = response.Content;
+                var jsonResponse = JObject.Parse(original);
+                var global = JObject.Parse(jsonResponse.GetValue("Global").ToString());
+                var total = Int32.Parse(global.GetValue("TotalConfirmed").ToString());
+                Pandemic pandemic = new Pandemic();
+                pandemic.TotalGlobal = total;*/
+
+            }
+            catch (Exception e)
+            {
+                //_logger.LogError(e.Message);
+                Console.WriteLine(e.Message);
+                throw e;
+                return null;
+            }
+            return null;
+        }
+
+    }
+}