Changeset 0a694bb for FarmatikoServices/Services

Timestamp:

02/07/21 16:25:56 (3 years ago)

Author:

Dimitar Slezenkovski <dslezenkovski@…>

Branches:

master

Children:

e0cdea2

Parents:

ac51326

Message:

Fix create new user bug.

Location:

FarmatikoServices/Services

Files:

• PHService.cs (modified) (2 diffs)
• Service.cs (modified) (4 diffs)

FarmatikoServices/Services/PHService.cs

@@ -73 +73 @@
 
                 
-
-                if (!pharmacyHead.Medicines.Equals(PHMedicines))
-                {
-                    //phead.Medicines = pharmacyHead.Medicines;
-                    if (pharmacyHead.Medicines.Count() == 0)
+                if (pharmacyHead.Medicines != null || pharmacyHead.Medicines.Count() > 0)
+                    if (!pharmacyHead.Medicines.Equals(PHMedicines))
                     {
-                        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;
+                        //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;
+                        }
+                        foreach (var med in pharmacyHead.Medicines)
+                        {
+
+                            PharmacyHeadMedicine PHMObj = phead.Medicines.Select(x => new PharmacyHeadMedicine
+                            {
+                                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);
+
                     }
-                    foreach (var med in pharmacyHead.Medicines)
-                    {
-
-                        PharmacyHeadMedicine PHMObj = phead.Medicines.Select(x => new PharmacyHeadMedicine
-                        {
-                            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);
+                
+                if (pharmacyHead.Pharmacies != null || pharmacyHead.Pharmacies.Count() > 0)
+                {
+                    phead.Pharmacies = pharmacyHead.Pharmacies;
                 }
                 PharmacyHead head = new PharmacyHead()
@@ -112 +118 @@
                     Name = pharmacyHead.Name,
                     Email = pharmacyHead.Email,
-                    Password = pharmacyHead.Password,
-                    Pharmacies = pharmacyHead.Pharmacies,
-                    Medicines = list
+                    Password = pharmacyHead.Password
                 };
                 if (!phead.Equals(head))

FarmatikoServices/Services/Service.cs

@@ -48 +48 @@
             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>();
+            List<string> headNames = new List<string>();
+            List<PharmacyHead> heads = new List<PharmacyHead>();
+            foreach (var med in Medicines)
+            {
+                var meds = listPHMedicines.Where(x => x.MedicineId == med.Id).ToList();
+                if (meds != null)
+                {
+                    heads = meds.Select(x => x.Head).ToList();
+                }
                 headNames = heads.Select(x => x.Name).ToList();
                 MedicineDTO medicine = new MedicineDTO()
@@ -89 +94 @@
                     Location = pharm.Location,
                     Address = pharm.Address,
-                    WorkAllTime = pharm.WorkAllTime,
-                    HeadName = pharm.PharmacyHead.Name?? "" 
+                    WorkAllTime = pharm.WorkAllTime
                 };
+                if (pharm.PharmacyHead != null)
+                {
+                    pharmacyDTO.HeadName = pharm.PharmacyHead.Name;
+                }
+
                 pharmacies.Add(pharmacyDTO);
             }
@@ -165 +174 @@
 
         // Ovaa kontrola ja ima samo admin
-        public User MakeUser(PharmacyHead head)
-        {
-            
-            
+        public async Task<User> MakeUser(PharmacyHead head)
+        {
             User user = new User()
             {
@@ -176 +183 @@
                 UserRole = User.Role.PharmacyHead
             };
+            bool Success = await _repository.AddUser(user);
+            if (!Success)
+                return null;
             return user;
         }
-        public async Task AddPharmacyHead(PharmacyHead pharmacyHead)
+        public async Task<bool> AddPharmacyHead(PharmacyHeadDto pharmacyHead)
         {
             if (pharmacyHead != null)
             {
-                var user = MakeUser(pharmacyHead);
-                await _repository.AddUser(user);                
-                await _repository.AddPharmacyHead(pharmacyHead);
+                var phead = new PharmacyHead()
+                {
+                    Name = pharmacyHead.Name,
+                    Email = pharmacyHead.Email,
+                    Password = pharmacyHead.Password
+                };
+                var user = await MakeUser(phead);
+                if (user is null)
+                {
+                    return false;
+                }
+                var users = _repository.GetUsers();
+                var thisUser = users.Where(usr => usr.Value.Email.Equals(user.Email)).Select(x => x.Value).FirstOrDefault();
+                User user1 = new User()
+                {
+                    Name = thisUser.Name,
+                    Password = thisUser.Password,
+                    Email = thisUser.Email,
+                    UserRole = thisUser.UserRole
+                };
+                phead.User = user1;
+                await _repository.AddPharmacyHead(phead);
+                return true;
             }
-            else throw new Exception("PharmacyHead is null");
+            else throw new Exception("PharmacyHeadDto is null");
         }
         //za json(Sys updater)