Changeset db484c9 for FarmatikoServices

Timestamp:

01/26/21 10:33:09 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

7d80751

Parents:

8e74e2f

Message:

Fix bugs

Location:

FarmatikoServices

Files:

• FarmatikoServiceInterfaces/IPHService.cs (modified) (2 diffs)
• Services/PHService.cs (modified) (9 diffs)
• Services/ProcessJSONService.cs (modified) (1 diff)
• Services/Service.cs (modified) (1 diff)
• Services/SystemService.cs (modified) (1 diff)

FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs

@@ -1 @@
-using FarmatikoData.Models;
+using FarmatikoData.DTOs;
+using FarmatikoData.Models;
 using System;
 using System.Collections.Generic;
@@ -11 +12 @@
     {
         Task<IEnumerable<PharmacyHead>> GetPharmacyHeadInfo();
-        Task UpdatePharmacyHead(PharmacyHead pharmacyHead);
+        Task UpdatePharmacyHead(PharmacyHeadDto pharmacyHead);
         Task<int> Login(PharmacyHead pharmacyHead);
         Task<bool> ClaimPharmacy(RequestPharmacyHead pharmacy);
         Task<PharmacyHead> GetPharmacyHeadByIdAsync(int id);
-        Task<bool> Add(PharmacyHead pharmacyHead);
+        Task<bool> Add(PharmacyHeadDto pharmacyHead);
         Task<bool> Remove(int id);
         Task<bool> RemoveClaimingRequest(int id);
-        object GetPharmacyHead(string userName);
+        PharmacyHeadDto GetPharmacyHead(string userName);
     }
 }

FarmatikoServices/Services/PHService.cs

@@ -1 @@
-using FarmatikoData.FarmatikoRepoInterfaces;
+using FarmatikoData.DTOs;
+using FarmatikoData.FarmatikoRepoInterfaces;
 using FarmatikoData.Models;
 using FarmatikoServices.FarmatikoServiceInterfaces;
@@ -57 +58 @@
 
 
-        public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
+        public async Task UpdatePharmacyHead(PharmacyHeadDto pharmacyHead)
         {
             if (pharmacyHead != null)
@@ -63 +64 @@
                 var phead = _iPHRepo.GetPharmacyHead(pharmacyHead.Email);
 
-                /*if (pharmacyHead.PharmaciesList.Count() == 0)
-                    pharmacyHead.PharmaciesList = null;*/
-
-
-                phead.PHMedicineList = _repository.GetPHMedicines(phead.Email);
-
-                if (phead.MedicineList != pharmacyHead.MedicineList)
-                {
-                    phead.MedicineList = pharmacyHead.MedicineList;
-                    List<PharmacyHeadMedicine> list = new List<PharmacyHeadMedicine>();
-                    if (pharmacyHead.MedicineList.Count() == 0)
-                    {
-                        phead.MedicineList = null;
-                        int PHMId = phead.PHMedicineList.Select(x => x.Id).Single();
-                        int phId = phead.PHMedicineList.Select(x => x.PheadId).Single();
-                        int medId = phead.PHMedicineList.Select(x => x.MedicineId).Single();
+                phead.Medicines = _repository.GetPHMedicines(phead.Email).ToList();
+                
+                List<Medicine> medicines = _repository.GetMedicines().ToList();
+                
+                List<Medicine> PHMedicines = medicines.Where(x => x.Id == phead.Medicines.Select(x => x.MedicineId).Single()).ToList();
+                
+                List<PharmacyHeadMedicine> list = new List<PharmacyHeadMedicine>();
+
+                
+
+                if (!pharmacyHead.Medicines.Equals(PHMedicines))
+                {
+                    //phead.Medicines = pharmacyHead.Medicines;
+                    if (pharmacyHead.Medicines.Count() == 0)
+                    {
+                        phead.Medicines = null;
+                        int PHMId = phead.Medicines.Select(x => x.Id).Single();
+                        int phId = phead.Medicines.Select(x => x.PheadId).Single();
+                        int medId = phead.Medicines.Select(x => x.MedicineId).Single();
                         _iPHRepo.DeletePHMedicine(PHMId, phId, medId);
                         return;
                     }
-                    List<PharmacyHeadMedicine> PHMList = new List<PharmacyHeadMedicine>();
-                    if (phead.PHMedicineList == pharmacyHead.PHMedicineList)
-                    {
-                        foreach (var med in phead.MedicineList)
+                    foreach (var med in pharmacyHead.Medicines)
+                    {
+
+                        PharmacyHeadMedicine PHMObj = phead.Medicines.Select(x => new PharmacyHeadMedicine
                         {
-                            //list = phead.PHMedicineList.ToList();
-
-                            var PHMObj = phead.PHMedicineList.Select(x => new PharmacyHeadMedicine
-                            {
-                                Id = x.Id,
-                                PheadId = x.PheadId,
-                                Head = x.Head,
-                                MedicineId = x.MedicineId,
-                                Medicine = x.Medicine
-                            }).Where(x => x.MedicineId == med.Id).Single();
-                            if (PHMObj == null || PHMObj == default)
-                                break;
-                            if (PHMObj.MedicineId == med.Id)
-                                list.Add(PHMObj);
-
-                        }
-
-                        phead.PHMedicineList = list;
+                            Id = x.Id,
+                            PheadId = x.PheadId,
+                            Head = x.Head,
+                            MedicineId = x.MedicineId,
+                            Medicine = x.Medicine
+                        }).Where(x => !x.Medicine.Equals(med)).Single();
+                        if (PHMObj == null || PHMObj == default)
+                            break;
+                        if (PHMObj.MedicineId == med.Id)
+                            list.Add(PHMObj);
+
                     }
 
+                    phead.Medicines = list;
+
                     await _iPHRepo.UpdatePharmacyHead(phead);
                 }
-                else if (!phead.Equals(pharmacyHead))
-                {
-                    await _iPHRepo.UpdatePharmacyHead(pharmacyHead);
+                PharmacyHead head = new PharmacyHead()
+                {
+                    Name = pharmacyHead.Name,
+                    Email = pharmacyHead.Email,
+                    Password = pharmacyHead.Password,
+                    Pharmacies = pharmacyHead.Pharmacies,
+                    Medicines = list
+                };
+                if (!phead.Equals(head))
+                {
+                    await _iPHRepo.UpdatePharmacyHead(head);
                 }
                 else throw new Exception("Cannot update pharmacy head since there was no changes.");
@@ -117 +124 @@
             else throw new Exception("PharmacyHead has a null value.");
         }
-        public async Task<bool> Add(PharmacyHead pharmacyHead)
+        public async Task<bool> Add(PharmacyHeadDto pharmacyHead)
         {
             if (pharmacyHead != null)
             {
-                await _iPHRepo.Add(pharmacyHead);
+                PharmacyHead head = new PharmacyHead()
+                {
+                    Name = pharmacyHead.Name,
+                    Email = pharmacyHead.Email,
+                    Password = pharmacyHead.Password,
+                    Pharmacies = null,
+                    Medicines = null
+                };
+                await _iPHRepo.Add(head);
                 return true;
             }
@@ -149 +164 @@
         }
 
-        public object GetPharmacyHead(string userName)
+        public PharmacyHeadDto GetPharmacyHead(string userName)
         {
             if (userName != null)
@@ -156 +171 @@
                 List<PharmacyHeadMedicine> PHMedicines = _iPHRepo.GetPharmacyHeadMedicines(userName);
                 List<Medicine> Medicines = _repository.GetMedicines().ToList();
-                List<Medicine> PHMedicineList = new List<Medicine>();
-
-
-                //var meds = PHMedicines.Where(x => x.Id == Phead.Id).ToList();
-                var pharmacies = _iPHRepo.GetPharmacies();
-                var PheadPharms = pharmacies.Where(x => x.PheadId == Phead.Id).ToList();
+                List<Medicine> MedicineList = new List<Medicine>();
+
                 var user = _repository.GetRole(userName);
 
@@ -167 +178 @@
                 if (user.UserRole.ToString().Equals("Admin"))
                 {
-                    var Admin = new PharmacyHead()
+                    List<Pharmacy> pharmacies = new List<Pharmacy>();
+                    pharmacies = Phead.Pharmacies;
+                    var Admin = new PharmacyHeadDto()
                     {
                         Id = user.Id,
@@ -173 +186 @@
                         Name = user.Name,
                         Password = user.Password,
-                        PharmaciesList = Phead.PharmaciesList
+                        Pharmacies = pharmacies
                     };
 
                     return Admin;
                 }
-
-                if (PheadPharms.Count() > 0 || PheadPharms != null)
-                    Phead.PharmaciesList = PheadPharms;
-                else Phead.PharmaciesList = pharmacies;
-
-                if (Phead.PHMedicineList.Count() > 0 || Phead.PHMedicineList != null)
+                else
                 {
                     foreach (var med in Medicines)
                     {
-
-                        var PHMObj = Phead.PHMedicineList.Where(x => x.MedicineId == med.Id).SingleOrDefault();
+                        var PHMObj = Phead.Medicines.Where(x => x.MedicineId == med.Id).SingleOrDefault();
                         if (PHMObj == null)
                         {
                             continue;
                         }
-                        var phm = Phead.MedicineList;
                         if (PHMObj.MedicineId == med.Id)
                         {
@@ -207 +213 @@
                                 Packaging = med.Packaging
                             };
-                            PHMedicineList.Add(medicine);
+                            MedicineList.Add(medicine);
                         }
                     }
-                    Phead.MedicineList = PHMedicineList;
-                }
-                else
-                {
-                    Phead.MedicineList = Medicines;
-                }
-
-                PharmacyHead pharHead = new PharmacyHead()
+                }
+
+                PharmacyHeadDto pharmacyHead = new PharmacyHeadDto()
                 {
                     Id = Phead.Id,
-                    MedicineList = Phead.MedicineList,
-                    PharmaciesList = Phead.PharmaciesList,
+                    Medicines = MedicineList,
+                    Pharmacies = Phead.Pharmacies,
                     Email = Phead.Email,
                     Name = Phead.Name,
                     Password = Phead.Password
                 };
-                return pharHead;
+                return pharmacyHead;
             }
             else throw new Exception("Username is null.");

FarmatikoServices/Services/ProcessJSONService.cs

@@ -174 +174 @@
                     HealthFacility facility = _service.GetFacilityJSON(Convert.ToString(FacilityName));
 
-                    if (facility != null)
+                    if (facility != null && facility != default)
                     {
                         HealthFacility Facility = new HealthFacility(

FarmatikoServices/Services/Service.cs

@@ -130 +130 @@
         public User MakeUser(PharmacyHead head)
         {
-            var users = _repository.GetUsers();
+            
             
             User user = new User()

FarmatikoServices/Services/SystemService.cs

@@ -7 +7 @@
     public interface ISystemService
     {
-
+        public void ParseHTML();
     }
     public class SystemService