Fix Agent Update

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs

@@ -20,7 +20,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             MaritalStatus = individual.HowMarried.ToString();
             EmailAddress = individual.Email;
             CellNumber = individual.CellNumber;
-            LandlineNumber = individual.Telephone;
+            Telephone = individual.Telephone;
             SpouseCellnumber = individual.SpouseCellnumber;
             SpouseEmail = individual.SpouseEmail;
             SpouseName = individual.SpouseName;
@@ -80,7 +80,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             Surname = agent.Surname;
             EmailAddress = agent.Email;
             CellNumber = agent.CellNumber;
-            LandlineNumber = agent.Telephone;
+            Telephone = agent.Telephone;
             Address = new DetailedAddress();
             BankingDetails = new DetailedBankDetails();
         }
@@ -93,7 +93,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
         public string MaritalStatus { get; set; }
         public string EmailAddress { get; set; }
         public string CellNumber { get; set; }
-        public string LandlineNumber { get; set; }  
+        public string Telephone { get; set; }  
         public int HowMarried { get; set; }
         public string SpouseName { get; set; }
         public string SpouseSurname { get; set; }        

UnivateProperties_API/Model/Users/Individual.cs

@@ -52,7 +52,7 @@ namespace UnivateProperties_API.Model.Users
                 CompanyRegNumber = owner.CompanyRegNumber;                
                 Email = owner.EmailAddress;
                 CellNumber = owner.CellNumber;
-                Telephone = owner.LandlineNumber;
+                Telephone = owner.Telephone;
 
                 if (owner.Address != null)
                 {

UnivateProperties_API/Model/Users/Person.cs

@@ -31,7 +31,7 @@ namespace UnivateProperties_API.Model.Users
         [DataType(DataType.EmailAddress)]
         public string Email { get; set; }
         [VisibleInListView(false)]
-        [Phone]
+        //[Phone]
         public string Telephone { get; set; }
         [Phone]
         public string CellNumber { get; set; }

UnivateProperties_API/Repository/Users/AgentRepository.cs

@@ -18,7 +18,7 @@ namespace UnivateProperties_API.Repository.Users
 
         public List<Agent> Get(Func<Agent, bool> where)
         {
-            return _dbContext.Agents.Where(where).ToList();
+            return _dbContext.Agents.Include("User").Where(where).ToList();
         }
 
         public List<Agent> GetAll()
@@ -51,11 +51,11 @@ namespace UnivateProperties_API.Repository.Users
             if (item.User.Role == "Agent" || item.User.Role == "Agency" || item.User.Role == "Managing Agent")
             {
                 if (agent == null)
-                {                    
+                {
                     if (individual != null)
                     {
                         individual.IsDeleted = true;
-                        _dbContext.Individuals.Update(individual);                        
+                        _dbContext.Individuals.Update(individual);
                     }
                     item.Id = 0;
                     _dbContext.Agents.Add(item);
@@ -95,7 +95,7 @@ namespace UnivateProperties_API.Repository.Users
                     if (individual != null)
                     {
                         individual.IsDeleted = true;
-                        _dbContext.Individuals.Update(individual);                        
+                        _dbContext.Individuals.Update(individual);
                     }
                     _dbContext.Agents.Update(agent);
                     if (item.User.Role != user.Role)
@@ -180,11 +180,40 @@ namespace UnivateProperties_API.Repository.Users
 
         public void Update(Agent item)
         {
-            //var savedAgent = _dbContext.Agents.Where(x => x.Id == item.Id).FirstOrDefault();
+            var individual = _dbContext.Individuals.Include("User").Include("Address").Include("BankAccount").FirstOrDefault(x => x.UserId == item.UserId);
+            var user = _dbContext.Users.Where(x => x.Id == item.User.Id).FirstOrDefault();
 
-            
-            _dbContext.Entry(item).State = EntityState.Modified;
-            _dbContext.Entry(item.User).State = EntityState.Modified;
+            if (item.User.Role == "Agent" || item.User.Role == "Agency" || item.User.Role == "Managing Agent")
+            {
+                item.IsDeleted = false;
+                if (individual != null)
+                {
+                    individual.IsDeleted = true;
+                }
+            }
+            else
+            {
+                item.IsDeleted = true;
+                if (individual != null)
+                {
+                    individual.IsDeleted = false;
+                }
+
+            }
+            if (individual != null)
+            {
+                _dbContext.Individuals.Update(individual);
+                //_dbContext.Entry(individual).State = EntityState.Modified;
+            }
+            if (item.User.Role != user.Role)
+            {
+                user.Role = item.User.Role;
+                _dbContext.Users.Update(user);
+                //_dbContext.Entry(user).State = EntityState.Modified;
+            }
+            _dbContext.Agents.Update(item);
+            //_dbContext.Entry(item).State = EntityState.Modified;
+            //_dbContext.Entry(item.User).State = EntityState.Modified;
             Save();
         }