Index: Farmatiko/ClientApp/src/app/admin/admin.component.ts =================================================================== --- Farmatiko/ClientApp/src/app/admin/admin.component.ts (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ Farmatiko/ClientApp/src/app/admin/admin.component.ts (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -123,5 +123,5 @@ this.dataService.updatePharmacyHead(req.PharmacyHead) .subscribe(() => { - + this.rejectRequest(req); }, (err: any) => console.log(err), Index: Farmatiko/Controllers/AdminController.cs =================================================================== --- Farmatiko/Controllers/AdminController.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ Farmatiko/Controllers/AdminController.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; +using Microsoft.AspNetCore.Mvc; + +namespace Farmatiko.Controllers +{ + public class AdminController : Controller + { + private readonly IAdminService _adminService; + private readonly IService _service; + private readonly IPHService _phservice; + public AdminController(IAdminService adminService, IService service, IPHService phservice) + { + _adminService = adminService; + _service = service; + _phservice = phservice; + } + + //GET + [HttpGet] + public async Task> GetPharmacyHeads() + { + return await _adminService.GetPharmacyHeads(); + } + + [HttpGet] + public async Task> GetClaimingRequests() + { + return await _adminService.GetCalimingRequests(); + } + + + //POST + [HttpPost] + public async Task AddPharmacyHead(PharmacyHead pharmacyHead) + { + await _service.AddPharmacyHead(pharmacyHead); + return Ok(); + } + + [HttpPost] + public async Task RemovePharmacyHead(PharmacyHead pharmacyHead) + { + await _service.RemovePharmacyHead(pharmacyHead); + return Ok(); + } + [HttpPost] + public async Task RejectRequset(RequestPharmacyHead req) + { + await _adminService.RejectRequest(req); + return Ok(); + } + [HttpPost] + public async Task ApproveRequest(PharmacyHead pharmacyHead) + { + await _phservice.UpdatePharmacyHead(pharmacyHead); + return Ok(); + } + + } +} Index: Farmatiko/Controllers/FarmatikoController.cs =================================================================== --- Farmatiko/Controllers/FarmatikoController.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ Farmatiko/Controllers/FarmatikoController.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -20,11 +20,12 @@ [HttpGet] [Route("/api/workers")] - public async Task> GetWorkers() + public async Task> GetWorkers() { - return await _service.GetAllWorkers(); + var Workers = await _service.GetAllWorkers(); + return Workers; } [HttpGet] [Route("/api/workers/search/{Query}")] - public async Task> SearchWorkers(string Query) + public async Task> SearchWorkers(string Query) { return await _service.SearchWorkers(Query); @@ -32,5 +33,5 @@ [HttpGet] [Route("/api/workers/{id}")] - public async Task GetWorker(int Id) + public async Task GetWorker(int Id) { return await _service.GetWorker(Id); @@ -43,5 +44,5 @@ [HttpGet] [Route("/api/facilities")] - public async Task> GetFacilities() + public async Task> GetFacilities() { return await _service.GetFacilities(); @@ -49,5 +50,5 @@ [HttpGet] [Route("/api/facilities/search/{Query}")] - public async Task> SearchFacilities(string Query) + public async Task> SearchFacilities(string Query) { return await _service.SearchFacilities(Query); @@ -55,5 +56,5 @@ [HttpGet] [Route("/api/facilities/{Id}")] - public async Task GetFacility(int Id) + public async Task GetFacility(int Id) { return await _service.GetFacility(Id); Index: Farmatiko/Controllers/PharmacyHeadController.cs =================================================================== --- Farmatiko/Controllers/PharmacyHeadController.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ Farmatiko/Controllers/PharmacyHeadController.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -1,5 +1,7 @@ using System.Linq; +using System.Threading.Tasks; using FarmatikoData.FarmatikoRepoInterfaces; using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; using Microsoft.AspNetCore.Mvc; @@ -10,34 +12,35 @@ public class PharmacyHeadController : Controller { - private readonly IPharmacyHeadRepository _pharmacyHeadRepository; - public PharmacyHeadController(IPharmacyHeadRepository pharmacyHeadRepository) + private readonly IPHService _PHService; + public PharmacyHeadController(IPHService PHService) { - _pharmacyHeadRepository = pharmacyHeadRepository; + _PHService = PHService; } + + //GET + //Mi trebaat rutite [HttpGet] - public IQueryable GetAllPharmacies(string NameOfPharmacy) + public async Task> GetPharmacyHeadInfo(string Token) { - return _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacy); + return await _PHService.GetPharmacyHeadInfo(Token); } - [HttpGet] - public IQueryable GetPharmacyByName(string Name) + //POST + [HttpPost] + public async Task Login(PharmacyHead pharmacyHead) { - return _pharmacyHeadRepository.GetPharmacyByName(Name); - } - [HttpGet] - public IQueryable GetPharmacyMedicines(string NameOfPharmacy) - { - return _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy); + return await _PHService.Login(pharmacyHead); } [HttpPost] - public void Add(PharmacyHead pharmacyHead) + public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead) { - _pharmacyHeadRepository.Add(pharmacyHead); + await _PHService.UpdatePharmacyHead(pharmacyHead); } [HttpPost] - public void Remove(PharmacyHead pharmacyHead) + public async Task ClaimPharmacy(RequestPharmacyHead pharmacy) { - _pharmacyHeadRepository.Remove(pharmacyHead); + await _PHService.ClaimPharmacy(pharmacy); + return Ok(); } + } } Index: Farmatiko/Controllers/SystemController.cs =================================================================== --- Farmatiko/Controllers/SystemController.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ Farmatiko/Controllers/SystemController.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +namespace Farmatiko.Controllers +{ + public class SystemController : Controller + { + + } +} Index: Farmatiko/appsettings.json =================================================================== --- Farmatiko/appsettings.json (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ Farmatiko/appsettings.json (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -10,4 +10,9 @@ } }, + "EPPlus": { + "ExcelPackage": { + "LicenseContext": "NonCommercial" + } + }, "AllowedHosts": "*" } Index: FarmatikoData/FarmatikoDataContext.cs =================================================================== --- FarmatikoData/FarmatikoDataContext.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoData/FarmatikoDataContext.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -9,6 +9,6 @@ - public virtual DbSet HealthFacilities { get; set; } - public virtual DbSet HealthcareWorkers { get; set; } + public virtual DbSet HealthFacilities { get; set; } + public virtual DbSet HealthcareWorkers { get; set; } public virtual DbSet Pharmacies { get; set; } public virtual DbSet PharmacyHeads { get; set; } @@ -16,5 +16,5 @@ public virtual DbSet Medicines { get; set; } public virtual DbSet MedicineLists { get; set; } - + public virtual DbSet PHRequests { get; set; } } } Index: FarmatikoData/FarmatikoRepo/AdminRepo.cs =================================================================== --- FarmatikoData/FarmatikoRepo/AdminRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoData/FarmatikoRepo/AdminRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,38 @@ +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoData.FarmatikoRepo +{ + public class AdminRepo : IAdminRepo + { + private readonly FarmatikoDataContext _context; + public AdminRepo(FarmatikoDataContext context) + { + _context = context; + } + + public async Task> GetClaimingRequests() + { + var reqs = await Task.Run(() => _context.PHRequests.OrderBy(x => x.Head.Name)); + return reqs; + } + + //GET + public async Task> GetPharmacyHeads() + { + var PHeads = await Task.Run(() => _context.PharmacyHeads.OrderBy(x => x.Name)); + return PHeads; + } + //POST + public async Task RemoveClaimRequest(RequestPharmacyHead req) + { + await Task.Run(() => _context.PHRequests.Remove(req)); + await _context.SaveChangesAsync(); + } + } +} Index: rmatikoData/FarmatikoRepo/HealthFacilityRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/HealthFacilityRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,51 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using System.Linq; -using FarmatikoData.Models; - -namespace FarmatikoData.FarmatikoRepo -{ - public class HealthFacilityRepository : IHealthFacilityRepository - { - private FarmatikoDataContext _context; - - public HealthFacilityRepository(FarmatikoDataContext context) - { - _context = context; - } - - public void Add(HealthFacilities healthFacility) - { - _context.HealthFacilities.Add(healthFacility); - _context.SaveChangesAsync(); - } - - public IQueryable GetAll() - { - return _context.HealthFacilities.Take(50).Select(x => new HealthFacilities - { - Name = x.Name, - Municipality = x.Municipality, - Address = x.Address, - Type = x.Type, - Email = x.Email, - Phone = x.Phone - }).OrderBy(x => x.Name); - } - - public IQueryable GetByName(string Name) - { - return _context.HealthFacilities.Where(x => x.Name.Equals(Name)); - } - - public void Remove(HealthFacilities healthFacility) - { - var facility = _context.HealthFacilities.Where(x => x.Name.Equals(healthFacility.Name)).FirstOrDefault(); - if (facility != null) - { - _context.HealthFacilities.Remove(facility); - _context.SaveChangesAsync(); - } - - } - } -} Index: rmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/HealthcareWorkerRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,46 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoData.FarmatikoRepo -{ - public class HealthcareWorkerRepository : IHealthcareWorkerRepository - { - - private FarmatikoDataContext _context; - - public HealthcareWorkerRepository(FarmatikoDataContext context) - { - _context = context; - } - - public void Add(HealthcareWorkers HealthcareWorker) - { - _context.HealthcareWorkers.Add(HealthcareWorker); - _context.SaveChangesAsync(); - } - - public IQueryable GetAll() - { - return _context.HealthcareWorkers.Take(50).Select(x => new HealthcareWorkers - { - Name = x.Name, - Branch = x.Branch, - Facility = x.Facility, - Title = x.Title - }).OrderBy(x => x.Name); - } - - public void Remove(HealthcareWorkers healthcareWorker) - { - var healthCareWorker = _context.HealthcareWorkers.Where(x => x.Name.Equals(healthcareWorker.Name)).FirstOrDefault(); - if (healthCareWorker != null) - { - _context.HealthcareWorkers.Remove(healthCareWorker); - _context.SaveChangesAsync(); - } - - } - } -} Index: rmatikoData/FarmatikoRepo/MedicineListRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/MedicineListRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,73 +1,0 @@ -using FarmatikoData.Models; -using Microsoft.EntityFrameworkCore; -using System.Collections.Generic; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepo -{ - public class MedicineListRepository : IMedicineListRepository - { - private FarmatikoDataContext _context; - public MedicineListRepository(FarmatikoDataContext context) - { - _context = context; - } - public void Add(MedicineList medicineList) - { - _context.MedicineLists.Add(medicineList); - _context.SaveChangesAsync(); - } - /*public MedicineList CheckMedicine(string Name) - { - return (MedicineList)_context.MedicineLists - .Where(medicineList => medicineList.Medicine.Name.Contains(Name)) - .OrderBy(x => x.Medicine.Name) - .Include(x => x.HasMedicine) - .Cast(); - }*/ - - public IQueryable GetAll() - { - return _context.MedicineLists.Take(50).Select(x => new MedicineList - { - Medicine = x.Medicine, - HasMedicine = x.HasMedicine - }).OrderBy(x => x.Medicine.Name); - } - - public ICollection GetByManufacturer(string Manufacturer) - { - return (ICollection)_context.MedicineLists.Take(50) - .Where(x => x.Medicine.Manufacturer.Contains(Manufacturer)) - .Select(x => new MedicineList - { - Medicine = x.Medicine, - HasMedicine = x.HasMedicine - }) - .OrderBy(x => x.Medicine.Name) - .Cast>(); - } - public ICollection GetByName(string Name) - { - return (ICollection)_context.MedicineLists.Take(50) - .Where(x => x.Medicine.Name.Contains(Name)) - .Select(x => new MedicineList - { - Medicine = x.Medicine, - HasMedicine = x.HasMedicine - }) - .OrderBy(x => x.Medicine.Name) - .Cast>(); - } - - public void Remove(MedicineList medicineList) - { - var list = _context.MedicineLists.Where(x => x.Medicine.Equals(medicineList.Medicine)).FirstOrDefault(); - if (list != null) - { - _context.MedicineLists.Remove(list); - _context.SaveChangesAsync(); - } - } - } -} Index: rmatikoData/FarmatikoRepo/MedicineRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/MedicineRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,76 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using System; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepo -{ - public class MedicineRepository : IMedicineRepository - { - private FarmatikoDataContext _context; - public MedicineRepository(FarmatikoDataContext context) - { - _context = context; - } - public void Add(Medicine Medicine) - { - _context.Medicines.Add(Medicine); - _context.SaveChangesAsync(); - } - - public IQueryable GetAll() - { - return _context.Medicines.Take(50).Select(x => new Medicine - { - Name = x.Name, - Strength = x.Strength, - Form = x.Form, - WayOfIssuing = x.WayOfIssuing, - Manufacturer = x.Manufacturer, - Price = x.Price, - Packaging = x.Packaging - }).OrderBy(x => x.Name); - } - - public IQueryable GetByManufacturer(string Manufacturer) - { - return _context.Medicines.Take(50).Where(x => x.Name.Contains(Manufacturer)) - .Select(x => new Medicine - { - Name = x.Name, - Strength = x.Strength, - Form = x.Form, - WayOfIssuing = x.WayOfIssuing, - Manufacturer = x.Manufacturer, - Price = x.Price, - Packaging = x.Packaging - }).OrderBy(x => x.Manufacturer); - } - - public IQueryable GetByName(string Name) - { - return _context.Medicines.Take(50).Where(medicine => medicine.Name.Contains(Name)) - .Select(x => new Medicine - { - Name = x.Name, - Strength = x.Strength, - Form = x.Form, - WayOfIssuing = x.WayOfIssuing, - Manufacturer = x.Manufacturer, - Price = x.Price, - Packaging = x.Packaging - }).OrderBy(x => x.Name); - } - - public void Remove(Medicine medicine) - { - Medicine med = _context.Medicines.Where(medicine => medicine.Name.Equals(medicine.Name)).FirstOrDefault(); - if (med != null) - { - _context.Medicines.Remove(med); - _context.SaveChangesAsync(); - } - - } - } -} Index: FarmatikoData/FarmatikoRepo/PHRepo.cs =================================================================== --- FarmatikoData/FarmatikoRepo/PHRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoData/FarmatikoRepo/PHRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,48 @@ +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoData.FarmatikoRepo +{ + public class PHRepo : IPHRepo + { + private readonly FarmatikoDataContext _context; + public PHRepo(FarmatikoDataContext context) + { + _context = context; + } + + public async Task ClaimPharmacy(RequestPharmacyHead pharmacy) + { + await Task.Run(() => _context.PHRequests.Add(pharmacy)); + await _context.SaveChangesAsync(); + } + + public async Task GetPharmacyHead(PharmacyHead pharmacyHead) + { + var Phead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Email.Equals(pharmacyHead.Email)).FirstOrDefault()); + return Phead; + } + + public async Task> GetPharmacyHeadInfo() + { + var PHeadInfo = await Task.Run(() => _context.PharmacyHeads.Take(10)); + return PHeadInfo; + } + + public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead) + { + var EditedPHead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefault()); + EditedPHead.Email = pharmacyHead.Email; + EditedPHead.Name = pharmacyHead.Name; + EditedPHead.Password = pharmacyHead.Password; + EditedPHead.MedicineLists = pharmacyHead.MedicineLists; + EditedPHead.PharmaciesList = pharmacyHead.PharmaciesList; + await _context.SaveChangesAsync(); + } + } +} Index: rmatikoData/FarmatikoRepo/PandemicRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/PandemicRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,47 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepo -{ - public class PandemicRepository : IPandemicRepository - { - private FarmatikoDataContext _context; - - public PandemicRepository(FarmatikoDataContext context) - { - _context = context; - } - - public void Add(Pandemic pandemic) - { - _context.Pandemics.Add(pandemic); - _context.SaveChangesAsync(); - } - - public IQueryable GetAll() - { - return _context.Pandemics.Select(x => new Pandemic - { - Name = x.Name, - TotalMK = x.TotalMK, - ActiveMK = x.ActiveMK, - DeathsMK = x.DeathsMK, - NewMK = x.NewMK, - TotalGlobal = x.TotalGlobal, - DeathsGlobal = x.DeathsGlobal, - ActiveGlobal = x.ActiveGlobal - }).OrderBy(x => x.Name); - } - - public void Remove(Pandemic pandemic) - { - var Pandem = _context.Pandemics.Where(x => x.Name.Equals(pandemic.Name)).FirstOrDefault(); - if (Pandem != null) - { - _context.Pandemics.Remove(Pandem); - _context.SaveChangesAsync(); - } - } - } -} Index: rmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/PharmacyHeadRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,71 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepo -{ - public class PharmacyHeadRepository : IPharmacyHeadRepository - { - private FarmatikoDataContext _context; - - public PharmacyHeadRepository(FarmatikoDataContext context) - { - _context = context; - } - - public void Add(PharmacyHead pharmacyHead) - { - _context.PharmacyHeads.Add(pharmacyHead); - _context.SaveChangesAsync(); - } - - public IQueryable GetAllPharmacies(string NameOfPharmacyHeads) - { - return _context.PharmacyHeads.Where(pharmacyHead => pharmacyHead.Name.Contains(NameOfPharmacyHeads)) - .Take(10).Select(x => new PharmacyHead - { - MedicineLists = x.MedicineLists, - PharmaciesList = x.PharmaciesList, - Email = x.Email, - Name = x.Name, - }).OrderBy(x => x.Name); - } - //Not needed - public IQueryable GetPharmacyByName(string Name) - { - return _context.PharmacyHeads.Take(10) - .Where(pharmacyHead => pharmacyHead.Name.Equals(Name)) - .Select(x => new PharmacyHead - { - MedicineLists = x.MedicineLists, - PharmaciesList = x.PharmaciesList, - Email = x.Email, - Name = x.Name, - }).OrderBy(x => x.Name); - } - - public IQueryable GetPharmacyMedicines(string NameOfPharmacy) - { - - IQueryable Pharmacy = (IQueryable)_context.PharmacyHeads - .Take(50) - .Where(x => x.Name.Equals(NameOfPharmacy)) - .Select(x => new PharmacyHead - { - MedicineLists = x.MedicineLists - }).OrderBy(x => x.Name); - - return Pharmacy; - } - - public void Remove(PharmacyHead pharmacyHead) - { - var phead = _context.PharmacyHeads.Where(phead => phead.Name.Equals(pharmacyHead.Name)).FirstOrDefault(); - if (phead != null) - { - _context.PharmacyHeads.Remove(phead); - _context.SaveChangesAsync(); - } - } - } -} Index: rmatikoData/FarmatikoRepo/PharmacyRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/PharmacyRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,70 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepo -{ - public class PharmacyRepository : IPharmacyRepository - { - private FarmatikoDataContext _context; - - public PharmacyRepository(FarmatikoDataContext context) - { - _context = context; - } - - public void Add(Pharmacy pharmacy) - { - _context.Pharmacies.Add(pharmacy); - _context.SaveChanges(); - } - //Just for users - public IQueryable GetAll() - { - return _context.Pharmacies.Take(50) - .Select(x => new Pharmacy - { - Name = x.Name, - Location = x.Location, - Address = x.Address, - WorkAllTime = x.WorkAllTime - }).OrderBy(x => x.Name); - } - - public ICollection GetPharmacies() - { - return (ICollection)_context.Pharmacies.Take(50) - .Select(pharmacy => new - { - pharmacy.Name, - pharmacy.Address, - pharmacy.Location, - pharmacy.WorkAllTime - }).OrderBy(x => x.Name); - } - - public void Remove(Pharmacy pharmacy) - { - var pharma = _context.Pharmacies.Where(pharm => pharm.Name.Equals(pharmacy.Name)).FirstOrDefault(); - if (pharma != null) - { - _context.Pharmacies.Remove(pharmacy); - _context.SaveChangesAsync(); - } - } - - public void UpdatePharmacy(Pharmacy pharmacy) - { - var oldPharmacy = _context.Pharmacies.Where(pharma => pharma.Name.Equals(pharmacy.Name)).FirstOrDefault(); - if (oldPharmacy != null) - { - _context.Pharmacies.Remove(oldPharmacy); - _context.Pharmacies.Add(pharmacy); - _context.SaveChangesAsync(); - } - throw new Exception("Pharmacy not found"); - } - } -} Index: FarmatikoData/FarmatikoRepo/Repository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/Repository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoData/FarmatikoRepo/Repository.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -14,5 +14,5 @@ } //GET - public async Task> GetAllWorkers() + public async Task> GetAllWorkers() { var Workers = await Task.Run(() => _context.HealthcareWorkers.Take(10)); @@ -20,5 +20,5 @@ } - public async Task> GetFacilities() + public async Task> GetFacilities() { var Facilities = await Task.Run(() => _context.HealthFacilities.Take(10)); @@ -26,5 +26,5 @@ } - public async Task GetFacility(int Id) + public async Task GetFacility(int Id) { var Facility = await _context.HealthFacilities.FindAsync(Id); @@ -62,5 +62,5 @@ } - public async Task GetWorker(int id) + public async Task GetWorker(int id) { var Worker = await _context.HealthcareWorkers.FindAsync(id); @@ -68,5 +68,5 @@ } - public async Task> SearchFacilities(string query) + public async Task> SearchFacilities(string query) { var SearchQuery = await Task.Run(() => _context.HealthFacilities @@ -95,5 +95,5 @@ } - public async Task> SearchWorkers(string query) + public async Task> SearchWorkers(string query) { var SearchQuery = await Task.Run(() => _context.HealthcareWorkers @@ -103,8 +103,13 @@ return SearchQuery; } + public async Task GetFacilityJSON(string healthFacility) + { + var Facility = await Task.Run(() => _context.HealthFacilities.Where(x => x.Name.Equals(healthFacility)).FirstOrDefault()); + return Facility; + } //POST - public async Task AddWorker(HealthcareWorkers Worker) + public async Task AddWorker(HealthcareWorker Worker) { await Task.Run(() => _context.HealthcareWorkers.Add(Worker)); @@ -112,5 +117,5 @@ } - public async Task AddFacility(HealthFacilities healthFacility) + public async Task AddFacility(HealthFacility healthFacility) { await Task.Run(() => _context.HealthFacilities.Add(healthFacility)); @@ -141,4 +146,70 @@ await _context.SaveChangesAsync(); } + + public async Task UpdateFacility(HealthFacility healthFacility) + { + var Facility = await Task.Run(() => _context.HealthFacilities.Where(x => x.Id == healthFacility.Id).FirstOrDefault()); + Facility.Address = healthFacility.Address; + Facility.Email = healthFacility.Email; + Facility.Municipality = healthFacility.Municipality; + Facility.Name = healthFacility.Name; + Facility.Phone = healthFacility.Phone; + Facility.Type = healthFacility.Type; + await _context.SaveChangesAsync(); + } + + public async Task RemoveMedicine(Medicine medicine) + { + await Task.Run(() => _context.Medicines.Remove(medicine)); + await _context.SaveChangesAsync(); + } + + public async Task UpdatePandemic(Pandemic pandemic) + { + var Pandemic = await Task.Run(() => _context.Pandemics.Where(x => x.Id == pandemic.Id).FirstOrDefault()); + Pandemic.ActiveGlobal = pandemic.ActiveGlobal; + Pandemic.ActiveMK = pandemic.ActiveMK; + Pandemic.DeathsGlobal = pandemic.DeathsGlobal; + Pandemic.DeathsMK = pandemic.DeathsMK; + Pandemic.Name = pandemic.Name; + Pandemic.NewMK = pandemic.NewMK; + Pandemic.TotalGlobal = pandemic.TotalGlobal; + Pandemic.TotalMK = pandemic.TotalMK; + await _context.SaveChangesAsync(); + } + + public async Task RemovePharmacy(Pharmacy pharmacy) + { + await Task.Run(() => _context.Pharmacies.Remove(pharmacy)); + await _context.SaveChangesAsync(); + } + //ke vidime + public Task UpdateWorker(HealthcareWorker worker) + { + throw new System.NotImplementedException(); + } + + public async Task UpadatePharmacy(Pharmacy pharmacy) + { + var Pharmacy = await Task.Run(() => _context.Pharmacies.Where(x => x.Id == pharmacy.Id).FirstOrDefault()); + Pharmacy.Name = pharmacy.Name; + Pharmacy.Location = pharmacy.Location; + Pharmacy.WorkAllTime = pharmacy.WorkAllTime; + Pharmacy.Address = pharmacy.Address; + await _context.SaveChangesAsync(); + } + //ke vidime + public Task UpdateMedicine(Medicine medicine) + { + throw new System.NotImplementedException(); + } + + public async Task RemovePharmacyHead(PharmacyHead pharmacyHead) + { + var PHead = await Task.Run(() => _context.PharmacyHeads.Where(x => x.Id == pharmacyHead.Id).FirstOrDefault()); + PHead.DeletedOn = pharmacyHead.DeletedOn; + await _context.SaveChangesAsync(); + } + } } Index: FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoData/FarmatikoRepoInterfaces/IAdminRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,16 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoData.FarmatikoRepoInterfaces +{ + public interface IAdminRepo + { + Task> GetClaimingRequests(); + Task> GetPharmacyHeads(); + Task RemoveClaimRequest(RequestPharmacyHead req); + } +} Index: rmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IHealthFacilityRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,13 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepoInterfaces -{ - public interface IHealthFacilityRepository - { - IQueryable GetAll(); - void Add(HealthFacilities healthFacility); - void Remove(HealthFacilities healthFacility); - IQueryable GetByName(string Name); - } -} Index: rmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IHealthcareWorkerRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,12 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepoInterfaces -{ - public interface IHealthcareWorkerRepository - { - IQueryable GetAll(); - void Add(HealthcareWorkers HealthcareWorker); - void Remove(HealthcareWorkers healthcareWorker); - } -} Index: rmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IMedicineListRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,19 +1,0 @@ -using FarmatikoData.Models; -using System.Collections.Generic; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepo -{ - public interface IMedicineListRepository - { - void Add(MedicineList medicineList); - void Remove(MedicineList medicineList); - IQueryable GetAll(); - /*MedicineList CheckMedicine(MedicineList medicineList, bool HasMedicine);*/ - //public MedicineList CheckMedicine(string Name); - ICollection GetByName(string Name); - ICollection GetByManufacturer(string Manufacturer); - //bool SetHasMedicine(MedicineList medicineList, bool HasMedicine); - //void SetHasMedicine(MedicineList medicineList); - } -} Index: rmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IMedicineRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,15 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepoInterfaces -{ - public interface IMedicineRepository - { - IQueryable GetAll(); - IQueryable GetByName(string Name); - void Add(Medicine medicine); - void Remove(Medicine medicine); - IQueryable GetByManufacturer(string Manufacturer); - - } -} Index: FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoData/FarmatikoRepoInterfaces/IPHRepo.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,17 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoData.FarmatikoRepoInterfaces +{ + public interface IPHRepo + { + Task ClaimPharmacy(RequestPharmacyHead pharmacy); + Task GetPharmacyHead(PharmacyHead pharmacyHead); + Task> GetPharmacyHeadInfo(); + Task UpdatePharmacyHead(PharmacyHead pharmacyHead); + } +} Index: rmatikoData/FarmatikoRepoInterfaces/IPandemicRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IPandemicRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,12 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepoInterfaces -{ - public interface IPandemicRepository - { - IQueryable GetAll(); - void Add(Pandemic pandemic); - void Remove(Pandemic pandemic); - } -} Index: rmatikoData/FarmatikoRepoInterfaces/IPharmacyHeadRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IPharmacyHeadRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,15 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepoInterfaces -{ - public interface IPharmacyHeadRepository - { - void Add(PharmacyHead pharmacyHead); - void Remove(PharmacyHead pharmacyHead); - IQueryable GetAllPharmacies(string NameOfPharmacyHead); - //Not actually needed - IQueryable GetPharmacyByName(string Name); - IQueryable GetPharmacyMedicines(string NameOfPharmacy); - } -} Index: rmatikoData/FarmatikoRepoInterfaces/IPharmacyRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IPharmacyRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,16 +1,0 @@ -using FarmatikoData.Models; -using System.Collections.Generic; -using System.Linq; - -namespace FarmatikoData.FarmatikoRepoInterfaces -{ - public interface IPharmacyRepository - { - void Add(Pharmacy pharmacy); - ICollection GetPharmacies(); - IQueryable GetAll(); - void Remove(Pharmacy pharmacy); - void UpdatePharmacy(Pharmacy pharmacy); - - } -} Index: FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -1,4 +1,7 @@ using FarmatikoData.Models; +using System; +using System.Collections.Generic; using System.Linq; +using System.Text; using System.Threading.Tasks; @@ -8,7 +11,7 @@ { //GET - Task> GetAllWorkers(); - Task> GetFacilities(); - Task GetFacility(int Id); + Task> GetAllWorkers(); + Task> GetFacilities(); + Task GetFacility(int Id); Task GetMedicine(int Id); Task> GetMedicines(); @@ -16,16 +19,26 @@ Task> GetPharmacies(); Task GetPharmacy(int id); - Task GetWorker(int id); - Task> SearchFacilities(string query); + Task GetWorker(int id); + Task> SearchFacilities(string query); Task> SearchMedicines(string query); Task> SearchPharmacies(string query); - Task> SearchWorkers(string query); + Task> SearchWorkers(string query); + Task GetFacilityJSON(string healthFacility); + //POST - Task AddWorker(HealthcareWorkers worker); - Task AddFacility(HealthFacilities healthFacilities); + Task AddWorker(HealthcareWorker Worker); + Task AddFacility(HealthFacility healthFacility); Task AddPharmacy(Pharmacy pharmacy); Task AddPharmacyHead(PharmacyHead pharmacyHead); Task AddMedicines(Medicine medicine); Task AddPandemic(Pandemic pandemic); + Task UpdateFacility(HealthFacility healthFacility); + Task RemoveMedicine(Medicine medicine); + Task UpdatePandemic(Pandemic pandemic); + Task RemovePharmacy(Pharmacy pharmacy); + Task UpdateWorker(HealthcareWorker worker); + Task UpadatePharmacy(Pharmacy pharmacy); + Task UpdateMedicine(Medicine medicine); + Task RemovePharmacyHead(PharmacyHead pharmacyHead); } } Index: rmatikoData/Models/HealthFacilities.cs =================================================================== --- FarmatikoData/Models/HealthFacilities.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,34 +1,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; -using FarmatikoData.Base; -using Microsoft.EntityFrameworkCore; - -namespace FarmatikoData.Models -{ - public class HealthFacilities : BaseEntity - { - public HealthFacilities() { } - [Required] - public string Name { get; set; } - [Required] - public string Municipality { get; set; } - [Required] - public string Address { get; set; } - [Required] - public string Type { get; set; } - public string Email { get; set; } - public string Phone { get; set; } - public HealthFacilities(string Name, string Municipality, string Address, string Type, string Email, string Phone) - { - this.Name = Name; - this.Municipality = Municipality; - this.Address = Address; - this.Type = Type; - this.Email = Email; - this.Phone = Phone; - } - } -} Index: FarmatikoData/Models/HealthFacility.cs =================================================================== --- FarmatikoData/Models/HealthFacility.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoData/Models/HealthFacility.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,34 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Text; +using FarmatikoData.Base; +using Microsoft.EntityFrameworkCore; + +namespace FarmatikoData.Models +{ + public class HealthFacility : BaseEntity + { + public HealthFacility() { } + [Required] + public string Name { get; set; } + [Required] + public string Municipality { get; set; } + [Required] + public string Address { get; set; } + [Required] + public string Type { get; set; } + public string Email { get; set; } + public string Phone { get; set; } + public HealthFacility(string Name, string Municipality, string Address, string Type, string Email, string Phone) + { + this.Name = Name; + this.Municipality = Municipality; + this.Address = Address; + this.Type = Type; + this.Email = Email; + this.Phone = Phone; + } + } +} Index: FarmatikoData/Models/HealthcareWorker.cs =================================================================== --- FarmatikoData/Models/HealthcareWorker.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoData/Models/HealthcareWorker.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Text; +using FarmatikoData.Base; +using Microsoft.EntityFrameworkCore; + +namespace FarmatikoData.Models +{ + public class HealthcareWorker : BaseEntity + { + public HealthcareWorker() { } + [Required] + public string Name { get; set; } + [Required] + public string Branch { get; set; } + [Required] + public HealthFacility Facility { get; set; } + public string Title { get; set; } + public HealthcareWorker(string Name, string Branch, HealthFacility Facility, string Title) + { + this.Name = Name; + this.Branch = Branch; + this.Facility = Facility; + this.Title = Title; + } + } +} Index: rmatikoData/Models/HealthcareWorkers.cs =================================================================== --- FarmatikoData/Models/HealthcareWorkers.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,28 +1,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; -using FarmatikoData.Base; -using Microsoft.EntityFrameworkCore; - -namespace FarmatikoData.Models -{ - public class HealthcareWorkers : BaseEntity - { - public HealthcareWorkers() { } - [Required] - public string Name { get; set; } - [Required] - public string Branch { get; set; } - [Required] - public HealthFacilities Facility { get; set; } - public string Title { get; set; } - public HealthcareWorkers(string Name, string Branch, HealthFacilities Facility, string Title) - { - this.Name = Name; - this.Branch = Branch; - this.Facility = Facility; - this.Title = Title; - } - } -} Index: FarmatikoData/Models/PharmacyHead.cs =================================================================== --- FarmatikoData/Models/PharmacyHead.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoData/Models/PharmacyHead.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -using System.Text; using FarmatikoData.Base; -using Microsoft.EntityFrameworkCore; namespace FarmatikoData.Models Index: FarmatikoData/Models/RequestPharmacyHead.cs =================================================================== --- FarmatikoData/Models/RequestPharmacyHead.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoData/Models/RequestPharmacyHead.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,20 @@ +using FarmatikoData.Base; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Text; + +namespace FarmatikoData.Models +{ + public class RequestPharmacyHead : BaseEntity + { + public RequestPharmacyHead() + { + } + [Required] + public PharmacyHead Head { get; set; } + [Required] + public Pharmacy Pharmacy { get; set; } + + } +} Index: FarmatikoServices/FarmatikoServiceInterfaces/IAdminService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IAdminService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoServices/FarmatikoServiceInterfaces/IAdminService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,16 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoServices.FarmatikoServiceInterfaces +{ + public interface IAdminService + { + Task> GetPharmacyHeads(); + Task> GetCalimingRequests(); + Task RejectRequest(RequestPharmacyHead req); + } +} Index: rmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IHealthFacilityService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,13 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoData -{ - public interface IHealthFacilityService - { - Task> GetAll(); - void Add(HealthFacilities healthFacility); - void Remove(HealthFacilities healthFacility); - } -} Index: rmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IHealthcareWorkerService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,13 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.FarmatikoServiceInterfaces -{ - public interface IHealthcareWorkerService - { - Task> GetAll(); - void Add(HealthcareWorkers healthcareWorker); - void Remove(HealthcareWorkers healthcareWorker); - } -} Index: rmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IMedicineListService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,17 +1,0 @@ -using FarmatikoData.Models; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.FarmatikoServiceInterfaces -{ - public interface IMedicineListService - { - Task> GetAll(); - //SetHasMedicine(MedicineList medicineList, bool HasMedicine); - Task> GetByName(string Name); - Task> GetByManufacturer(string Manufacturer); - void Add(MedicineList medicineList); - void Remove(MedicineList medicineList); - } -} Index: rmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IMedicineService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,15 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.FarmatikoServiceInterfaces -{ - public interface IMedicineService - { - Task> GetAll(); - void Add(Medicine medicine); - void Remove(Medicine Medicine); - Task> GetByName(string Name); - Task> GetByManufacturer(string Manufacturer); - } -} Index: FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,17 @@ +using FarmatikoData.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoServices.FarmatikoServiceInterfaces +{ + public interface IPHService + { + Task> GetPharmacyHeadInfo(string Token); + Task UpdatePharmacyHead(PharmacyHead pharmacyHead); + Task Login(PharmacyHead pharmacyHead); + Task ClaimPharmacy(RequestPharmacyHead pharmacy); + } +} Index: rmatikoServices/FarmatikoServiceInterfaces/IPandemicService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IPandemicService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,13 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.FarmatikoServiceInterfaces -{ - public interface IPandemicService - { - void Add(Pandemic pandemic); - Task> GetAll(); - void Remove(Pandemic pandemic); - } -} Index: rmatikoServices/FarmatikoServiceInterfaces/IPharmacyHeadService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyHeadService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,16 +1,0 @@ -using FarmatikoData.Models; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.FarmatikoServiceInterfaces -{ - public interface IPharmacyHeadService - { - void Add(PharmacyHead pharmacyHead); - void Remove(PharmacyHead pharmacyHead); - Task> GetAllPharmacies(string NameOfPharmacyHead); - //Not actually needed - Task> GetPharmacyByName(string Name); - Task> GetPharmacyMedicines(string NameOfPharmacy); - } -} Index: rmatikoServices/FarmatikoServiceInterfaces/IPharmacyService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IPharmacyService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,16 +1,0 @@ -using FarmatikoData.Models; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.FarmatikoServiceInterfaces -{ - public interface IPharmacyService - { - void Add(Pharmacy pharmacy); - Task> GetPharmacies(); - Task> GetAll(); - void Remove(Pharmacy pharmacy); - void UpdatePharmacy(Pharmacy pharmacy); - } -} Index: FarmatikoServices/FarmatikoServiceInterfaces/IProcessJSONService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IProcessJSONService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoServices/FarmatikoServiceInterfaces/IProcessJSONService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -9,8 +9,9 @@ public interface IProcessJSONService { - Task> GetProcessedHealthFacilitiesFromJSON(); - Task> GetProcessedPandemicsFromJSONApi(); - Task> GetProcessedHealthcareWorkersFromJSON(); - Task> GetProcessedMedicinesFromJSON(); + Task GetProcessedHealthFacilitiesFromJSON(); + Task GetProcessedPandemicsFromJSONApi(); + Task GetProcessedHealthcareWorkersFromJSON(); + Task GetProcessedMedicinesFromJSON(); + Task ReadPharmaciesFromExcel(); } } Index: FarmatikoServices/FarmatikoServiceInterfaces/IService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoServices/FarmatikoServiceInterfaces/IService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -8,10 +8,11 @@ { //GET - Task> GetAllWorkers(); - Task> SearchWorkers(string query); - Task GetWorker(int id); - Task> GetFacilities(); - Task> SearchFacilities(string query); - Task GetFacility(int id); + Task> GetAllWorkers(); + Task> SearchWorkers(string query); + Task GetWorker(int id); + Task> GetFacilities(); + Task> SearchFacilities(string query); + Task GetFacility(int id); + Task GetFacilityJSON(string healthFacility); Task GetMedicine(int id); Task> SearchMedicines(string query); @@ -22,10 +23,17 @@ Task GetPharmacy(int id); //POST - Task AddWorker(HealthcareWorkers worker); - Task AddFacility(HealthFacilities healthFacilities); + Task AddWorker(HealthcareWorker worker); + Task AddFacility(HealthFacility healthFacilities); Task AddPharmacy(Pharmacy pharmacy); Task AddPharmacyHead(PharmacyHead pharmacyHead); Task AddMedicines(Medicine medicine); Task AddPandemic(Pandemic pandemic); + Task UpdateFacility(HealthFacility healthFacilities); + Task RemoveMedicine(Medicine medicine); + Task RemovePharmacyHead(PharmacyHead pharmacyHead); + Task UpdatePandemic(Pandemic pandemic); + Task RemovePharmacy(Pharmacy pharmacy); + Task UpdateWorker(HealthcareWorker worker); + Task UpdatePharmacy(Pharmacy pharmacy); } } Index: FarmatikoServices/Services/AdminService.cs =================================================================== --- FarmatikoServices/Services/AdminService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoServices/Services/AdminService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,37 @@ +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoServices.Services +{ + public class AdminService : IAdminService + { + private readonly IAdminRepo _adminRepo; + public AdminService(IAdminRepo adminRepo) + { + _adminRepo = adminRepo; + } + + public async Task> GetCalimingRequests() + { + var req = await Task.Run(() => _adminRepo.GetClaimingRequests()); + return req; + } + + public async Task> GetPharmacyHeads() + { + var PHeads = await Task.Run(() => _adminRepo.GetPharmacyHeads()); + return PHeads; + } + + public async Task RejectRequest(RequestPharmacyHead req) + { + await _adminRepo.RemoveClaimRequest(req); + } + } +} Index: rmatikoServices/Services/HealthFacilityService.cs =================================================================== --- FarmatikoServices/Services/HealthFacilityService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,39 +1,0 @@ -using FarmatikoData; -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using System; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices -{ - public class HealthFacilityService : IHealthFacilityService - { - private IHealthFacilityRepository _healthFacilityRepository; - - public HealthFacilityService(IHealthFacilityRepository healthFacilityRepository) - { - _healthFacilityRepository = healthFacilityRepository; - } - - public async void Add(HealthFacilities healthFacility) - { - if (healthFacility != null) - await Task.Run(() => _healthFacilityRepository.Add(healthFacility)); - else throw new Exception("Can't add, health facility is null"); - } - - public async Task> GetAll() - { - return await Task.Run(() => _healthFacilityRepository.GetAll()); - } - - public async void Remove(HealthFacilities healthFacility) - { - if (healthFacility != null) - await Task.Run(() => _healthFacilityRepository.Remove(healthFacility)); - else throw new Exception("Can't Remove health facility is null"); - - } - } -} Index: rmatikoServices/Services/HealthcareWorkerService.cs =================================================================== --- FarmatikoServices/Services/HealthcareWorkerService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,39 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using FarmatikoServices.FarmatikoServiceInterfaces; -using System; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.Services -{ - public class HealthcareWorkerService : IHealthcareWorkerService - { - private IHealthcareWorkerRepository _healthcareWorkerRepo; - public HealthcareWorkerService(IHealthcareWorkerRepository healthcareWorkerRepo) - { - _healthcareWorkerRepo = healthcareWorkerRepo; - } - public async void Add(HealthcareWorkers healthcareWorker) - { - if (healthcareWorker != null) - await Task.Run(() => _healthcareWorkerRepo.Add(healthcareWorker)); - else throw new Exception("Can't add, healthcare worker is null"); - } - - public async Task> GetAll() - { - var healthCareWorkers = await Task.Run(() => _healthcareWorkerRepo.GetAll()); - if (healthCareWorkers != null) - return healthCareWorkers; - return null; - } - - public async void Remove(HealthcareWorkers healthcareWorker) - { - if (healthcareWorker != null) - await Task.Run(() => _healthcareWorkerRepo.Remove(healthcareWorker)); - else throw new Exception("Can't Remove healthcare worker is null"); - } - } -} Index: rmatikoServices/Services/MedicineListService.cs =================================================================== --- FarmatikoServices/Services/MedicineListService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,52 +1,0 @@ -using FarmatikoData.FarmatikoRepo; -using FarmatikoData.Models; -using FarmatikoServices.FarmatikoServiceInterfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.Services -{ - public class MedicineListService : IMedicineListService - { - private IMedicineListRepository _medicineListRepository; - public MedicineListService(IMedicineListRepository medicineListRepository) - { - _medicineListRepository = medicineListRepository; - } - - public async void Add(MedicineList medicineList) - { - if (medicineList != null) - await Task.Run(() => _medicineListRepository.Add(medicineList)); - else throw new Exception("Can't add, the medicine list is null."); - } - - public async Task> GetAll() - { - return await Task.Run(() => _medicineListRepository.GetAll()); - } - - public async Task> GetByManufacturer(string Manufacturer) - { - if (Manufacturer != null) - return await Task.Run(() => _medicineListRepository.GetByManufacturer(Manufacturer)); - else throw new Exception("Can't get, name of manufacturer is null"); - } - - public async Task> GetByName(string Name) - { - if (Name != null) - return await Task.Run(() => _medicineListRepository.GetByName(Name)); - else throw new Exception("Can't get, name is null"); - } - - public async void Remove(MedicineList medicineList) - { - if (medicineList != null) - await Task.Run(() => _medicineListRepository.Remove(medicineList)); - else throw new Exception("Can't remove, the medicine list is null."); - } - } -} Index: rmatikoServices/Services/MedicineService.cs =================================================================== --- FarmatikoServices/Services/MedicineService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,52 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using FarmatikoServices.FarmatikoServiceInterfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.Services -{ - public class MedicineService : IMedicineService - { - private IMedicineRepository _medicineRepository; - public MedicineService(IMedicineRepository medicineRepository) - { - _medicineRepository = medicineRepository; - } - - public async void Add(Medicine medicine) - { - if (medicine != null) - await Task.Run(() => _medicineRepository.Add(medicine)); - else throw new Exception("Can't Add medicine is null"); - } - - public async Task> GetAll() - { - return await Task.Run(() => _medicineRepository.GetAll()); - } - - public async Task> GetByManufacturer(string Manufacturer) - { - if (Manufacturer != null) - return await Task.Run(() => _medicineRepository.GetByManufacturer(Manufacturer)); - else throw new Exception("Can't get, name of manufacturer is null"); - } - - public async Task> GetByName(string Name) - { - if (Name != null) - return await Task.Run(() => _medicineRepository.GetByName(Name)); - else throw new Exception("Can't get, name is null"); - } - - public async void Remove(Medicine Medicine) - { - if (Medicine != null) - await Task.Run(() => _medicineRepository.Remove(Medicine)); - else throw new Exception("Can't Add medicine is null"); - } - } -} Index: FarmatikoServices/Services/PHService.cs =================================================================== --- FarmatikoServices/Services/PHService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) +++ FarmatikoServices/Services/PHService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -0,0 +1,46 @@ +using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.Models; +using FarmatikoServices.FarmatikoServiceInterfaces; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FarmatikoServices.Services +{ + public class PHService : IPHService + { + private readonly IPHRepo _iPHRepo; + public PHService(IPHRepo iPHRepo) + { + _iPHRepo = iPHRepo; + } + + public async Task ClaimPharmacy(RequestPharmacyHead pharmacy) + { + await _iPHRepo.ClaimPharmacy(pharmacy); + } + + public Task> GetPharmacyHeadInfo(string Token) + { + throw new NotImplementedException(); + } + + public async Task Login(PharmacyHead pharmacyHead) + { + var PHead = await Task.Run(() => _iPHRepo.GetPharmacyHead(pharmacyHead)); + if (PHead.Password.Equals(pharmacyHead.Password)) + return PHead.Id; + return -1; + } + + + public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead) + { + if (pharmacyHead != null) + await _iPHRepo.UpdatePharmacyHead(pharmacyHead); + else throw new Exception("PharmacyHead has a null value."); + } + } +} Index: rmatikoServices/Services/PandemicService.cs =================================================================== --- FarmatikoServices/Services/PandemicService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,37 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using FarmatikoServices.FarmatikoServiceInterfaces; -using System; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.Services -{ - public class PandemicService : IPandemicService - { - private IPandemicRepository _pandemicRepository; - public PandemicService(IPandemicRepository pandemicRepository) - { - _pandemicRepository = pandemicRepository; - } - - public async void Add(Pandemic pandemic) - { - if (pandemic != null) - await Task.Run(() => _pandemicRepository.Add(pandemic)); - else throw new Exception("Can't add pandemic is null."); - } - - public async Task> GetAll() - { - return await Task.Run(() => _pandemicRepository.GetAll()); - } - - public async void Remove(Pandemic pandemic) - { - if (pandemic != null) - await Task.Run(() => _pandemicRepository.Remove(pandemic)); - else throw new Exception("Can't remove, pandemic is null."); - } - } -} Index: rmatikoServices/Services/PharmacyHeadService.cs =================================================================== --- FarmatikoServices/Services/PharmacyHeadService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,65 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using FarmatikoServices.FarmatikoServiceInterfaces; -using System; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.Services -{ - public class PharmacyHeadService : IPharmacyHeadService - { - private IPharmacyHeadRepository _pharmacyHeadRepository; - public PharmacyHeadService(IPharmacyHeadRepository pharmacyHeadRepository) - { - _pharmacyHeadRepository = pharmacyHeadRepository; - } - - public async void Add(PharmacyHead pharmacyHead) - { - if (pharmacyHead != null) - await Task.Run(() => _pharmacyHeadRepository.Add(pharmacyHead)); - else throw new Exception("Can't add, pharmacy head is null."); - } - - public async Task> GetAllPharmacies(string NameOfPharmacyHead) - { - if (NameOfPharmacyHead != null) - { - IQueryable pharmacies = await Task.Run(() => _pharmacyHeadRepository.GetAllPharmacies(NameOfPharmacyHead)); - if (pharmacies != null) - return pharmacies; - } - return null; - } - - public async Task> GetPharmacyByName(string Name) - { - if (Name != null) - { - IQueryable PharmacyHead = await Task.Run(() => _pharmacyHeadRepository.GetPharmacyByName(Name)); - if (PharmacyHead != null) - return PharmacyHead; - } - return null; - } - - public async Task> GetPharmacyMedicines(string NameOfPharmacy) - { - if (NameOfPharmacy != null) - { - IQueryable Medicines = await Task.Run(() => _pharmacyHeadRepository.GetPharmacyMedicines(NameOfPharmacy)); - if (Medicines != null) - return Medicines; - } - return null; - } - - public async void Remove(PharmacyHead pharmacyHead) - { - if (pharmacyHead != null) - await Task.Run(() => _pharmacyHeadRepository.Remove(pharmacyHead)); - else throw new Exception("Can't remove, name of pharmacy head is null."); - } - } -} Index: rmatikoServices/Services/PharmacyService.cs =================================================================== --- FarmatikoServices/Services/PharmacyService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ (revision ) @@ -1,49 +1,0 @@ -using FarmatikoData.FarmatikoRepoInterfaces; -using FarmatikoData.Models; -using FarmatikoServices.FarmatikoServiceInterfaces; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace FarmatikoServices.Services -{ - public class PharmacyService : IPharmacyService - { - private IPharmacyRepository _pharmacyRepository; - public PharmacyService(IPharmacyRepository pharmacyRepository) - { - _pharmacyRepository = pharmacyRepository; - } - public async void Add(Pharmacy pharmacy) - { - if (pharmacy != null) - await Task.Run(() => _pharmacyRepository.Add(pharmacy)); - else throw new Exception("Can't add, pharmacy has null value."); - } - - public async Task> GetAll() - { - return await Task.Run(() => _pharmacyRepository.GetAll()); - } - - public async Task> GetPharmacies() - { - return await Task.Run(() => _pharmacyRepository.GetPharmacies()); - } - - public async void Remove(Pharmacy pharmacy) - { - if (pharmacy != null) - await Task.Run(() => _pharmacyRepository.Remove(pharmacy)); - else throw new Exception("Can't remove, pharmacy has null value."); - } - - public async void UpdatePharmacy(Pharmacy pharmacy) - { - if (pharmacy != null) - await Task.Run(() => _pharmacyRepository.UpdatePharmacy(pharmacy)); - else throw new Exception("Can not update pharmacy, has null value."); - } - } -} Index: FarmatikoServices/Services/ProcessJSONService.cs =================================================================== --- FarmatikoServices/Services/ProcessJSONService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoServices/Services/ProcessJSONService.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -11,4 +11,6 @@ using RestSharp; using System.Threading.Tasks; +using OfficeOpenXml; +using System.IO; namespace FarmatikoServices.Services @@ -16,24 +18,40 @@ public class ProcessJSONService : IProcessJSONService { - private IHealthFacilityRepository _healthFacilityRepository; - private IPandemicRepository _pandemicRepository; - private IHealthcareWorkerRepository _healthcareWorkerRepository; - private IMedicineRepository _medicineRepository; + private readonly ILogger _logger; - public ProcessJSONService(IHealthFacilityRepository healthFacilityRepository, IPandemicRepository pandemicRepository, - IHealthcareWorkerRepository healthcareWorkerRepository, IMedicineRepository medicineRepository, ILogger logger) + private readonly IService _service; + public ProcessJSONService(ILogger logger, IService service) { _logger = logger; - _healthFacilityRepository = healthFacilityRepository; - _pandemicRepository = pandemicRepository; - _healthcareWorkerRepository = healthcareWorkerRepository; - _medicineRepository = medicineRepository; + _service = service; } - public async Task> GetProcessedHealthFacilitiesFromJSON() + public async Task 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() + { + 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); + } + } + return null; + } + + + public async Task GetProcessedHealthFacilitiesFromJSON() { try { - HashSet hashSet = new HashSet(); var client = new WebClient(); var json = client.DownloadString(@"C:\Users\dslez\Desktop\ustanovi.json"); @@ -51,13 +69,6 @@ var Phone = obj[11]; var Type = obj[5]; - HealthFacilities healthFacility = new HealthFacilities(Name, Municipality, Address, Type, Email, Phone); - /*healthFacility.Name = Name; - healthFacility.Municipality = Municipality; - healthFacility.Address = Address; - healthFacility.Email = Email; - healthFacility.Phone = Phone; - healthFacility.Type = Type;*/ - //hashSet.Add(healthFacility); - await Task.Run(() => _healthFacilityRepository.Add(healthFacility)); + HealthFacility healthFacility = new HealthFacility(Name, Municipality, Address, Type, Email, Phone); + await Task.Run(() => _service.AddFacility(healthFacility)); } @@ -72,5 +83,5 @@ } - public async Task> GetProcessedPandemicsFromJSONApi() + public async Task GetProcessedPandemicsFromJSONApi() { try @@ -97,13 +108,5 @@ Pandemic pandemic = new Pandemic(Name, TotalMk, ActiveMk, TotalDeathsMK, NewMK, TotalConfirmed, TotalDeaths, ActiveGlobal); - /*pandemic.TotalGlobal = TotalConfirmed; - pandemic.ActiveGlobal = TotalConfirmed - (TotalRecovered + TotalDeaths); - pandemic.DeathsGlobal = TotalDeaths; - pandemic.TotalMK = TotalMk; - pandemic.ActiveMK = TotalMk - (TotalRecoveredMK + TotalDeathsMK); - pandemic.DeathsMK = TotalDeathsMK; - pandemic.NewMK = NewMK; - pandemic.Name = "Coronavirus";*/ - await Task.Run(() => _pandemicRepository.Add(pandemic)); + await Task.Run(() => _service.AddPandemic(pandemic)); } catch (Exception e) @@ -114,5 +117,5 @@ } - public async Task> GetProcessedHealthcareWorkersFromJSON() + public async Task GetProcessedHealthcareWorkersFromJSON() { try @@ -131,8 +134,8 @@ var FacilityName = obj[1]; var Title = obj[3]; - HealthFacilities facility = _healthFacilityRepository.GetByName(FacilityName); - HealthFacilities Facility = new HealthFacilities(facility.Name, facility.Municipality, facility.Address, + HealthFacility facility = await _service.GetFacilityJSON(FacilityName); + HealthFacility Facility = new HealthFacility(facility.Name, facility.Municipality, facility.Address, facility.Type, facility.Email, facility.Phone); - HealthcareWorkers healthcareWorker = new HealthcareWorkers(Name, Branch, Facility, Title); + HealthcareWorker healthcareWorker = new HealthcareWorker(Name, Branch, Facility, Title); /*Facility.Name = obj[1]; Facility.Municipality = "WorkerFacilityMunicipality"; @@ -142,5 +145,5 @@ healthcareWorker.Facility = Facility; healthcareWorker.Title = Title;*/ - await Task.Run(() => _healthcareWorkerRepository.Add(healthcareWorker)); + await Task.Run(() => _service.AddWorker(healthcareWorker)); } } @@ -152,5 +155,5 @@ } - public async Task> GetProcessedMedicinesFromJSON() + public async Task GetProcessedMedicinesFromJSON() { try @@ -180,5 +183,5 @@ medicine.Price = Price; medicine.Packaging = Packaging;*/ - await Task.Run(() => _medicineRepository.Add(medicine)); + await Task.Run(() => _service.AddMedicines(medicine)); } } Index: FarmatikoServices/Services/Service.cs =================================================================== --- FarmatikoServices/Services/Service.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a) +++ FarmatikoServices/Services/Service.cs (revision 1454207ab59f2ffdc09530dd29ffe2ec11792bfb) @@ -17,5 +17,5 @@ //GET - public async Task> GetAllWorkers() + public async Task> GetAllWorkers() { var Workers = await _repository.GetAllWorkers(); @@ -23,5 +23,5 @@ } - public async Task> GetFacilities() + public async Task> GetFacilities() { var Facilities = await _repository.GetFacilities(); @@ -29,5 +29,5 @@ } - public async Task GetFacility(int id) + public async Task GetFacility(int id) { var Facility = await _repository.GetFacility(id); @@ -65,5 +65,5 @@ } - public async Task GetWorker(int id) + public async Task GetWorker(int id) { var Worker = await _repository.GetWorker(id); @@ -71,5 +71,5 @@ } - public async Task> SearchFacilities(string query) + public async Task> SearchFacilities(string query) { var SearchQuery = await _repository.SearchFacilities(query); @@ -89,5 +89,5 @@ } - public async Task> SearchWorkers(string query) + public async Task> SearchWorkers(string query) { var SearchQuery = await _repository.SearchWorkers(query); @@ -97,44 +97,124 @@ //POST (ADD NEW OBJECTS) - public Task AddFacility(HealthFacilities healthFacilities) + //za json(Sys updateer) + public async Task AddFacility(HealthFacility healthFacilities) { if (healthFacilities != null) - _repository.AddFacility(healthFacilities); + await _repository.AddFacility(healthFacilities); throw new Exception("Facility is null"); } - - public Task AddMedicines(Medicine medicine) + //za json(Sys updateer) + public async Task AddMedicines(Medicine medicine) { if (medicine != null) - _repository.AddMedicines(medicine); + await _repository.AddMedicines(medicine); throw new Exception("Medicine is null"); } - - public Task AddPandemic(Pandemic pandemic) + //za json(Sys updateer) + public async Task AddPandemic(Pandemic pandemic) { if (pandemic != null) - _repository.AddPandemic(pandemic); + await _repository.AddPandemic(pandemic); throw new Exception("Pandemic is null"); } - - public Task AddPharmacy(Pharmacy pharmacy) + // Samo PharmacyHead i Admin imaat pristap + public async Task AddPharmacy(Pharmacy pharmacy) { if (pharmacy != null) - _repository.AddPharmacy(pharmacy); + await _repository.AddPharmacy(pharmacy); throw new Exception("Pharmacy is null"); } - - public Task AddPharmacyHead(PharmacyHead pharmacyHead) + // Ovaa kontrola ja ima samo admin + public async Task AddPharmacyHead(PharmacyHead pharmacyHead) { if (pharmacyHead != null) - _repository.AddPharmacyHead(pharmacyHead); + { + var Medicines = await _repository.GetMedicines(); + foreach (var med in Medicines) + { + MedicineList medicine = new MedicineList() + { + Medicine = med, + HasMedicine = false + }; + pharmacyHead.MedicineLists.Add(medicine); + } + await _repository.AddPharmacyHead(pharmacyHead); + } throw new Exception("PharmacyHead is null"); } - - public Task AddWorker(HealthcareWorkers worker) + //za json(Sys updateer) + public async Task AddWorker(HealthcareWorker worker) { if (worker != null) - _repository.AddWorker(worker); + await _repository.AddWorker(worker); throw new Exception("Worker is null"); + } + + //za json(Sys updateer) + public async Task UpdateFacility(HealthFacility healthFacilities) + { + if (healthFacilities != null) + await _repository.UpdateFacility(healthFacilities); + throw new Exception("Facility is null"); + } + //PharmacyHead + public async Task RemoveMedicine(Medicine medicine) + { + if (medicine != null) + await _repository.RemoveMedicine(medicine); + throw new Exception("Medicine is null"); + } + //PharmacyHead + public async Task UpdateMedicine(Medicine medicine) + { + if (medicine != null) + await _repository.UpdateMedicine(medicine); + throw new Exception("Medicine is null"); + } + //za json(Sys updateer) + public async Task UpdatePandemic(Pandemic pandemic) + { + if (pandemic != null) + await _repository.UpdatePandemic(pandemic); + throw new Exception("Pandemic is null"); + } + //PharmacyHead + public async Task RemovePharmacy(Pharmacy pharmacy) + { + if (pharmacy != null) + await _repository.RemovePharmacy(pharmacy); + throw new Exception("Pharmacy is null"); + } + //PharamcyHead + public async Task UpdatePharmacy(Pharmacy pharmacy) + { + if (pharmacy != null) + await _repository.UpadatePharmacy(pharmacy); + throw new Exception("Pharmacy is null"); + } + //za json(Sys updateer) + public async Task UpdateWorker(HealthcareWorker worker) + { + if (worker != null) + await _repository.UpdateWorker(worker); + throw new Exception("Worker is null"); + } + + public async Task RemovePharmacyHead(PharmacyHead pharmacyHead) + { + if (pharmacyHead != null) + { + pharmacyHead.DeletedOn = DateTime.UtcNow; + await _repository.RemovePharmacyHead(pharmacyHead); + } + else throw new Exception("PharmacyHead is null."); + } + + public async Task GetFacilityJSON(string healthFacility) + { + if (healthFacility != null) + return await _repository.GetFacilityJSON(healthFacility); + return null; }