Changeset afefe75 for FarmatikoServices

Timestamp:

02/04/21 21:46:29 (3 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

ac51326

Parents:

de9d697

Message:

Update searches, fix bugs

Location:

FarmatikoServices

Files:

• FarmatikoServiceInterfaces/IService.cs (modified) (2 diffs)
• Services/Service.cs (modified) (3 diffs)

FarmatikoServices/FarmatikoServiceInterfaces/IService.cs

@@ -1 @@
-using FarmatikoData.Models;
+using FarmatikoData.DTOs;
+using FarmatikoData.Models;
 using System.Collections.Generic;
 using System.Linq;
@@ -18 +19 @@
         Task<Medicine> GetMedicine(int id);
         Task<IEnumerable<Medicine>> SearchMedicines(string query);
-        Task<IEnumerable<Medicine>> GetMedicines();
+        Task<List<MedicineDTO>> GetMedicines();
         Task<Pandemic> GetPandemic();
-        Task<IEnumerable<Pharmacy>> GetPharmacies();
+        Task<List<PharmacyDTO>> GetPharmacies();
         Task<IEnumerable<Pharmacy>> SearchPharmacies(string query);
         Task<Pharmacy> GetPharmacy(int id);

FarmatikoServices/Services/Service.cs

@@ -1 @@
-using FarmatikoData.FarmatikoRepoInterfaces;
+using FarmatikoData.DTOs;
+using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -42 +43 @@
         }
 
-        public async Task<IEnumerable<Medicine>> GetMedicines()
+        public async Task<List<MedicineDTO>> GetMedicines()
         {
             var Medicines = await _repository.GetMedicinesAsync();
-            return Medicines;
+            List<MedicineDTO> list = new List<MedicineDTO>();
+            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<string> headNames = new List<string>();
+                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 +77 @@
         }
 
-        public async Task<IEnumerable<Pharmacy>> GetPharmacies()
+        public async Task<List<PharmacyDTO>> GetPharmacies()
         {
             var Pharmacies = await _repository.GetPharmacies();
-            return Pharmacies;
+            List<PharmacyDTO> pharmacies = new List<PharmacyDTO>();
+
+            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;
         }