+
{{korona[0].deathsGlobal}}
Смртни случаи глобално
Index: Farmatiko/ClientApp/src/app/korona/korona.component.ts
===================================================================
--- Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ Farmatiko/ClientApp/src/app/korona/korona.component.ts (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -9,5 +9,5 @@
})
export class KoronaComponent implements OnInit {
- public korona: IPandemic;
+ public korona: IPandemic[];
constructor(private dataService: DataService) {
@@ -17,6 +17,7 @@
ngOnInit(): void {
this.dataService.getPandemic()
- .subscribe((res: IPandemic) => {
+ .subscribe((res: IPandemic[]) => {
this.korona = res;
+ console.log(this.korona);
},
(err: any) => console.log(err),
Index: Farmatiko/ClientApp/src/app/shared/data.service.ts
===================================================================
--- Farmatiko/ClientApp/src/app/shared/data.service.ts (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ Farmatiko/ClientApp/src/app/shared/data.service.ts (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -11,10 +11,10 @@
baseFacilitiesUrl: string = '/api/facilities';
baseWorkersUrl: string = '/api/workers';
- baseMedicineUrl: string = '/api/medicine';
+ baseMedicineUrl: string = '/api/medicines';
basePandemicUrl: string = '/api/pandemic';
basePharmacyUrl: string = '/api/pharmacy';
basePharmacyHead: string = '/api/pharmacyhead';
- constructor(private http: HttpClient) {
+ constructor(private http: HttpClient) {
}
@@ -44,5 +44,5 @@
}
-
+
//Worker GET
getWorkers() : Observable
{
@@ -69,5 +69,5 @@
}
-
+
//Medicine GET
getMedicines() : Observable {
@@ -95,6 +95,6 @@
- getPandemic() : Observable {
- return this.http.get(this.basePandemicUrl)
+ getPandemic() : Observable {
+ return this.http.get(this.basePandemicUrl)
.pipe(catchError(this.handleError));
}
@@ -179,5 +179,5 @@
//PharmacyHead PUT
updatePharmacyHead(head: IPharmacyHead) : Observable {
- return this.http.put(this.basePharmacyHead + '/' + head.id, head)
+ return this.http.put(this.basePharmacyHead + '/' + head.id, head)
.pipe(
map((data) => {
@@ -198,5 +198,5 @@
private handleError(error: HttpErrorResponse) {
- console.error('server error:', error);
+ console.error('server error:', error);
if (error.error instanceof Error) {
let errMessage = error.error.message;
Index: Farmatiko/Controllers/FarmatikoController.cs
===================================================================
--- Farmatiko/Controllers/FarmatikoController.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
+++ Farmatiko/Controllers/FarmatikoController.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -0,0 +1,114 @@
+using System.Linq;
+using System.Threading.Tasks;
+using FarmatikoData.Models;
+using FarmatikoServices.FarmatikoServiceInterfaces;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Farmatiko.Controllers
+{
+ [ApiController]
+ [Route("api/[action]")]
+ public class FarmatikoController : Controller
+ {
+ private readonly IService _service;
+ public FarmatikoController(IService service)
+ {
+ _service = service;
+ }
+ // Workers
+ //Get
+ [HttpGet]
+ [Route("/api/workers")]
+ public async Task> GetWorkers()
+ {
+ return await _service.GetAllWorkers();
+ }
+ [HttpGet]
+ [Route("/api/workers/search/{Query}")]
+ public async Task> SearchWorkers(string Query)
+ {
+ return await _service.SearchWorkers(Query);
+ }
+ [HttpGet]
+ [Route("/api/workers/{id}")]
+ public async Task GetWorker(int Id)
+ {
+ return await _service.GetWorker(Id);
+ }
+ //Post
+
+
+ //Facilities
+ //Get
+ [HttpGet]
+ [Route("/api/facilities")]
+ public async Task> GetFacilities()
+ {
+ return await _service.GetFacilities();
+ }
+ [HttpGet]
+ [Route("/api/facilities/search/{Query}")]
+ public async Task> SearchFacilities(string Query)
+ {
+ return await _service.SearchFacilities(Query);
+ }
+ [HttpGet]
+ [Route("/api/facilities/{Id}")]
+ public async Task GetFacility(int Id)
+ {
+ return await _service.GetFacility(Id);
+ }
+ //Post
+
+ //Medicine
+ //Get
+ [HttpGet]
+ [Route("/api/medicines")]
+ public async Task> GetMedicines()
+ {
+ return await _service.GetMedicines();
+ }
+ [HttpGet]
+ [Route("/api/medicines/search/{Query}")]
+ public async Task> SearchMedicines(string Query)
+ {
+ return await _service.SearchMedicines(Query);
+ }
+ [HttpGet]
+ [Route("/api/medicines/{Id}")]
+ public async Task GetMedicine(int Id)
+ {
+ return await _service.GetMedicine(Id);
+ }
+ //POST
+
+ //Pandemic
+ [HttpGet]
+ [Route("/api/pandemic")]
+ public async Task GetPandemic()
+ {
+ return await _service.GetPandemic();
+ }
+ //Pharmacy
+ //GET
+ [HttpGet]
+ [Route("/api/pharmacy")]
+ public async Task> GetPharmacies()
+ {
+ return await _service.GetPharmacies();
+ }
+ [HttpGet]
+ [Route("/api/pharmacy/search/{Query}")]
+ public async Task> SearchPharmacies(string Query)
+ {
+ return await _service.SearchPharmacies(Query);
+ }
+ [HttpGet]
+ [Route("/api/pharmacy/{Id}")]
+ public async Task GetPharmacy(int Id)
+ {
+ return await _service.GetPharmacy(Id);
+ }
+
+ }
+}
Index: rmatiko/Controllers/HealthFacilitiesController.cs
===================================================================
--- Farmatiko/Controllers/HealthFacilitiesController.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ (revision )
@@ -1,37 +1,0 @@
-using FarmatikoData;
-using FarmatikoData.Models;
-using FarmatikoServices.FarmatikoServiceInterfaces;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-
-namespace Farmatiko.Controllers
-{
- [ApiController]
- [Route("[controller]/[action]")]
- public class HealthFacilitiesController : Controller
- {
- private IHealthFacilityService _healthFacilitiesService;
- private IProcessJSONService _processJSONService;
- public HealthFacilitiesController(IHealthFacilityService healthFacilitiesService, IProcessJSONService processJSONService)
- {
- _healthFacilitiesService = healthFacilitiesService;
- _processJSONService = processJSONService;
- }
- [HttpGet]
- public Task> Get()
- {
- return _healthFacilitiesService.GetAll();
- }
- public void Index()
- {
- _processJSONService.GetProcessedHealthFacilitiesFromJSON();
- }
- }
-}
Index: rmatiko/Controllers/HealthcareWorkerController.cs
===================================================================
--- Farmatiko/Controllers/HealthcareWorkerController.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ (revision )
@@ -1,26 +1,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using FarmatikoData.Models;
-using FarmatikoServices.FarmatikoServiceInterfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Farmatiko.Controllers
-{
- [ApiController]
- [Route("[controller]/[action]")]
- public class HealthcareWorkerController : Controller
- {
- private IHealthcareWorkerService _healthcareWorkerService;
- public HealthcareWorkerController(IHealthcareWorkerService healthcareWorkerService)
- {
- _healthcareWorkerService = healthcareWorkerService;
- }
-
- [HttpGet]
- public Task> Get()
- {
- return _healthcareWorkerService.GetAll();
- }
-
- }
-}
Index: rmatiko/Controllers/MedicineController.cs
===================================================================
--- Farmatiko/Controllers/MedicineController.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ (revision )
@@ -1,44 +1,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using FarmatikoData.Models;
-using FarmatikoServices.FarmatikoServiceInterfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Farmatiko.Controllers
-{
- [ApiController]
- [Route("[controller]/[action]")]
- public class MedicineController : Controller
- {
- private IMedicineService _medicineService;
- public MedicineController(IMedicineService medicineService)
- {
- _medicineService = medicineService;
- }
- [HttpGet]
- public Task> Get()
- {
- return _medicineService.GetAll();
- }
- /*[HttpPost]
- public void Add(Medicine medicine)
- {
- _medicineService.Add(medicine);
- }
- [HttpPost]
- public void Remove(string Medicine)
- {
- _medicineService.Remove(Medicine);
- }
- [HttpGet]
- public IQueryable GetByName(string Name)
- {
- return _medicineService.GetByName(Name);
- }
- [HttpGet]
- public IQueryable GetByManufacturer(string Manufacturer)
- {
- return _medicineService.GetByManufacturer(Manufacturer);
- }*/
- }
-}
Index: rmatiko/Controllers/MedicineListController.cs
===================================================================
--- Farmatiko/Controllers/MedicineListController.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ (revision )
@@ -1,50 +1,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using FarmatikoData.Models;
-using FarmatikoServices.FarmatikoServiceInterfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Farmatiko.Controllers
-{
- [ApiController]
- [Route("[controller]/[action]")]
- public class MedicineListController : Controller
- {
- private IMedicineListService _medicineListService;
- public MedicineListController(IMedicineListService medicineListService)
- {
- _medicineListService = medicineListService;
- }
- [HttpGet]
- public Task> Get()
- {
- return _medicineListService.GetAll();
- }
- [HttpGet]
- public Task> GetByName(string Name)
- {
- return _medicineListService.GetByName(Name);
- }
- [HttpGet]
- public Task> GetByManufacturer(string Manufacturer)
- {
- return _medicineListService.GetByManufacturer(Manufacturer);
- }
- /*[HttpPost]
- public void SetHasMedicine(MedicineList medicineList, bool HasMedicine)
- {
- _medicineListService.SetHasMedicine(medicineList, HasMedicine);
- }*/
- [HttpPost]
- public void Add(MedicineList medicineList)
- {
- _medicineListService.Add(medicineList);
- }
- [HttpPost]
- public void Remove(MedicineList medicineList)
- {
- _medicineListService.Remove(medicineList);
- }
- }
-}
Index: rmatiko/Controllers/PandemicController.cs
===================================================================
--- Farmatiko/Controllers/PandemicController.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ (revision )
@@ -1,24 +1,0 @@
-using System.Linq;
-using System.Threading.Tasks;
-using FarmatikoData.Models;
-using FarmatikoServices.FarmatikoServiceInterfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Farmatiko.Controllers
-{
- [ApiController]
- [Route("[controller]/[action]")]
- public class PandemicController : Controller
- {
- private IPandemicService _pandemicService;
- public PandemicController(IPandemicService pandemicService)
- {
- _pandemicService = pandemicService;
- }
- [HttpGet]
- public Task> Get()
- {
- return _pandemicService.GetAll();
- }
- }
-}
Index: rmatiko/Controllers/PharmacyController.cs
===================================================================
--- Farmatiko/Controllers/PharmacyController.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ (revision )
@@ -1,45 +1,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using FarmatikoData.Models;
-using FarmatikoServices.FarmatikoServiceInterfaces;
-using Microsoft.AspNetCore.Mvc;
-
-namespace Farmatiko.Controllers
-{
- [ApiController]
- [Route("[controller]/[action]")]
- public class PharmacyController : Controller
- {
- private IPharmacyService _pharmacyService;
- public PharmacyController(IPharmacyService pharmacyService)
- {
- _pharmacyService = pharmacyService;
- }
- [HttpGet]
- public Task> Get()
- {
- return _pharmacyService.GetAll();
- }
- [HttpGet]
- public Task> GetPharmacies()
- {
- return _pharmacyService.GetPharmacies();
- }
- [HttpPost]
- public void UpdatePharmacy(Pharmacy pharmacy)
- {
- _pharmacyService.UpdatePharmacy(pharmacy);
- }
- [HttpPost]
- public void AddPharmacy(Pharmacy pharmacy)
- {
- _pharmacyService.Add(pharmacy);
- }
- [HttpPost]
- public void RemovePharmacy(Pharmacy pharmacy)
- {
- _pharmacyService.Remove(pharmacy);
- }
- }
-}
Index: Farmatiko/Controllers/PharmacyHeadController.cs
===================================================================
--- Farmatiko/Controllers/PharmacyHeadController.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ Farmatiko/Controllers/PharmacyHeadController.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -7,8 +7,8 @@
{
[ApiController]
- [Route("[controller]/[action]")]
+ [Route("api/[action]")]
public class PharmacyHeadController : Controller
{
- private IPharmacyHeadRepository _pharmacyHeadRepository;
+ private readonly IPharmacyHeadRepository _pharmacyHeadRepository;
public PharmacyHeadController(IPharmacyHeadRepository pharmacyHeadRepository)
{
Index: FarmatikoData/FarmatikoDataContext.cs
===================================================================
--- FarmatikoData/FarmatikoDataContext.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ FarmatikoData/FarmatikoDataContext.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -9,8 +9,8 @@
- public DbSet HealthFacilities { get; set; }
- public DbSet HealthcareWorkers { get; set; }
- public DbSet Pharmacies { get; set; }
- public DbSet PharmacyHeads { 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; }
public virtual DbSet Pandemics { get; set; }
public virtual DbSet Medicines { get; set; }
Index: FarmatikoData/FarmatikoRepo/Repository.cs
===================================================================
--- FarmatikoData/FarmatikoRepo/Repository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
+++ FarmatikoData/FarmatikoRepo/Repository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -0,0 +1,144 @@
+using FarmatikoData.FarmatikoRepoInterfaces;
+using FarmatikoData.Models;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace FarmatikoData.FarmatikoRepo
+{
+ public class Repository : IRepository
+ {
+ private readonly FarmatikoDataContext _context;
+ public Repository(FarmatikoDataContext context)
+ {
+ _context = context;
+ }
+ //GET
+ public async Task> GetAllWorkers()
+ {
+ var Workers = await Task.Run(() => _context.HealthcareWorkers.Take(10));
+ return Workers;
+ }
+
+ public async Task> GetFacilities()
+ {
+ var Facilities = await Task.Run(() => _context.HealthFacilities.Take(10));
+ return Facilities;
+ }
+
+ public async Task GetFacility(int Id)
+ {
+ var Facility = await _context.HealthFacilities.FindAsync(Id);
+ return Facility;
+ }
+
+ public async Task GetMedicine(int Id)
+ {
+ var Medicine = await _context.Medicines.FindAsync(Id);
+ return Medicine;
+ }
+
+ public async Task> GetMedicines()
+ {
+ var Medicines = await Task.Run(() => _context.Medicines.Take(10));
+ return Medicines;
+ }
+
+ public async Task GetPandemic()
+ {
+ var Pandemic = await Task.Run(() => _context.Pandemics.FirstOrDefault());
+ return Pandemic;
+ }
+
+ public async Task> GetPharmacies()
+ {
+ var Pharmacies = await Task.Run(() => _context.Pharmacies.Take(10));
+ return Pharmacies;
+ }
+
+ public async Task GetPharmacy(int id)
+ {
+ var Pharmacy = await _context.Pharmacies.FindAsync(id);
+ return Pharmacy;
+ }
+
+ public async Task GetWorker(int id)
+ {
+ var Worker = await _context.HealthcareWorkers.FindAsync(id);
+ return Worker;
+ }
+
+ public async Task> SearchFacilities(string query)
+ {
+ var SearchQuery = await Task.Run(() => _context.HealthFacilities
+ .Where(x => x.Name.Equals(query))
+ .OrderBy(x => x.Name));
+
+ return SearchQuery;
+ }
+
+ public async Task> SearchMedicines(string query)
+ {
+ var SearchQuery = await Task.Run(() => _context.Medicines
+ .Where(x => x.Name.Equals(query))
+ .OrderBy(x => x.Name));
+
+ return SearchQuery;
+ }
+
+ public async Task> SearchPharmacies(string query)
+ {
+ var SearchQuery = await Task.Run(() => _context.Pharmacies
+ .Where(x => x.Name.Equals(query))
+ .OrderBy(x => x.Name));
+
+ return SearchQuery;
+ }
+
+ public async Task> SearchWorkers(string query)
+ {
+ var SearchQuery = await Task.Run(() => _context.HealthcareWorkers
+ .Where(x => x.Name.Equals(query))
+ .OrderBy(x => x.Name));
+
+ return SearchQuery;
+ }
+
+ //POST
+
+ public async Task AddWorker(HealthcareWorkers Worker)
+ {
+ await Task.Run(() => _context.HealthcareWorkers.Add(Worker));
+ await _context.SaveChangesAsync();
+ }
+
+ public async Task AddFacility(HealthFacilities healthFacility)
+ {
+ await Task.Run(() => _context.HealthFacilities.Add(healthFacility));
+ await _context.SaveChangesAsync();
+ }
+
+ public async Task AddPharmacy(Pharmacy pharmacy)
+ {
+ await Task.Run(() => _context.Pharmacies.Add(pharmacy));
+ await _context.SaveChangesAsync();
+ }
+
+ public async Task AddPharmacyHead(PharmacyHead pharmacyHead)
+ {
+ await Task.Run(() => _context.PharmacyHeads.Add(pharmacyHead));
+ await _context.SaveChangesAsync();
+ }
+
+ public async Task AddMedicines(Medicine medicine)
+ {
+ await Task.Run(() => _context.Medicines.Add(medicine));
+ await _context.SaveChangesAsync();
+ }
+
+ public async Task AddPandemic(Pandemic pandemic)
+ {
+ await Task.Run(() => _context.Pandemics.Add(pandemic));
+ await _context.SaveChangesAsync();
+ }
+ }
+}
Index: FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs
===================================================================
--- FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
+++ FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -0,0 +1,31 @@
+using FarmatikoData.Models;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace FarmatikoData.FarmatikoRepoInterfaces
+{
+ public interface IRepository
+ {
+ //GET
+ Task> GetAllWorkers();
+ Task> GetFacilities();
+ Task GetFacility(int Id);
+ Task GetMedicine(int Id);
+ Task> GetMedicines();
+ Task GetPandemic();
+ Task> GetPharmacies();
+ Task GetPharmacy(int id);
+ Task GetWorker(int id);
+ Task> SearchFacilities(string query);
+ Task> SearchMedicines(string query);
+ Task> SearchPharmacies(string query);
+ Task> SearchWorkers(string query);
+ //POST
+ Task AddWorker(HealthcareWorkers worker);
+ Task AddFacility(HealthFacilities healthFacilities);
+ Task AddPharmacy(Pharmacy pharmacy);
+ Task AddPharmacyHead(PharmacyHead pharmacyHead);
+ Task AddMedicines(Medicine medicine);
+ Task AddPandemic(Pandemic pandemic);
+ }
+}
Index: FarmatikoData/Models/Medicine.cs
===================================================================
--- FarmatikoData/Models/Medicine.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ FarmatikoData/Models/Medicine.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -1,3 +1,4 @@
using FarmatikoData.Base;
+using System.ComponentModel.DataAnnotations;
namespace FarmatikoData.Models
@@ -6,8 +7,12 @@
{
public Medicine() { }
+ [Required]
public string Name { get; set; }
+ [Required]
public string Strength { get; set; }
public string Form { get; set; }
+ [Required]
public string WayOfIssuing { get; set; }
+ [Required]
public string Manufacturer { get; set; }
public float Price { get; set; }
Index: FarmatikoData/Models/MedicineList.cs
===================================================================
--- FarmatikoData/Models/MedicineList.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ FarmatikoData/Models/MedicineList.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -1,3 +1,4 @@
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using FarmatikoData.Base;
using FarmatikoData.Models;
@@ -11,5 +12,7 @@
{
}
+ [Required]
public Medicine Medicine { get; set; }
+ [Required]
public bool HasMedicine { get; set; }
public MedicineList(Medicine Medicine, bool HasMedicine)
Index: FarmatikoData/Models/Pandemic.cs
===================================================================
--- FarmatikoData/Models/Pandemic.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ FarmatikoData/Models/Pandemic.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Text;
using FarmatikoData.Base;
@@ -10,11 +11,19 @@
{
public Pandemic() { }
+ [Required]
public string Name { get; set; }
+ [Required]
public int TotalMK { get; set; }
+ [Required]
public int ActiveMK { get; set; }
+ [Required]
public int DeathsMK { get; set; }
+ [Required]
public int NewMK { get; set; }
+ [Required]
public long TotalGlobal { get; set; }
+ [Required]
public long DeathsGlobal { get; set; }
+ [Required]
public long ActiveGlobal { get; set; }
public Pandemic(string Name, int TotalMK, int ActiveMK,
Index: FarmatikoData/Models/Pharmacy.cs
===================================================================
--- FarmatikoData/Models/Pharmacy.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ FarmatikoData/Models/Pharmacy.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Text;
using FarmatikoData.Base;
@@ -10,7 +11,11 @@
{
public Pharmacy() { }
+ [Required]
public string Name { get; set; }
+ [Required]
public string Location { get; set; }
+ [Required]
public string Address { get; set; }
+ [Required]
public bool WorkAllTime { get; set; }
public Pharmacy(string Name, string Location, string Address, bool WorkAllTime)
Index: FarmatikoData/Models/PharmacyHead.cs
===================================================================
--- FarmatikoData/Models/PharmacyHead.cs (revision 63d885e84d0775078eacb55e71816ca704ff80aa)
+++ FarmatikoData/Models/PharmacyHead.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Text;
using FarmatikoData.Base;
@@ -9,16 +10,16 @@
public class PharmacyHead : BaseEntity
{
- public MedicineList PharmacyMedicines { get; set; }
- public Pharmacy Pharmacy { get; set; }
+ public PharmacyHead()
+ {
+ }
+ [Required]
public string Email { get; set; }
+ [Required]
public string Name { get; set; }
+ [Required]
public string Password { get; set; }
public ICollection MedicineLists { get; set; }
public ICollection PharmaciesList { get; set; }
- public PharmacyHead()
- {
- PharmaciesList = new HashSet();
- MedicineLists = new HashSet();
- }
+
}
}
Index: FarmatikoServices/FarmatikoServiceInterfaces/IService.cs
===================================================================
--- FarmatikoServices/FarmatikoServiceInterfaces/IService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
+++ FarmatikoServices/FarmatikoServiceInterfaces/IService.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -0,0 +1,31 @@
+using FarmatikoData.Models;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace FarmatikoServices.FarmatikoServiceInterfaces
+{
+ public interface IService
+ {
+ //GET
+ Task> GetAllWorkers();
+ Task> SearchWorkers(string query);
+ Task GetWorker(int id);
+ Task> GetFacilities();
+ Task> SearchFacilities(string query);
+ Task GetFacility(int id);
+ Task GetMedicine(int id);
+ Task> SearchMedicines(string query);
+ Task> GetMedicines();
+ Task GetPandemic();
+ Task> GetPharmacies();
+ Task> SearchPharmacies(string query);
+ Task GetPharmacy(int id);
+ //POST
+ Task AddWorker(HealthcareWorkers worker);
+ Task AddFacility(HealthFacilities healthFacilities);
+ Task AddPharmacy(Pharmacy pharmacy);
+ Task AddPharmacyHead(PharmacyHead pharmacyHead);
+ Task AddMedicines(Medicine medicine);
+ Task AddPandemic(Pandemic pandemic);
+ }
+}
Index: FarmatikoServices/Services/Service.cs
===================================================================
--- FarmatikoServices/Services/Service.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
+++ FarmatikoServices/Services/Service.cs (revision 5d028591bfebae3120581e2f99668f2bac13441a)
@@ -0,0 +1,147 @@
+using FarmatikoData.FarmatikoRepoInterfaces;
+using FarmatikoData.Models;
+using FarmatikoServices.FarmatikoServiceInterfaces;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace FarmatikoServices.Services
+{
+ public class Service : IService
+ {
+ private readonly IRepository _repository;
+ public Service(IRepository repository)
+ {
+ _repository = repository;
+ }
+
+ //GET
+ public async Task> GetAllWorkers()
+ {
+ var Workers = await _repository.GetAllWorkers();
+ return Workers;
+ }
+
+ public async Task> GetFacilities()
+ {
+ var Facilities = await _repository.GetFacilities();
+ return Facilities;
+ }
+
+ public async Task GetFacility(int id)
+ {
+ var Facility = await _repository.GetFacility(id);
+ return Facility;
+ }
+
+ public async Task GetMedicine(int id)
+ {
+ var Medicine = await _repository.GetMedicine(id);
+ return Medicine;
+ }
+
+ public async Task> GetMedicines()
+ {
+ var Medicines = await _repository.GetMedicines();
+ return Medicines;
+ }
+
+ public async Task GetPandemic()
+ {
+ var Pandemic = await _repository.GetPandemic();
+ return Pandemic;
+ }
+
+ public async Task> GetPharmacies()
+ {
+ var Pharmacies = await _repository.GetPharmacies();
+ return Pharmacies;
+ }
+
+ public async Task GetPharmacy(int id)
+ {
+ var Pharmacy = await _repository.GetPharmacy(id);
+ return Pharmacy;
+ }
+
+ public async Task GetWorker(int id)
+ {
+ var Worker = await _repository.GetWorker(id);
+ return Worker;
+ }
+
+ public async Task> SearchFacilities(string query)
+ {
+ var SearchQuery = await _repository.SearchFacilities(query);
+ return SearchQuery;
+ }
+
+ public async Task> SearchMedicines(string query)
+ {
+ var SearchQuery = await _repository.SearchMedicines(query);
+ return SearchQuery;
+ }
+
+ public async Task> SearchPharmacies(string query)
+ {
+ var SearchQuery = await _repository.SearchPharmacies(query);
+ return SearchQuery;
+ }
+
+ public async Task> SearchWorkers(string query)
+ {
+ var SearchQuery = await _repository.SearchWorkers(query);
+ return SearchQuery;
+ }
+
+
+ //POST (ADD NEW OBJECTS)
+ public Task AddFacility(HealthFacilities healthFacilities)
+ {
+ if (healthFacilities != null)
+ _repository.AddFacility(healthFacilities);
+ throw new Exception("Facility is null");
+ }
+
+ public Task AddMedicines(Medicine medicine)
+ {
+ if (medicine != null)
+ _repository.AddMedicines(medicine);
+ throw new Exception("Medicine is null");
+ }
+
+ public Task AddPandemic(Pandemic pandemic)
+ {
+ if (pandemic != null)
+ _repository.AddPandemic(pandemic);
+ throw new Exception("Pandemic is null");
+ }
+
+ public Task AddPharmacy(Pharmacy pharmacy)
+ {
+ if (pharmacy != null)
+ _repository.AddPharmacy(pharmacy);
+ throw new Exception("Pharmacy is null");
+ }
+
+ public Task AddPharmacyHead(PharmacyHead pharmacyHead)
+ {
+ if (pharmacyHead != null)
+ _repository.AddPharmacyHead(pharmacyHead);
+ throw new Exception("PharmacyHead is null");
+ }
+
+ public Task AddWorker(HealthcareWorkers worker)
+ {
+ if (worker != null)
+ _repository.AddWorker(worker);
+ throw new Exception("Worker is null");
+ }
+
+ //PUT (EDIT OBJECTS)
+
+
+ //DELETE
+
+ }
+}