Changeset 8e74e2f for FarmatikoServices/Services

Timestamp:

11/16/20 03:55:10 (4 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

db484c9

Parents:

8b13eb2

Message:

Fix bugs, add some more.

Location:

FarmatikoServices/Services

Files:

• PHService.cs (modified) (5 diffs)
• Service.cs (modified) (1 diff)

FarmatikoServices/Services/PHService.cs

@@ -5 +5 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
@@ -64 +63 @@
                 var phead = _iPHRepo.GetPharmacyHead(pharmacyHead.Email);
 
-                if (pharmacyHead.PharmaciesList.Count() == 0)
-                    pharmacyHead.PharmaciesList = null;
+                /*if (pharmacyHead.PharmaciesList.Count() == 0)
+                    pharmacyHead.PharmaciesList = null;*/
 
 
                 phead.PHMedicineList = _repository.GetPHMedicines(phead.Email);
 
-                if (phead.MedicineList != pharmacyHead.MedicineList || phead != pharmacyHead)
+                if (phead.MedicineList != pharmacyHead.MedicineList)
                 {
                     phead.MedicineList = pharmacyHead.MedicineList;
@@ -83 +82 @@
                         return;
                     }
-                    foreach (var med in phead.MedicineList)
-                    {
-                        med.Id++;
-                        var PHMObj = phead.PHMedicineList.Select(x => new PharmacyHeadMedicine
+                    List<PharmacyHeadMedicine> PHMList = new List<PharmacyHeadMedicine>();
+                    if (phead.PHMedicineList == pharmacyHead.PHMedicineList)
+                    {
+                        foreach (var med in phead.MedicineList)
                         {
-                            PheadId = x.PheadId,
-                            Head = x.Head,
-                            MedicineId = x.MedicineId,
-                            Medicine = x.Medicine
-                        }).Where(x => x.MedicineId == med.Id).Single();
-                        list.Add(PHMObj);
+                            //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;
                     }
 
-                    phead.PHMedicineList = list;
-
                     await _iPHRepo.UpdatePharmacyHead(phead);
+                }
+                else if (!phead.Equals(pharmacyHead))
+                {
+                    await _iPHRepo.UpdatePharmacyHead(pharmacyHead);
                 }
                 else throw new Exception("Cannot update pharmacy head since there was no changes.");
@@ -154 +167 @@
                 if (user.UserRole.ToString().Equals("Admin"))
                 {
-                    var Admin = new
+                    var Admin = new PharmacyHead()
                     {
                         Id = user.Id,
                         Email = user.Email,
                         Name = user.Name,
-                        Passwd = user.Password,
-                        MedicineList = PHMedicines,
+                        Password = user.Password,
                         PharmaciesList = Phead.PharmaciesList
                     };
@@ -167 +179 @@
                 }
 
-                if (PheadPharms.Count() > 0)
-                    Phead.MedicineList = PHMedicineList;
+                if (PheadPharms.Count() > 0 || PheadPharms != null)
+                    Phead.PharmaciesList = PheadPharms;
                 else Phead.PharmaciesList = pharmacies;
 
-                if (Phead.PHMedicineList.Count() > 0)
+                if (Phead.PHMedicineList.Count() > 0 || Phead.PHMedicineList != null)
                 {
                     foreach (var med in Medicines)
                     {
-                        var PHMObj = Phead.PHMedicineList.Select(x => new PharmacyHeadMedicine
+
+                        var PHMObj = Phead.PHMedicineList.Where(x => x.MedicineId == med.Id).SingleOrDefault();
+                        if (PHMObj == null)
                         {
-                            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;
+                            continue;
+                        }
+                        var phm = Phead.MedicineList;
                         if (PHMObj.MedicineId == med.Id)
                         {
-                            Medicine medicine = new Medicine(med.Name, med.Strength, med.Form, med.WayOfIssuing, med.Manufacturer, med.Price, med.Packaging);
+                            var medicine = new Medicine()
+                            {
+                                Id = med.Id,
+                                Name = med.Name,
+                                Strength = med.Strength,
+                                Form = med.Form,
+                                WayOfIssuing = med.WayOfIssuing,
+                                Manufacturer = med.Manufacturer,
+                                Price = med.Price,
+                                Packaging = med.Packaging
+                            };
                             PHMedicineList.Add(medicine);
                         }

FarmatikoServices/Services/Service.cs

@@ -128 +128 @@
 
         // Ovaa kontrola ja ima samo admin
+        public User MakeUser(PharmacyHead head)
+        {
+            var users = _repository.GetUsers();
+            
+            User user = new User()
+            {
+                Name = head.Name,
+                Password = head.Password,
+                Email = head.Email,
+                UserRole = User.Role.PharmacyHead
+            };
+            return user;
+        }
         public async Task AddPharmacyHead(PharmacyHead pharmacyHead)
         {
             if (pharmacyHead != null)
             {
-                /*var Medicines = await _repository.GetMedicinesAsync();
-                foreach (var med in Medicines)
-                {
-                    pharmacyHead.MedicineList.Add(med);
-                }*/
-                
+                var user = MakeUser(pharmacyHead);
+                await _repository.AddUser(user);                
                 await _repository.AddPharmacyHead(pharmacyHead);
             }