Index: Farmatiko/Controllers/FarmatikoController.cs =================================================================== --- Farmatiko/Controllers/FarmatikoController.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ Farmatiko/Controllers/FarmatikoController.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -1,4 +1,5 @@ using System.Collections.Generic; using System.Threading.Tasks; +using FarmatikoData.DTOs; using FarmatikoData.Models; using FarmatikoServices.FarmatikoServiceInterfaces; @@ -77,5 +78,5 @@ [HttpGet] [Route("api/medicines")] - public async Task> GetMedicines() + public async Task> GetMedicines() { return await _service.GetMedicines(); @@ -104,5 +105,5 @@ [HttpGet] [Route("api/pharmacy")] - public async Task> GetPharmacies() + public async Task> GetPharmacies() { return await _service.GetPharmacies(); Index: Farmatiko/Controllers/PharmacyHeadController.cs =================================================================== --- Farmatiko/Controllers/PharmacyHeadController.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ Farmatiko/Controllers/PharmacyHeadController.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -30,5 +30,5 @@ //POST - [HttpPut] + [HttpPost] [Route("api/pharmacyhead/update")] public async Task UpdatePharmacyHead([FromBody] PharmacyHeadDto pharmacyHead) Index: Farmatiko/Startup.cs =================================================================== --- Farmatiko/Startup.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ Farmatiko/Startup.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -18,5 +18,4 @@ using FarmatikoServices.Infrastructure; using System; -using Newtonsoft.Json.Serialization; namespace Farmatiko { Index: FarmatikoData/DTOs/MedicineDTO.cs =================================================================== --- FarmatikoData/DTOs/MedicineDTO.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) +++ FarmatikoData/DTOs/MedicineDTO.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -0,0 +1,28 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; +using System.Text.Json.Serialization; + +namespace FarmatikoData.DTOs +{ + public class MedicineDTO + { + [JsonProperty("name")] + public string Name { get; set; } + [JsonProperty("strength")] + public string Strength { get; set; } + [JsonProperty("form")] + public string Form { get; set; } + [JsonProperty("wayofissuing")] + public string WayOfIssuing { get; set; } + [JsonProperty("manufacturer")] + public string Manufacturer { get; set; } + [JsonProperty("price")] + public float Price { get; set; } + [JsonProperty("packaging")] + public string Packaging { get; set; } + [JsonPropertyName("headNames")] + public ICollection HeadNames { get; set; } + } +} Index: FarmatikoData/DTOs/PharmacyDTO.cs =================================================================== --- FarmatikoData/DTOs/PharmacyDTO.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) +++ FarmatikoData/DTOs/PharmacyDTO.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -0,0 +1,22 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Text; + +namespace FarmatikoData.DTOs +{ + public class PharmacyDTO + { + public PharmacyDTO() { } + [JsonProperty("name")] + public string Name { get; set; } + [JsonProperty("Location")] + public string Location { get; set; } + [JsonProperty("address")] + public string Address { get; set; } + [JsonProperty("workalltime")] + public bool WorkAllTime { get; set; } + [JsonProperty("headName")] + public string HeadName { get; set; } + } +} Index: FarmatikoData/FarmatikoRepo/Repository.cs =================================================================== --- FarmatikoData/FarmatikoRepo/Repository.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ FarmatikoData/FarmatikoRepo/Repository.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -63,8 +63,14 @@ return Pandemic; } - - public async Task> GetPharmacies() - { - var Pharmacies = await _context.Pharmacies.Take(5).ToListAsync(); + public async Task> GetPharmacies() + { + var Pharmacies = await _context.Pharmacies.Select(x => new Pharmacy + { + Name = x.Name, + Location = x.Location, + Address = x.Address, + WorkAllTime = x.WorkAllTime, + PheadId = x.PheadId + }).Take(5).ToListAsync(); return Pharmacies; } @@ -85,5 +91,5 @@ { var SearchQuery = await _context.HealthFacilities - .Where(x => x.Name.Contains(query)) + .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0) .OrderBy(x => x.Name).ToListAsync(); @@ -94,5 +100,5 @@ { var SearchQuery = await _context.Medicines - .Where(x => x.Name.Contains(query)) + .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0) .OrderBy(x => x.Name).ToListAsync(); @@ -102,6 +108,6 @@ public async Task> SearchPharmacies(string query) { - var SearchQuery = await _context.Pharmacies.Take(5) - .Where(x => x.Name.Contains(query)) + var SearchQuery = await _context.Pharmacies + .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0) .OrderBy(x => x.Name).ToListAsync(); @@ -111,6 +117,6 @@ public async Task> SearchWorkers(string query) { - var SearchQuery = await _context.HealthcareWorkers.Take(5) - .Where(x => x.Name.Contains(query)) + var SearchQuery = await _context.HealthcareWorkers + .Where(x => x.Name.IndexOf(query, StringComparison.OrdinalIgnoreCase) >= 0) .OrderBy(x => x.Name).ToListAsync(); @@ -291,4 +297,10 @@ } } + + public async Task> GetAllPHMedicines() + { + var list = await _context.PharmacyHeadMedicines.ToListAsync(); + return list; + } } } Index: FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs =================================================================== --- FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ FarmatikoData/FarmatikoRepoInterfaces/IRepository.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -18,5 +18,6 @@ ICollection GetMedicines(); Task GetPandemic(); - Task> GetPharmacies(); + Task> GetAllPHMedicines(); + Task> GetPharmacies(); Task GetPharmacy(int id); Task GetWorker(int id); Index: FarmatikoData/Migrations/20210124191844_InitialMigration.cs =================================================================== --- FarmatikoData/Migrations/20210124191844_InitialMigration.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ FarmatikoData/Migrations/20210124191844_InitialMigration.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -172,7 +172,7 @@ CreatedOn = table.Column(nullable: false, defaultValueSql: "now()"), DeletedOn = table.Column(nullable: true), - PheadId = table.Column(nullable: false), + PheadId = table.Column(nullable: true), HeadId = table.Column(nullable: true), - MedicineId = table.Column(nullable: false) + MedicineId = table.Column(nullable: true) }, constraints: table => Index: FarmatikoServices/FarmatikoServiceInterfaces/IService.cs =================================================================== --- FarmatikoServices/FarmatikoServiceInterfaces/IService.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ FarmatikoServices/FarmatikoServiceInterfaces/IService.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -1,3 +1,4 @@ -using FarmatikoData.Models; +using FarmatikoData.DTOs; +using FarmatikoData.Models; using System.Collections.Generic; using System.Linq; @@ -18,7 +19,7 @@ Task GetMedicine(int id); Task> SearchMedicines(string query); - Task> GetMedicines(); + Task> GetMedicines(); Task GetPandemic(); - Task> GetPharmacies(); + Task> GetPharmacies(); Task> SearchPharmacies(string query); Task GetPharmacy(int id); Index: FarmatikoServices/Services/Service.cs =================================================================== --- FarmatikoServices/Services/Service.cs (revision de9d6974b5e69f9d6feb583237c5824dae02d76e) +++ FarmatikoServices/Services/Service.cs (revision afefe757d576966e9c391ba7bf0c638159b265d9) @@ -1,3 +1,4 @@ -using FarmatikoData.FarmatikoRepoInterfaces; +using FarmatikoData.DTOs; +using FarmatikoData.FarmatikoRepoInterfaces; using FarmatikoData.Models; using FarmatikoServices.FarmatikoServiceInterfaces; @@ -42,8 +43,30 @@ } - public async Task> GetMedicines() + public async Task> GetMedicines() { var Medicines = await _repository.GetMedicinesAsync(); - return Medicines; + List list = new List(); + var listPHMedicines = await _repository.GetAllPHMedicines(); + foreach(var med in Medicines) + { + var heads = listPHMedicines.Where(x => x.MedicineId == med.Id).Select(x => x.Head).ToList(); + List headNames = new List(); + headNames = heads.Select(x => x.Name).ToList(); + MedicineDTO medicine = new MedicineDTO() + { + Name = med.Name, + Manufacturer = med.Manufacturer, + Packaging = med.Packaging, + Form = med.Form, + Price = med.Price, + Strength = med.Strength, + WayOfIssuing = med.WayOfIssuing, + HeadNames = headNames + }; + + list.Add(medicine); + } + + return list; } @@ -54,8 +77,22 @@ } - public async Task> GetPharmacies() + public async Task> GetPharmacies() { var Pharmacies = await _repository.GetPharmacies(); - return Pharmacies; + List pharmacies = new List(); + + foreach(var pharm in Pharmacies) + { + PharmacyDTO pharmacyDTO = new PharmacyDTO() + { + Name = pharm.Name, + Location = pharm.Location, + Address = pharm.Address, + WorkAllTime = pharm.WorkAllTime, + HeadName = pharm.PharmacyHead.Name + }; + pharmacies.Add(pharmacyDTO); + } + return pharmacies; }