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

UnivateProperties_API/Containers/Timeshare/RegionDto.cs

@@ -29,6 +29,13 @@ namespace UnivateProperties_API.Containers.Timeshare
         public string RegionName { get; set; }
         public string RegionCode { get; set; }
         public List<ResortDto> Resorts { get; set; }
+        public int Available
+        {
+            get
+            {
+                return Resorts != null ? Resorts.Sum(x => x.Available) : 0;
+            }
+        }
 
         public void TryAddResort(string resortCode, string resortName)
         {

UnivateProperties_API/Containers/Timeshare/ResortDto.cs

@@ -15,5 +15,6 @@
 
         public string ResortCode { get; set; }
         public string ResortName { get; set; }
+        public int Available { get; set; }
     }
 }

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -15,9 +15,12 @@ namespace UnivateProperties_API.Containers.Timeshare
             Id = week.Id;
             AgentAsRep = week.AgentAsRep;
             OtherResort = week.OtherResort;
+            Agency = week.Agency?.AgencyName;
+            Agent = $"{week.Agent?.Name} {week.Agent?.Surname}";
+            Owner = $"{week.Owner?.Name} {week.Owner?.Surname}";
             Resort = new ResortDto(week.ResortCode, week.ResortName);
             Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Description, week.Region?.Code);
-            Status = new StatusDto(week.Status.Id, week.Status.Code, week.Status.Description);
+            Status = new StatusDto(week.Status.Id, week.Status?.Code, week.Status?.Description);
             Bedrooms = week.Bedrooms;
             MaxSleep = week.MaxSleep;
             UnitNumber = week.UnitNumber;
@@ -32,6 +35,9 @@ namespace UnivateProperties_API.Containers.Timeshare
         public int Id { get; set; }
         public bool AgentAsRep { get; set; }
         public bool OtherResort { get; set; }
+        public string Agency { get; set; }
+        public string Agent { get; set; }
+        public string Owner { get; set; }
         public ResortDto Resort { get; set; }
         public RegionDto Region { get; set; }
         public StatusDto Status { get; set; }

UnivateProperties_API/Containers/Users/Simple/SimpleAgencyDto.cs

@@ -0,0 +1,8 @@
+namespace UnivateProperties_API.Containers.Users.Simple
+{
+    public class SimpleAgencyDto
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+    }
+}

UnivateProperties_API/Containers/Users/Simple/SimpleItem.cs

@@ -0,0 +1,10 @@
+namespace UnivateProperties_API.Containers.Users.Simple
+{
+    public class SimpleItem
+    {
+        public SimpleUserDto User { get; set; }
+        public SimplePersonDto Person { get; set; }
+        public SimpleTokenDto Token { get; set; }
+        public SimpleAgencyDto Agency { get; set; }
+    }
+}

UnivateProperties_API/Containers/Users/Simple/SimplePersonDto.cs

@@ -0,0 +1,13 @@
+namespace UnivateProperties_API.Containers.Users.Simple
+{
+    public class SimplePersonDto
+    {
+        public string Name { get; set; }
+        public string Surname { get; set; }
+        public string FullName 
+        {
+            get { return $"{Name} {Surname}"; }
+        }
+        public string Email { get; set; }
+    }
+}

UnivateProperties_API/Containers/Users/Simple/SimpleTokenDto.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace UnivateProperties_API.Containers.Users.Simple
+{
+    public class SimpleTokenDto
+    {
+        public string Token { get; set; }
+        public DateTime Expires { get; set; }
+    }
+}

UnivateProperties_API/Containers/Users/Simple/SimpleUserDto.cs

@@ -0,0 +1,9 @@
+namespace UnivateProperties_API.Containers.Users.Simple
+{
+    public class SimpleUserDto
+    {
+        public int Id { get; set; }
+        public string Username { get; set; }
+        public string Role { get; set; }
+    }
+}

UnivateProperties_API/Context/DataContext.cs

@@ -117,6 +117,9 @@ namespace UnivateProperties_API.Context
                 b.HasKey(e => e.Id);
                 b.Property(e => e.Id).ValueGeneratedOnAdd();
             });
+            modelBuilder.Entity<Individual>()
+            .HasIndex(i => new { i.Telephone, i.CellNumber, i.Email })
+            .IsUnique(true);
             modelBuilder.Entity<Agent>(b =>
             {
                 b.HasKey(e => e.Id);
@@ -132,6 +135,9 @@ namespace UnivateProperties_API.Context
                 b.HasKey(e => e.Id);
                 b.Property(e => e.Id).ValueGeneratedOnAdd();
             });
+            modelBuilder.Entity<User>()
+            .HasIndex(u => u.Username)
+            .IsUnique(true);
             modelBuilder.Entity<Email>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<SMTPAccount>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<SMTPHost>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
@@ -158,7 +164,6 @@ namespace UnivateProperties_API.Context
             modelBuilder.Entity<Address>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<BidItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<ProcessFlow>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
-
         }
     }
 }

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -44,7 +44,17 @@ namespace UnivateProperties_API.Controllers.Timeshare
                 return new OkObjectResult(item);
             }
             else return new OkResult();
+        }
 
+        [HttpGet("getMyWeek/{id}")]
+        public IActionResult GetMyWeek(int id)
+        {
+            if (_Repo is WeekRepository)
+            {
+                var item = (_Repo as WeekRepository).GetMyWeeks(id);
+                return new OkObjectResult(item);
+            }
+            else return new OkResult();
         }
 
         [HttpGet("getBy")]

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -8,6 +8,7 @@ using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
 using UnivateProperties_API.Containers.Users;
+using UnivateProperties_API.Containers.Users.Simple;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Users;
 using UnivateProperties_API.Repository.Users;
@@ -34,36 +35,50 @@ namespace UnivateProperties_API.Controllers.Users
         [HttpPost("authenticate")]
         public IActionResult Authenticate([FromBody]UserDto userDto)
         {
-            var user = _Repo.Authenticate(userDto.Username, userDto.Password);
-
+            try
+            {
+                var user = _Repo.Authenticate(userDto.Username, userDto.Password);
 
-            if (user == null)
-                return BadRequest(new { message = "Username or password is incorrect" });
 
-            var name = _Repo.UserDetails(user.Id);
+                if (user == null)
+                    return BadRequest(new { message = "Username or password is incorrect" }); 
 
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
-            var tokenDescriptor = new SecurityTokenDescriptor
-            {
-                Subject = new ClaimsIdentity(new Claim[]
+                var tokenHandler = new JwtSecurityTokenHandler();
+                var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
+                var tokenDescriptor = new SecurityTokenDescriptor
                 {
+                    Subject = new ClaimsIdentity(new Claim[]
+                    {
                     new Claim(ClaimTypes.Name, user.Id.ToString()),
                     new Claim(ClaimTypes.Role, user.Role)
-                }),
-                Expires = DateTime.UtcNow.AddMinutes(15),
-                SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
-            };
-            var token = tokenHandler.CreateToken(tokenDescriptor);
-            var tokenString = tokenHandler.WriteToken(token);
-            // return basic user info (without password) and token to store client side
-            return Ok(new
+                    }),
+                    Expires = DateTime.UtcNow.AddMinutes(15),
+                    SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
+                };
+                var token = tokenHandler.CreateToken(tokenDescriptor);
+                SimpleItem item = new SimpleItem()
+                {
+                    User = new SimpleUserDto()
+                    {
+                        Id = user.Id,
+                        Role = user.Role,
+                        Username = user.Username
+                    },
+                    Person = _Repo.UserDetails(user.Id),
+                    Token = new SimpleTokenDto()
+                    {
+                        Token = tokenHandler.WriteToken(token),
+                        Expires = tokenDescriptor.Expires.Value
+                    }
+                };
+                // return basic user info (without password) and token to store client side
+                return Ok(item);
+            }
+            catch(Exception)
             {
-                user.Id,
-                user.Username,
-                Token = tokenString,
-                name
-            });
+                return new UnauthorizedResult();
+            }
+            
         }
 
         //Writes to DB

UnivateProperties_API/Model/Users/Person.cs

@@ -17,6 +17,7 @@ namespace UnivateProperties_API.Model.Users
         public int? UserId { get; set; }
         public string Name { get; set; }
         public string Surname { get; set; }
+        [DataType(DataType.EmailAddress)]
         public string Email { get; set; }
         [Phone]
         public string Telephone { get; set; }

UnivateProperties_API/Model/Users/User.cs

@@ -32,5 +32,12 @@ namespace UnivateProperties_API.Model.Users
         public bool Verified { get; set; }
         public string Token { get; set; }
         #endregion Properties
+
+        #region Methods
+        public bool IsUserInRole(string role)
+        {
+            return Role == role;
+        }
+        #endregion
     }
 }

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Containers.Timeshare;
+using UnivateProperties_API.Containers.Users;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.Timeshare;
 using UnivateProperties_API.Repository.Region;
@@ -46,10 +47,47 @@ namespace UnivateProperties_API.Repository.Timeshare
             return list;
         }
 
+        public List<WeekDto> GetMyWeeks(int userId)
+        {
+            List<WeekDto> list = new List<WeekDto>();
+            UserRepository userRepository = new UserRepository(_dbContext);
+            var user = userRepository.Get(x => x.Id == userId).FirstOrDefault();
+            if(user.IsUserInRole(Role.SuperAdmin))
+            {
+                foreach (var item in GetDetailedAll())
+                {
+                    list.Add(new WeekDto(item));
+                }
+            }
+            else if(user.IsUserInRole(Role.Agency))
+            {
+                foreach (var item in GetDetailedAll().Where(x => x.AgencyId == userId))
+                {
+                    list.Add(new WeekDto(item));
+                }
+            }
+            else if (user.IsUserInRole(Role.Agent) || user.IsUserInRole(Role.ManagingAgent))
+            {
+                foreach (var item in GetDetailedAll().Where(x => x.AgentId == userId))
+                {
+                    list.Add(new WeekDto(item));
+                }
+            }
+            else
+            {
+                foreach (var item in GetDetailedAll().Where(x => x.OwnerId == userId))
+                {
+                    list.Add(new WeekDto(item));
+                }
+            }
+            return list;
+        }
+
         public List<RegionDto> GetAvailResort()
         {
             List<RegionDto> list = new List<RegionDto>();
-            foreach (var item in GetDetailedAll())
+            var allItems = GetDetailedAll();
+            foreach (var item in allItems)
             {
                 if (item.Region != null)
                 {
@@ -64,7 +102,14 @@ namespace UnivateProperties_API.Repository.Timeshare
                 }
             }
             list = list.OrderBy(x => x.RegionName).ToList();
-            list.ForEach(x => x.OrderResorts());
+            foreach(var region in list)
+            {
+                region.OrderResorts();
+                foreach(var resort in region.Resorts)
+                {
+                    resort.Available = allItems.Count(x => x.ResortCode == resort.ResortCode);
+                }
+            }
             return list;
         }
 

UnivateProperties_API/Repository/Users/IRegisterRepository.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using UnivateProperties_API.Containers.Users;
+using UnivateProperties_API.Containers.Users.Simple;
 using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Repository.Users
@@ -20,6 +21,6 @@ namespace UnivateProperties_API.Repository.Users
         void Delete(int id);
         void DeleteAgency(int id);
         void DeleteIndividual(int id);
-        string UserDetails(int userId);
+        SimplePersonDto UserDetails(int userId);
     }
 }

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Containers.Users;
+using UnivateProperties_API.Containers.Users.Simple;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Users;
@@ -275,7 +276,7 @@ namespace UnivateProperties_API.Repository.Users
             return id;
         }
 
-        public string UserDetails(int userId)
+        public SimplePersonDto UserDetails(int userId)
         {
             var individual = _dbContext.Individuals.Where(i => i.UserId == userId).FirstOrDefault();
 
@@ -284,16 +285,26 @@ namespace UnivateProperties_API.Repository.Users
                 var agent = _dbContext.Agents.Where(i => i.UserId == userId).FirstOrDefault();
                 if (agent != null)
                 {
-                    return agent.Name + " " + agent.Surname;
+                    return new SimplePersonDto()
+                    {
+                        Name = agent.Name,
+                        Surname = agent.Surname,
+                        Email = agent.Email
+                    };
                 }
                 else
                 {
-                    return "";
+                    return new SimplePersonDto(); ;
                 }
             }
             else
             {
-                return individual.Name + " " + individual.Surname;
+                return new SimplePersonDto()
+                {
+                    Name = individual.Name,
+                    Surname = individual.Surname,
+                    Email = individual.Email
+                };
             }
         }
     }