Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -47,6 +47,8 @@ namespace UnivateProperties_API.Controllers.Users
             if (user == null)
                 return BadRequest(new { message = "Username or password is incorrect" });
 
+            var name = _Repo.UserDetails(user.Id);
+
             var tokenHandler = new JwtSecurityTokenHandler();
             var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
             var tokenDescriptor = new SecurityTokenDescriptor
@@ -66,7 +68,8 @@ namespace UnivateProperties_API.Controllers.Users
             {
                 user.Id,
                 user.Username,
-                Token = tokenString
+                Token = tokenString,
+                name
             });
         }
 

UnivateProperties_API/Repository/Users/IRegisterRepository.cs

@@ -20,5 +20,6 @@ namespace UnivateProperties_API.Repository.Users
         void Delete(int id);
         void DeleteAgency(int id);
         void DeleteIndividual(int id);
+        string UserDetails(int userId);
     }
 }

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -258,5 +258,27 @@ namespace UnivateProperties_API.Repository.Users
         {
             _dbContext.SaveChanges();
         }
+
+        public string UserDetails(int userId)
+        {
+            var individual = _dbContext.Individuals.Where(i => i.UserId == userId).FirstOrDefault();
+
+            if (individual == null)
+            {
+                var agent = _dbContext.Agents.Where(i => i.UserId == userId).FirstOrDefault();
+                if (agent != null)
+                {
+                    return agent.Name + " " + agent.Surname;
+                }
+                else
+                {
+                    return "";
+                }
+            }
+            else
+            {
+                return individual.Name + " " + individual.Surname;
+            }
+        }
     }
 }