Index: Farmatiko/ClientApp/src/app/shared/data.service.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/data.service.ts	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ Farmatiko/ClientApp/src/app/shared/data.service.ts	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -160,5 +160,5 @@
     //PharmacyHead POST
     insertPharmacyHead(head: IPharmacyHead) : Observable<IPharmacyHead> {
-        return this.http.post<IPharmacyHead>(this.basePharmacyHead, head)
+        return this.http.post<IPharmacyHead>(this.basePharmacyHead + '/add', head)
                    .pipe(
                         map((data) => {
@@ -189,5 +189,5 @@
     //PharmacyHead DELETE
     deletePharmacyHead(id: string) : Observable<boolean> {
-        return this.http.delete<boolean>(this.basePharmacyHead + '/' + id)
+        return this.http.delete<boolean>(this.basePharmacyHead + '/delete/' + id)
                    .pipe(catchError(this.handleError));
     }
Index: Farmatiko/Controllers/AdminController.cs
===================================================================
--- Farmatiko/Controllers/AdminController.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ Farmatiko/Controllers/AdminController.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -23,5 +23,6 @@
         //GET
         [HttpGet]
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeads()
+        [Route("api/pharmacyhead")]
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeads()
         {
             return await _adminService.GetPharmacyHeads();
@@ -29,7 +30,8 @@
 
         [HttpGet]
-        public async Task<IQueryable<RequestPharmacyHead>> GetClaimingRequests()
+        [Route("api/pharmacyhead/requests")]
+        public async Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests()
         {
-            return await _adminService.GetCalimingRequests();
+            return await _adminService.GetClaimingRequests();
         }
 
@@ -37,4 +39,5 @@
         //POST
         [HttpPost]
+        [Route("api/pharmacyhead/add")]
         public async Task<IActionResult> AddPharmacyHead(PharmacyHead pharmacyHead)
         {
@@ -44,14 +47,15 @@
 
         [HttpPost]
-        public async Task<IActionResult> RemovePharmacyHead(PharmacyHead pharmacyHead)
+        [Route("api/pharmacyhead/delete/{Id}")] 
+        public async Task<IActionResult> RemovePharmacyHead([FromQuery]int Id)
         {
-            await _service.RemovePharmacyHead(pharmacyHead);
+            await _service.RemovePharmacyHead(Id);
             return Ok();
         }
         [HttpPost]
-        public async Task<IActionResult> RejectRequset(RequestPharmacyHead req)
+        public IActionResult RejectRequset(RequestPharmacyHead req)
         {
-            await _adminService.RejectRequest(req);
-            return Ok();
+            bool Success = _adminService.RejectRequest(req);
+            return Ok(Success);
         }
         [HttpPost]
Index: Farmatiko/Controllers/ErrorController.cs
===================================================================
--- Farmatiko/Controllers/ErrorController.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
+++ Farmatiko/Controllers/ErrorController.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Farmatiko.Controllers
+{
+    public class ErrorController : Controller
+    {
+        public IActionResult Index()
+        {
+            return View();
+        }
+    }
+}
Index: Farmatiko/Controllers/FarmatikoController.cs
===================================================================
--- Farmatiko/Controllers/FarmatikoController.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ Farmatiko/Controllers/FarmatikoController.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -1,3 +1,3 @@
-using System.Linq;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using FarmatikoData.Models;
@@ -8,5 +8,4 @@
 {
     [ApiController]
-    [Route("api/[action]")]
     public class FarmatikoController : Controller
     {
@@ -19,6 +18,6 @@
         //Get
         [HttpGet]
-        [Route("/api/workers")]
-        public async Task<IQueryable<HealthcareWorker>> GetWorkers()
+        [Route("api/workers")]
+        public async Task<IEnumerable<HealthcareWorker>> GetWorkers()
         {
             var Workers =  await _service.GetAllWorkers();
@@ -26,11 +25,11 @@
         }
         [HttpGet]
-        [Route("/api/workers/search/{Query}")]
-        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string Query)
+        [Route("api/workers/search/{Query}")]
+        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string Query)
         {
             return await _service.SearchWorkers(Query);
         }
         [HttpGet]
-        [Route("/api/workers/{id}")]
+        [Route("api/workers/{id}")]
         public async Task<HealthcareWorker> GetWorker(int Id)
         {
@@ -43,17 +42,17 @@
         //Get
         [HttpGet]
-        [Route("/api/facilities")]
-        public async Task<IQueryable<HealthFacility>> GetFacilities()
+        [Route("api/facilities")]
+        public async Task<IEnumerable<HealthFacility>> GetFacilities()
         {
             return await _service.GetFacilities();
         }
         [HttpGet]
-        [Route("/api/facilities/search/{Query}")]
-        public async Task<IQueryable<HealthFacility>> SearchFacilities(string Query)
+        [Route("api/facilities/search/{Query}")]
+        public async Task<IEnumerable<HealthFacility>> SearchFacilities(string Query)
         {
             return await _service.SearchFacilities(Query);
         }
         [HttpGet]
-        [Route("/api/facilities/{Id}")]
+        [Route("api/facilities/{Id}")]
         public async Task<HealthFacility> GetFacility(int Id)
         {
@@ -65,26 +64,24 @@
         //Get
         [HttpGet]
-        [Route("/api/medicines")]
-        public async Task<IQueryable<Medicine>> GetMedicines()
+        [Route("api/medicines")]
+        public async Task<IEnumerable<Medicine>> GetMedicines()
         {
             return await _service.GetMedicines();
         }
         [HttpGet]
-        [Route("/api/medicines/search/{Query}")]
-        public async Task<IQueryable<Medicine>> SearchMedicines(string Query)
+        [Route("api/medicines/search/{Query}")]
+        public async Task<IEnumerable<Medicine>> SearchMedicines(string Query)
         {
             return await _service.SearchMedicines(Query);
         }
         [HttpGet]
-        [Route("/api/medicines/{Id}")]
+        [Route("api/medicines/{Id}")]
         public async Task<Medicine> GetMedicine(int Id)
         {
             return await _service.GetMedicine(Id);
         }
-        //POST
-
         //Pandemic
         [HttpGet]
-        [Route("/api/pandemic")]
+        [Route("api/pandemic")]
         public async Task<Pandemic> GetPandemic()
         {
@@ -94,17 +91,17 @@
         //GET
         [HttpGet]
-        [Route("/api/pharmacy")]
-        public async Task<IQueryable<Pharmacy>> GetPharmacies()
+        [Route("api/pharmacy")]
+        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
         {
             return await _service.GetPharmacies();
         }
         [HttpGet]
-        [Route("/api/pharmacy/search/{Query}")]
-        public async Task<IQueryable<Pharmacy>> SearchPharmacies(string Query)
+        [Route("api/pharmacy/search/{Query}")]
+        public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string Query)
         {
             return await _service.SearchPharmacies(Query);
         }
         [HttpGet]
-        [Route("/api/pharmacy/{Id}")]
+        [Route("api/pharmacy/{Id}")]
         public async Task<Pharmacy> GetPharmacy(int Id)
         {
Index: Farmatiko/Controllers/PharmacyHeadController.cs
===================================================================
--- Farmatiko/Controllers/PharmacyHeadController.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ Farmatiko/Controllers/PharmacyHeadController.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -1,3 +1,5 @@
-using System.Linq;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using FarmatikoData.FarmatikoRepoInterfaces;
@@ -9,5 +11,4 @@
 {
     [ApiController]
-    [Route("api/[action]")]
     public class PharmacyHeadController : Controller
     {
@@ -17,28 +18,62 @@
             _PHService = PHService;
         }
-        
+
         //GET
         //Mi trebaat rutite
         [HttpGet]
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo(string Token)
+        [Route("api/pharmacyhead")]
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo(string Token)
         {
-            return await _PHService.GetPharmacyHeadInfo(Token);
+            var PHeads = await _PHService.GetPharmacyHeadInfo(Token);
+            return PHeads;
+        }
+        [HttpGet]
+        [Route("api/pharmacyhead/{Id}")]
+        public async Task<PharmacyHead> GetPharmacyHeadById(int Id)
+        {
+            var Phead = await _PHService.GetPharmacyHeadByIdAsync(Id);
+            return Phead;
         }
         //POST
         [HttpPost]
-        public async Task<int> Login(PharmacyHead pharmacyHead)
+        [Route("api/pharmacyhead/add")]
+        public async Task<IActionResult> AddPharmacyHead(PharmacyHead pharmacyHead)
+        {
+            bool Success = await _PHService.Add(pharmacyHead);
+            return Ok(Success);
+        }
+
+        [HttpPost]
+        [Route("api/pharmacyhead/login")]
+        public async Task<int> Login([FromBody]PharmacyHead pharmacyHead)
         {
             return await _PHService.Login(pharmacyHead);
         }
-        [HttpPost]
-        public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
+        [HttpPut]
+        [Route("api/pharmacyhead/{Id}")]
+        public async Task UpdatePharmacyHead([FromBody]PharmacyHead pharmacyHead)
         {
             await _PHService.UpdatePharmacyHead(pharmacyHead);
         }
         [HttpPost]
+        [Route("api/pharmacyhead/requests")]
         public async Task<IActionResult> ClaimPharmacy(RequestPharmacyHead pharmacy)
         {
-            await _PHService.ClaimPharmacy(pharmacy);
-            return Ok();
+            bool Success = await _PHService.ClaimPharmacy(pharmacy);
+            return Ok(Success);
+        }
+        [HttpDelete]
+        [Route("api/pharmacyhead/delete/{Id}")]
+        public async Task<IActionResult> Remove([FromQuery] int Id)
+        {
+            bool Success = await _PHService.Remove(Id);
+            return Ok(Success);
+        }
+        [HttpPost]
+        [Route("api/pharmacyhead/requests/{Id}")]
+        public async Task<IActionResult> RemoveClaimingRequest([FromQuery] int Id)
+        {
+            bool Success = await _PHService.RemoveClaimingRequest(Id);
+            return Ok(Success);
         }
         
Index: Farmatiko/Startup.cs
===================================================================
--- Farmatiko/Startup.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ Farmatiko/Startup.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -48,24 +48,11 @@
             services.AddEntityFrameworkNpgsql().AddDbContext<FarmatikoDataContext>(opt => opt.UseNpgsql(connectionString));
 
-            services.AddTransient<IHealthFacilityRepository, HealthFacilityRepository>();
-            services.AddTransient<IHealthFacilityService, HealthFacilityService>();
+            services.AddTransient<IPHRepo, PHRepo>();
+            services.AddTransient<IRepository, Repository>();
+            services.AddTransient<IAdminRepo, AdminRepo>();
 
-            services.AddTransient<IHealthcareWorkerRepository, HealthcareWorkerRepository>();
-            services.AddTransient<IHealthcareWorkerService, HealthcareWorkerService>();
-
-            services.AddTransient<IMedicineRepository, MedicineRepository>();
-            services.AddTransient<IMedicineService, MedicineService>();
-
-            services.AddTransient<IMedicineListRepository, MedicineListRepository>();
-            services.AddTransient<IMedicineListService, MedicineListService>();
-
-            services.AddTransient<IPandemicRepository, PandemicRepository>();
-            services.AddTransient<IPandemicService, PandemicService>();
-
-            services.AddTransient<IPharmacyHeadRepository, PharmacyHeadRepository>();
-            services.AddTransient<IPharmacyHeadService, PharmacyHeadService>();
-
-            services.AddTransient<IPharmacyRepository, PharmacyRepository>();
-            services.AddTransient<IPharmacyService, PharmacyService>();
+            services.AddTransient<IPHService, PHService>();
+            services.AddTransient<IAdminService, AdminService>();
+            services.AddTransient<IService, Service>();
 
             services.AddTransient<IProcessJSONService, ProcessJSONService>();
Index: FarmatikoData/FarmatikoRepo/AdminRepo.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/AdminRepo.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoData/FarmatikoRepo/AdminRepo.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -1,4 +1,5 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -17,21 +18,21 @@
         }
 
-        public async Task<IQueryable<RequestPharmacyHead>> GetClaimingRequests()
+        public async Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests()
         {
-            var reqs = await Task.Run(() => _context.PHRequests.OrderBy(x => x.Head.Name));
+            var reqs = await _context.PHRequests.OrderBy(x => x.Head.Name).ToListAsync();
             return reqs;
         }
 
         //GET
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeads()
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeads()
         {
-            var PHeads = await Task.Run(() => _context.PharmacyHeads.OrderBy(x => x.Name));
+            var PHeads = await _context.PharmacyHeads.OrderBy(x => x.Name).ToListAsync();
             return PHeads;
         }
         //POST
-        public async Task RemoveClaimRequest(RequestPharmacyHead req)
+        public void RemoveClaimRequest(RequestPharmacyHead req)
         {
-            await Task.Run(() => _context.PHRequests.Remove(req));
-            await _context.SaveChangesAsync();
+            _context.PHRequests.Remove(req);
+            _context.SaveChanges();
         }
     }
Index: FarmatikoData/FarmatikoRepo/PHRepo.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/PHRepo.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoData/FarmatikoRepo/PHRepo.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -1,8 +1,7 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
-using System;
+using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
@@ -16,26 +15,29 @@
             _context = context;
         }
-
-        public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
+        //GET
+        public async Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id)
         {
-            await Task.Run(() => _context.PHRequests.Add(pharmacy));
-            await _context.SaveChangesAsync();
-        }
-
-        public async Task<PharmacyHead> GetPharmacyHead(PharmacyHead pharmacyHead)
-        {
-            var Phead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Email.Equals(pharmacyHead.Email)).FirstOrDefault());
+            var Phead = await _context.PharmacyHeads.Where(x => x.Id == id).FirstOrDefaultAsync();
             return Phead;
         }
 
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo()
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo()
         {
-            var PHeadInfo = await Task.Run(() => _context.PharmacyHeads.Take(10));
+            var PHeadInfo = await _context.PharmacyHeads.Take(10).Where(x => x.DeletedOn == null)
+                .Select(x => new PharmacyHead
+                {
+                    Id = x.Id,
+                    Name = x.Name,
+                    Email = x.Email,
+                    Password = x.Password,
+                    MedicineLists = x.MedicineLists,
+                    PharmaciesList = x.PharmaciesList
+                }).ToListAsync();
             return PHeadInfo;
         }
-
+        //POST
         public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
         {
-            var EditedPHead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefault());
+            var EditedPHead = await _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefaultAsync();
             EditedPHead.Email = pharmacyHead.Email;
             EditedPHead.Name = pharmacyHead.Name;
@@ -45,4 +47,28 @@
             await _context.SaveChangesAsync();
         }
+        public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
+        {
+            await _context.PHRequests.AddAsync(pharmacy);
+            await _context.SaveChangesAsync();
+        }
+        public async Task Add(PharmacyHead pharmacyHead)
+        {
+            await _context.PharmacyHeads.AddAsync(pharmacyHead);
+            await _context.SaveChangesAsync();
+        }
+
+        public async Task Remove(PharmacyHead phead)
+        {
+            var Phead = await _context.PharmacyHeads.Where(x => x.Id == phead.Id).FirstOrDefaultAsync();
+            Phead.DeletedOn = phead.DeletedOn;
+            await _context.SaveChangesAsync();
+        }
+
+        public async Task RemoveClaimingRequest(int id)
+        {
+            var req = await _context.PHRequests.Where(r => r.Id == id).FirstOrDefaultAsync();
+            _context.PHRequests.Remove(req);
+            await _context.SaveChangesAsync();
+        }
     }
 }
Index: FarmatikoData/FarmatikoRepo/Repository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/Repository.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoData/FarmatikoRepo/Repository.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -1,4 +1,7 @@
 using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,5 +17,5 @@
         }
         //GET
-        public async Task<IQueryable<HealthcareWorker>> GetAllWorkers()
+        public async Task<IEnumerable<HealthcareWorker>> GetAllWorkers()
         {
             var Workers = await Task.Run(() => _context.HealthcareWorkers.Take(10));
@@ -20,5 +23,5 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> GetFacilities()
+        public async Task<IEnumerable<HealthFacility>> GetFacilities()
         {
             var Facilities = await Task.Run(() => _context.HealthFacilities.Take(10));
@@ -38,5 +41,5 @@
         }
 
-        public async Task<IQueryable<Medicine>> GetMedicines()
+        public async Task<IEnumerable<Medicine>> GetMedicines()
         {
             var Medicines = await Task.Run(() => _context.Medicines.Take(10));
@@ -50,5 +53,5 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> GetPharmacies()
+        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
         {
             var Pharmacies = await Task.Run(() => _context.Pharmacies.Take(10));
@@ -68,5 +71,5 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> SearchFacilities(string query)
+        public async Task<IEnumerable<HealthFacility>> SearchFacilities(string query)
         {
             var SearchQuery = await Task.Run(() => _context.HealthFacilities
@@ -77,5 +80,5 @@
         }
 
-        public async Task<IQueryable<Medicine>> SearchMedicines(string query)
+        public async Task<IEnumerable<Medicine>> SearchMedicines(string query)
         {
             var SearchQuery = await Task.Run(() => _context.Medicines
@@ -86,5 +89,5 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> SearchPharmacies(string query)
+        public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string query)
         {
             var SearchQuery = await Task.Run(() => _context.Pharmacies
@@ -95,5 +98,5 @@
         }
 
-        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string query)
+        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query)
         {
             var SearchQuery = await Task.Run(() => _context.HealthcareWorkers
@@ -184,5 +187,5 @@
             await _context.SaveChangesAsync();
         }
-        //ke vidime
+        //not impl
         public Task UpdateWorker(HealthcareWorker worker)
         {
@@ -205,8 +208,8 @@
         }
 
-        public async Task RemovePharmacyHead(PharmacyHead pharmacyHead)
-        {
-            var PHead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefault());
-            PHead.DeletedOn = pharmacyHead.DeletedOn;
+        public async Task RemovePharmacyHead(int Id)
+        {
+            var PHead = await _context.PharmacyHeads.Where(x => x.Id == Id).FirstOrDefaultAsync();
+            PHead.DeletedOn = DateTime.UtcNow;
             await _context.SaveChangesAsync();
         }
Index: FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -10,7 +10,7 @@
     public interface IAdminRepo
     {
-        Task<IQueryable<RequestPharmacyHead>> GetClaimingRequests();
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeads();
-        Task RemoveClaimRequest(RequestPharmacyHead req);
+        Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests();
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeads();
+        void RemoveClaimRequest(RequestPharmacyHead req);
     }
 }
Index: FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -11,7 +11,10 @@
     {
         Task ClaimPharmacy(RequestPharmacyHead pharmacy);
-        Task<PharmacyHead> GetPharmacyHead(PharmacyHead pharmacyHead);
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo();
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo();
         Task UpdatePharmacyHead(PharmacyHead pharmacyHead);
+        Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id);
+        Task Add(PharmacyHead pharmacyHead);
+        Task Remove(PharmacyHead phead);
+        Task RemoveClaimingRequest(int id);
     }
 }
Index: FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -11,17 +11,17 @@
     {
         //GET
-        Task<IQueryable<HealthcareWorker>> GetAllWorkers();
-        Task<IQueryable<HealthFacility>> GetFacilities();
+        Task<IEnumerable<HealthcareWorker>> GetAllWorkers();
+        Task<IEnumerable<HealthFacility>> GetFacilities();
         Task<HealthFacility> GetFacility(int Id);
         Task<Medicine> GetMedicine(int Id);
-        Task<IQueryable<Medicine>> GetMedicines();
+        Task<IEnumerable<Medicine>> GetMedicines();
         Task<Pandemic> GetPandemic();
-        Task<IQueryable<Pharmacy>> GetPharmacies();
+        Task<IEnumerable<Pharmacy>> GetPharmacies();
         Task<Pharmacy> GetPharmacy(int id);
         Task<HealthcareWorker> GetWorker(int id);
-        Task<IQueryable<HealthFacility>> SearchFacilities(string query);
-        Task<IQueryable<Medicine>> SearchMedicines(string query);
-        Task<IQueryable<Pharmacy>> SearchPharmacies(string query);
-        Task<IQueryable<HealthcareWorker>> SearchWorkers(string query);
+        Task<IEnumerable<HealthFacility>> SearchFacilities(string query);
+        Task<IEnumerable<Medicine>> SearchMedicines(string query);
+        Task<IEnumerable<Pharmacy>> SearchPharmacies(string query);
+        Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query);
         Task<HealthFacility> GetFacilityJSON(string healthFacility);
 
@@ -40,5 +40,5 @@
         Task UpadatePharmacy(Pharmacy pharmacy);
         Task UpdateMedicine(Medicine medicine);
-        Task RemovePharmacyHead(PharmacyHead pharmacyHead);
+        Task RemovePharmacyHead(int Id);
     }
 }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IAdminService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IAdminService.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IAdminService.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -10,7 +10,7 @@
     public interface IAdminService
     {
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeads();
-        Task<IQueryable<RequestPharmacyHead>> GetCalimingRequests();
-        Task RejectRequest(RequestPharmacyHead req);
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeads();
+        Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests();
+        bool RejectRequest(RequestPharmacyHead req);
     }
 }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -10,8 +10,12 @@
     public interface IPHService
     {
-        Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo(string Token);
+        Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo(string Token);
         Task UpdatePharmacyHead(PharmacyHead pharmacyHead);
         Task<int> Login(PharmacyHead pharmacyHead);
-        Task ClaimPharmacy(RequestPharmacyHead pharmacy);
+        Task<bool> ClaimPharmacy(RequestPharmacyHead pharmacy);
+        Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id);
+        Task<bool> Add(PharmacyHead pharmacyHead);
+        Task<bool> Remove(int id);
+        Task<bool> RemoveClaimingRequest(int id);
     }
 }
Index: FarmatikoServices/FarmatikoServiceInterfaces/IService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IService.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IService.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -1,3 +1,4 @@
 using FarmatikoData.Models;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -8,17 +9,17 @@
     {
         //GET
-        Task<IQueryable<HealthcareWorker>> GetAllWorkers();
-        Task<IQueryable<HealthcareWorker>> SearchWorkers(string query);
+        Task<IEnumerable<HealthcareWorker>> GetAllWorkers();
+        Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query);
         Task<HealthcareWorker> GetWorker(int id);
-        Task<IQueryable<HealthFacility>> GetFacilities();
-        Task<IQueryable<HealthFacility>> SearchFacilities(string query);
+        Task<IEnumerable<HealthFacility>> GetFacilities();
+        Task<IEnumerable<HealthFacility>> SearchFacilities(string query);
         Task<HealthFacility> GetFacility(int id);
         Task<HealthFacility> GetFacilityJSON(string healthFacility);
         Task<Medicine> GetMedicine(int id);
-        Task<IQueryable<Medicine>> SearchMedicines(string query);
-        Task<IQueryable<Medicine>> GetMedicines();
+        Task<IEnumerable<Medicine>> SearchMedicines(string query);
+        Task<IEnumerable<Medicine>> GetMedicines();
         Task<Pandemic> GetPandemic();
-        Task<IQueryable<Pharmacy>> GetPharmacies();
-        Task<IQueryable<Pharmacy>> SearchPharmacies(string query);
+        Task<IEnumerable<Pharmacy>> GetPharmacies();
+        Task<IEnumerable<Pharmacy>> SearchPharmacies(string query);
         Task<Pharmacy> GetPharmacy(int id);
         //POST
@@ -31,5 +32,5 @@
         Task UpdateFacility(HealthFacility healthFacilities);
         Task RemoveMedicine(Medicine medicine);
-        Task RemovePharmacyHead(PharmacyHead pharmacyHead);
+        Task RemovePharmacyHead(int Id);
         Task UpdatePandemic(Pandemic pandemic);
         Task RemovePharmacy(Pharmacy pharmacy);
Index: FarmatikoServices/FarmatikoServices.csproj
===================================================================
--- FarmatikoServices/FarmatikoServices.csproj	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/FarmatikoServices.csproj	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -6,4 +6,5 @@
 
   <ItemGroup>
+    <PackageReference Include="EPPlus" Version="5.4.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="RestSharp" Version="106.11.4" />
Index: FarmatikoServices/Services/AdminService.cs
===================================================================
--- FarmatikoServices/Services/AdminService.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/Services/AdminService.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -5,5 +5,4 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
@@ -18,19 +17,31 @@
         }
 
-        public async Task<IQueryable<RequestPharmacyHead>> GetCalimingRequests()
+        public async Task<IEnumerable<RequestPharmacyHead>> GetClaimingRequests()
         {
-            var req = await Task.Run(() => _adminRepo.GetClaimingRequests());
-            return req;
+            var req = await _adminRepo.GetClaimingRequests();
+            if (req != null)
+                return req;
+            throw new Exception("No data is found.");
         }
 
-        public async Task<IQueryable<PharmacyHead>> GetPharmacyHeads()
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeads()
         {
-            var PHeads = await Task.Run(() => _adminRepo.GetPharmacyHeads());
-            return PHeads;
+            var PHeads = await _adminRepo.GetPharmacyHeads();
+            var list = PHeads.Select(x => x.DeletedOn == null);
+            if (list != null)
+            {
+                return PHeads;
+            }
+            throw new Exception("No data is found.");
         }
 
-        public async Task RejectRequest(RequestPharmacyHead req)
+        public bool RejectRequest(RequestPharmacyHead req)
         {
-            await _adminRepo.RemoveClaimRequest(req);
+            if (req != null)
+            {
+                _adminRepo.RemoveClaimRequest(req);
+                return true;
+            }
+            return false;
         }
     }
Index: FarmatikoServices/Services/PHService.cs
===================================================================
--- FarmatikoServices/Services/PHService.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/Services/PHService.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -18,17 +18,35 @@
         }
 
-        public async Task ClaimPharmacy(RequestPharmacyHead pharmacy)
+        public async Task<bool> ClaimPharmacy(RequestPharmacyHead pharmacy)
         {
-            await _iPHRepo.ClaimPharmacy(pharmacy);
+            if (pharmacy != null)
+            {
+                await _iPHRepo.ClaimPharmacy(pharmacy);
+                return true;
+            }
+            return false;
         }
 
-        public Task<IQueryable<PharmacyHead>> GetPharmacyHeadInfo(string Token)
+        public async Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id)
         {
-            throw new NotImplementedException();
+            PharmacyHead Phead = null;
+            if (id >= 0)
+                Phead = await _iPHRepo.GetPharmacyHeadByIdAsync(id);
+            if (Phead != null)
+                return Phead;
+            throw new Exception("No data found.");
+        }
+
+        public async Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo(string Token)
+        {
+            var PHeads = await _iPHRepo.GetPharmacyHeadInfo();
+            if (PHeads != null)
+                return PHeads;
+            throw new Exception("No Pharmacy heads found.");
         }
 
         public async Task<int> Login(PharmacyHead pharmacyHead)
         {
-            var PHead = await Task.Run(() => _iPHRepo.GetPharmacyHead(pharmacyHead));
+            var PHead = await _iPHRepo.GetPharmacyHeadByIdAsync(pharmacyHead.Id);
             if (PHead.Password.Equals(pharmacyHead.Password))
                 return PHead.Id;
@@ -43,4 +61,35 @@
             else throw new Exception("PharmacyHead has a null value.");
         }
+        public async Task<bool> Add(PharmacyHead pharmacyHead)
+        {
+            if (pharmacyHead != null)
+            {
+                await _iPHRepo.Add(pharmacyHead);
+                return true;
+            }
+            return false;
+        }
+
+        public async Task<bool> Remove(int id)
+        {
+            PharmacyHead Phead = await _iPHRepo.GetPharmacyHeadByIdAsync(id);
+            if (Phead != null && id >= 0)
+            {
+                Phead.DeletedOn = DateTime.UtcNow;
+                await _iPHRepo.Remove(Phead);
+                return true;
+            }
+            return false;
+        }
+
+        public async Task<bool> RemoveClaimingRequest(int id)
+        {
+            if (id >= 0)
+            {
+                await _iPHRepo.RemoveClaimingRequest(id);
+                return true;
+            }
+            return false;
+        }
     }
 }
Index: FarmatikoServices/Services/ProcessJSONService.cs
===================================================================
--- FarmatikoServices/Services/ProcessJSONService.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/Services/ProcessJSONService.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -29,20 +29,29 @@
         public async Task<Medicine> ReadPharmaciesFromExcel()
         {
-            var client = new WebClient();
-            string Path = client.DownloadString(@"C:\Users\dslez\Desktop\apteki-fzo.xlsx");
-            using (var package = new ExcelPackage(new FileInfo(Path)))
-            {
-                var Sheet = package.Workbook.Worksheets[1];
-                for (int i = 2; i < Sheet.Dimension.End.Row; ++i)
-                {
-                    Pharmacy pharmacy = new Pharmacy()
+            try
+            {
+                var client = new WebClient();
+                string Path = client.DownloadString(@"C:\Users\dslez\Desktop\apteki-fzo.xlsx");
+                using (var package = new ExcelPackage(new FileInfo(Path)))
+                {
+                    var Sheet = package.Workbook.Worksheets[1];
+                    for (int i = 2; i < Sheet.Dimension.End.Row; ++i)
                     {
-                        Name = Sheet.Cells[i, 2].Value.ToString(),
-                        Address = Sheet.Cells[i, 3].Value.ToString(),
-                        Location = Sheet.Cells[i, 4].Value.ToString(),
-                        WorkAllTime = false
-                    };
-                    await _service.AddPharmacy(pharmacy);
-                }
+                        Pharmacy pharmacy = new Pharmacy()
+                        {
+                            Name = Sheet.Cells[i, 2].Value.ToString(),
+                            Address = Sheet.Cells[i, 3].Value.ToString(),
+                            Location = Sheet.Cells[i, 4].Value.ToString(),
+                            WorkAllTime = false
+                        };
+                        await _service.AddPharmacy(pharmacy);
+                    }
+                }
+
+            }
+            catch(Exception e)
+            {
+                _logger.LogInformation(e.Message);
+                throw new Exception("Cannot process Medicines from Excel.");
             }
             return null;
Index: FarmatikoServices/Services/Service.cs
===================================================================
--- FarmatikoServices/Services/Service.cs	(revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb)
+++ FarmatikoServices/Services/Service.cs	(revision 6f203afb65825e725a381cb0a4a623eda9e95e55)
@@ -3,4 +3,5 @@
 using FarmatikoServices.FarmatikoServiceInterfaces;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -17,5 +18,5 @@
 
         //GET
-        public async Task<IQueryable<HealthcareWorker>> GetAllWorkers()
+        public async Task<IEnumerable<HealthcareWorker>> GetAllWorkers()
         {
             var Workers = await _repository.GetAllWorkers();
@@ -23,5 +24,5 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> GetFacilities()
+        public async Task<IEnumerable<HealthFacility>> GetFacilities()
         {
             var Facilities = await _repository.GetFacilities();
@@ -41,5 +42,5 @@
         }
 
-        public async Task<IQueryable<Medicine>> GetMedicines()
+        public async Task<IEnumerable<Medicine>> GetMedicines()
         {
             var Medicines = await _repository.GetMedicines();
@@ -53,5 +54,5 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> GetPharmacies()
+        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
         {
             var Pharmacies = await _repository.GetPharmacies();
@@ -71,5 +72,5 @@
         }
 
-        public async Task<IQueryable<HealthFacility>> SearchFacilities(string query)
+        public async Task<IEnumerable<HealthFacility>> SearchFacilities(string query)
         {
             var SearchQuery = await _repository.SearchFacilities(query);
@@ -77,5 +78,5 @@
         }
 
-        public async Task<IQueryable<Medicine>> SearchMedicines(string query)
+        public async Task<IEnumerable<Medicine>> SearchMedicines(string query)
         {
             var SearchQuery = await _repository.SearchMedicines(query);
@@ -83,5 +84,5 @@
         }
 
-        public async Task<IQueryable<Pharmacy>> SearchPharmacies(string query)
+        public async Task<IEnumerable<Pharmacy>> SearchPharmacies(string query)
         {
             var SearchQuery = await _repository.SearchPharmacies(query);
@@ -89,5 +90,5 @@
         }
 
-        public async Task<IQueryable<HealthcareWorker>> SearchWorkers(string query)
+        public async Task<IEnumerable<HealthcareWorker>> SearchWorkers(string query)
         {
             var SearchQuery = await _repository.SearchWorkers(query);
@@ -202,12 +203,11 @@
         }
 
-        public async Task RemovePharmacyHead(PharmacyHead pharmacyHead)
-        {
-            if (pharmacyHead != null)
+        public async Task RemovePharmacyHead(int Id)
+        {
+            if (Id > 0)
             {
-                pharmacyHead.DeletedOn = DateTime.UtcNow;
-                await _repository.RemovePharmacyHead(pharmacyHead);
+                await _repository.RemovePharmacyHead(Id);
             }
-            else throw new Exception("PharmacyHead is null.");
+            throw new Exception("Index out of bounds.");
         }