Changeset 1db5673 for FarmatikoServices

Timestamp:

11/14/20 12:27:30 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

68454c6

Parents:

ad60966

Message:

Fix bugs, add some more

Location:

FarmatikoServices

Files:

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

FarmatikoServices/FarmatikoServiceInterfaces/IPHService.cs

@@ -18 +18 @@
         Task<bool> Remove(int id);
         Task<bool> RemoveClaimingRequest(int id);
-        PharmacyHead GetPharmacyHead(string userName);
+        object GetPharmacyHead(string userName);
     }
 }

FarmatikoServices/Services/PHService.cs

@@ -13 +13 @@
     {
         private readonly IPHRepo _iPHRepo;
-        public PHService(IPHRepo iPHRepo)
+        private readonly IRepository _repository;
+        public PHService(IPHRepo iPHRepo, IRepository repository)
         {
             _iPHRepo = iPHRepo;
+            _repository = repository;
         }
 
@@ -55 +57 @@
 
 
+
         public async Task UpdatePharmacyHead(PharmacyHead pharmacyHead)
         {
             if (pharmacyHead != null)
-                await _iPHRepo.UpdatePharmacyHead(pharmacyHead);
+            {
+                var phead = _iPHRepo.GetPharmacyHead(pharmacyHead.Email);
+
+                if (pharmacyHead.PharmaciesList.Count() == 0)
+                    pharmacyHead.PharmaciesList = null;
+                if (pharmacyHead.MedicineList.Count() == 0)
+                    pharmacyHead.MedicineList = null;
+
+                phead.PHMedicineList = _repository.GetPHMedicines(phead.Email);
+
+                if (phead.MedicineList != pharmacyHead.MedicineList || phead != pharmacyHead)
+                {
+                    phead.MedicineList = pharmacyHead.MedicineList;
+                    List<PharmacyHeadMedicine> list = new List<PharmacyHeadMedicine>();
+
+                    foreach (var med in phead.MedicineList)
+                    {
+                        med.Id++;
+                        var PHMObj = phead.PHMedicineList.Select(x => new PharmacyHeadMedicine
+                        {
+                            PheadId = x.PheadId,
+                            Head = x.Head,
+                            MedicineId = x.MedicineId,
+                            Medicine = x.Medicine
+                        }).Where(x => x.MedicineId == med.Id).Single();
+                        list.Add(PHMObj);
+                    }
+
+                    phead.PHMedicineList = list;
+
+                    await _iPHRepo.UpdatePharmacyHead(phead);
+                }
+                else throw new Exception("Cannot update pharmacy head since there was no changes.");
+            }
             else throw new Exception("PharmacyHead has a null value.");
         }
@@ -93 +129 @@
         }
 
-        public PharmacyHead GetPharmacyHead(string userName)
+        public object GetPharmacyHead(string userName)
         {
             if (userName != null)
             {
-                return _iPHRepo.GetPharmacyHeadByUserName(userName);
-            }
-            return default;
+                var Phead = _iPHRepo.GetPharmacyHeadByUserName(userName);
+                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();
+                var user = _repository.GetRole(userName);
+
+
+                if (user.UserRole.ToString().Equals("Admin"))
+                {
+                    var Admin = new
+                    {
+                        Id = user.Id,
+                        Email = user.Email,
+                        Name = user.Name,
+                        Passwd = user.Password,
+                        MedicineList = PHMedicines,
+                        PharmaciesList = Phead.PharmaciesList
+                    };
+
+                    return Admin;
+                }
+
+                if (PheadPharms.Count() > 0)
+                    Phead.MedicineList = PHMedicineList;
+                else Phead.PharmaciesList = pharmacies;
+
+                if (Phead.PHMedicineList.Count() > 0)
+                {
+                    foreach (var med in Medicines)
+                    {
+                        var PHMObj = Phead.PHMedicineList.Select(x => new PharmacyHeadMedicine
+                        {
+                            PheadId = x.PheadId,
+                            Head = x.Head,
+                            MedicineId = x.MedicineId,
+                            Medicine = x.Medicine
+                        }).Where(x => x.MedicineId == med.Id).SingleOrDefault();
+                        if (PHMObj == null || PHMObj == default)
+                            break;
+                        if (PHMObj.MedicineId == med.Id)
+                        {
+                            Medicine medicine = new Medicine(med.Name, med.Strength, med.Form, med.WayOfIssuing, med.Manufacturer, med.Price, med.Packaging);
+                            PHMedicineList.Add(medicine);
+                        }
+                    }
+                    Phead.MedicineList = PHMedicineList;
+                }
+                else
+                {
+                    Phead.MedicineList = Medicines;
+                }
+
+                PharmacyHead pharHead = new PharmacyHead()
+                {
+                    Id = Phead.Id,
+                    MedicineList = Phead.MedicineList,
+                    PharmaciesList = Phead.PharmaciesList,
+                    Email = Phead.Email,
+                    Name = Phead.Name,
+                    Password = Phead.Password
+                };
+                return pharHead;
+            }
+            else throw new Exception("Username is null.");
         }
     }

FarmatikoServices/Services/ProcessJSONService.cs

@@ -58 +58 @@
                 string url1 = "http://data.gov.mk/dataset/d84c31d9-e749-4b17-9faf-a5b4db3e7a70/resource/ce446f5c-e541-46f6-9e8c-67568059cbc6/download/registar-na-apteki-vnatre-vo-mreza-na-fzo-12.08.2020.xlsx";
                 string url2 = "http://data.gov.mk/dataset/d84c31d9-e749-4b17-9faf-a5b4db3e7a70/resource/a16379b4-ec81-4de7-994d-0ee503d71b55/download/registar-na-apteki-nadvor-od-mreza-na-fzo-12.08.2020.xlsx";
-                int count = 0;
                 Uri uri1 = new Uri(url1);
                 Uri uri2 = new Uri(url2);

FarmatikoServices/Services/Service.cs

@@ -44 +44 @@
         public async Task<IEnumerable<Medicine>> GetMedicines()
         {
-            var Medicines = await _repository.GetMedicines();
+            var Medicines = await _repository.GetMedicinesAsync();
             return Medicines;
         }
@@ -126 +126 @@
             else throw new Exception("Pharmacy is null");
         }
+
         // Ovaa kontrola ja ima samo admin
         public async Task AddPharmacyHead(PharmacyHead pharmacyHead)
@@ -131 +132 @@
             if (pharmacyHead != null)
             {
-                var Medicines = await _repository.GetMedicines();
+                var Medicines = await _repository.GetMedicinesAsync();
                 foreach (var med in Medicines)
                 {
-                    MedicineList medicine = new MedicineList()
-                    {
-                        Medicine = med,
-                        HasMedicine = false
-                    };
-                    pharmacyHead.MedicineLists.Add(medicine);
+                    pharmacyHead.MedicineList.Add(med);
                 }
+                
                 await _repository.AddPharmacyHead(pharmacyHead);
             }
-            throw new Exception("PharmacyHead is null");
+            else throw new Exception("PharmacyHead is null");
         }
         //za json(Sys updater)