commit merge

UnivateProperties_API/Containers/Property/PropertyDisplay.cs

@@ -6,6 +6,7 @@ namespace UnivateProperties_API.Containers.Property
     {
         #region Properties
         public int Id { get; set; }
+        public string PropertyUsageType { get; set; }
         public string ShortDescription { get; set; }
         public bool IsSale { get; set; }
         public string DisplayPrice { get; set; }
@@ -29,7 +30,7 @@ namespace UnivateProperties_API.Containers.Property
         public string City { get; set; }
         public string Suburb { get; set; }
         public string DisplayImage { get; set; }
-        public decimal Price { get; set; }
+        public decimal Price { get; set; }        
         public DateTime DateCreated { get; set; }
         #endregion 
     }

UnivateProperties_API/Containers/Property/PropertySearch.cs

@@ -11,6 +11,8 @@
         public string Province { get; set; }
         public string City { get; set; }
         public string Suburb { get; set; }
+        public decimal MinPrice { get; set; }
+        public decimal MaxPrice { get; set; }
         #endregion 
     }
 }

UnivateProperties_API/Containers/Timeshare/TimeshareSearch.cs

@@ -1,8 +1,9 @@
 namespace UnivateProperties_API.Containers.Timeshare
 {
-    public class TimeshareSearch
+    public class SearchObject
     {
         public string UserName { get; set; }
+        public string Type { get; set; }
         public string Property { get; set; }
         public string Value { get; set; }
     }

UnivateProperties_API/Containers/Timeshare/TimeshareSearchDisplay.cs

@@ -2,9 +2,10 @@
 
 namespace UnivateProperties_API.Containers.Timeshare
 {
-    public class TimeshareSearchDisplay
+    public class SearchDisplay
     {
         public string UserName { get; set; }
+        public string Type { get; set; }
         public DateTime Date { get; set; }
         public string Property { get; set; }
         public string Value { get; set; }

UnivateProperties_API/Controllers/Logging/SearchLogController.cs

@@ -17,23 +17,19 @@ namespace UnivateProperties_API.Controllers.Logging
         }
       
 
-        [HttpGet("{type}")]
-        public IActionResult Get(string type)
-        {
-            if (type.ToUpper() == "PROPERTY")
-                return new OkObjectResult(_Repo.GetPropertySearches());
-            else if (type.ToUpper() == "TIMESHARE")
-                return new OkObjectResult(_Repo.GetTimeshareSearches());
-            else return NoContent();
+        [HttpGet]
+        public IActionResult Get()
+        {      
+            return new OkObjectResult(_Repo.GetSearches());
         }
         
 
         [HttpPost]
-        public IActionResult Post([FromBody] TimeshareSearch item)
+        public IActionResult Post([FromBody] SearchObject item)
         {
             using (var scope = new TransactionScope())
             {
-                _Repo.SaveTimeshareSearch(item);
+                _Repo.SaveSearch(item);
                 scope.Complete();
                 return new OkObjectResult(item);
             }

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -78,15 +78,15 @@ namespace UnivateProperties_API.Controllers.Properties
         }
         #endregion
 
-        [HttpPost("search")]
+        [HttpGet("search")]
         public IActionResult Search([FromBody] PropertySearch search)
         {
             return new OkObjectResult(_Repo.GetDisplay(search));
         }
 
         //Will need to come out. Post search not working......:(
-        [HttpGet("search/{userName}/{keyword}/{salesType}/{propertyUsageType}/{propertyType}/{province}/{city}/{suburb}")]
-        public IActionResult Search(string userName, string keyword, string salesType, string propertyUsageType, string propertyType, string province, string city, string suburb)
+        [HttpGet("search/{userName}/{keyword}/{salesType}/{propertyUsageType}/{propertyType}/{province}/{city}/{suburb}/{minPrice}/{maxPrice}")]
+        public IActionResult Search(string userName, string keyword, string salesType, string propertyUsageType, string propertyType, string province, string city, string suburb, decimal minPrice, decimal maxPrice)
         {
             var search = new PropertySearch()
             {
@@ -97,7 +97,9 @@ namespace UnivateProperties_API.Controllers.Properties
                 PropertyType = propertyType,
                 Province = province,
                 City = city,
-                Suburb = suburb
+                Suburb = suburb,
+                MinPrice = minPrice,
+                MaxPrice = maxPrice
             };
 
             return new OkObjectResult(_Repo.GetDisplay(search));

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -40,6 +40,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
@@ -59,7 +61,8 @@ namespace UnivateProperties_API.Controllers.Users
             {
                 user.Id,
                 user.Username,
-                Token = tokenString
+                Token = tokenString,
+                name
             });
         }
 

UnivateProperties_API/Migrations/20190912055827_SearchLogStuff.cs

@@ -0,0 +1,40 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class SearchLogStuff : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "UserID",
+                table: "SearchLogs");
+
+            migrationBuilder.DropColumn(
+                name: "GCRecord",
+                table: "Properties");
+
+            migrationBuilder.AddColumn<string>(
+                name: "Type",
+                table: "SearchLogs",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Type",
+                table: "SearchLogs");
+
+            migrationBuilder.AddColumn<int>(
+                name: "UserID",
+                table: "SearchLogs",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "GCRecord",
+                table: "Properties",
+                nullable: true);
+        }
+    }
+}

UnivateProperties_API/Repository/Logging/ISearchLogRepository.cs

@@ -7,8 +7,7 @@ namespace UnivateProperties_API.Repository.Logging
 {
     public interface ISearchLogRepository: IRepository<SearchLog>
     {
-        List<TimeshareSearchDisplay> GetTimeshareSearches();
-        List<PropertySearchDispaly> GetPropertySearches();
-        void SaveTimeshareSearch(TimeshareSearch item);
+        List<SearchDisplay> GetSearches();        
+        void SaveSearch(SearchObject item);
     }
 }

UnivateProperties_API/Repository/Logging/SearchLogRepository.cs

@@ -39,44 +39,21 @@ namespace UnivateProperties_API.Repository.Logging
         public List<SearchLog> GetDetailedAll()
         {
             return _dbContext.SearchLogs.ToList();
-        }
+        }        
 
-        public List<PropertySearchDispaly> GetPropertySearches()
+        public List<SearchDisplay> GetSearches()
         {
-            var list = new List<PropertySearchDispaly>();
-            var logs = Get(x => x.Type == "Property");
+            var list = new List<SearchDisplay>();
+            var logs = GetAll();
             foreach (SearchLog log in logs)
             {
-                var propSearch = JsonConvert.DeserializeObject<PropertySearch>(log.Search);
-                list.Add(new PropertySearchDispaly()
-                {
+                var searchObject = JsonConvert.DeserializeObject<SearchObject>(log.Search);
+                list.Add(new SearchDisplay() {
                     Date = log.Created,
-                    UserName = propSearch.UserName,
-                    Keyword = propSearch.Keyword,
-                    SalesType = propSearch.SalesType,
-                    PropertyUsageType = propSearch.PropertyUsageType,
-                    PropertyType = propSearch.PropertyType,
-                    Province = propSearch.Province,
-                    City = propSearch.City,
-                    Suburb = propSearch.Suburb
-                });
-                Debug.WriteLine(propSearch);
-            }
-            return list;            
-        }
-
-        public List<TimeshareSearchDisplay> GetTimeshareSearches()
-        {
-            var list = new List<TimeshareSearchDisplay>();
-            var logs = Get(x => x.Type == "Timeshare");
-            foreach (SearchLog log in logs)
-            {
-                var timeshareSearch = JsonConvert.DeserializeObject<TimeshareSearch>(log.Search);
-                list.Add(new TimeshareSearchDisplay() {
-                    Date = log.Created,
-                    UserName = timeshareSearch.UserName,
-                    Property = timeshareSearch.Property,
-                    Value = timeshareSearch.Value
+                    Type = log.Type,
+                    UserName = searchObject.UserName,
+                    Property = searchObject.Property,
+                    Value = searchObject.Value
                 });
             }
             return list;
@@ -127,14 +104,14 @@ namespace UnivateProperties_API.Repository.Logging
             _dbContext.SaveChanges();
         }
 
-        public void SaveTimeshareSearch(TimeshareSearch item)
-        {
+        public void SaveSearch(SearchObject item)
+        {            
             var searchLog = new SearchLog
-            {
-                Type = "Timeshare",
+            { 
+                Type = item.Type,
                 Search = JsonConvert.SerializeObject(item)
             };
-            _dbContext.SearchLogs.Remove(searchLog);
+            _dbContext.SearchLogs.Add(searchLog);
             Save();
         }
 

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -4,7 +4,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Containers.Property;
+using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Model.Logging;
 using UnivateProperties_API.Model.Properties;
 
 namespace UnivateProperties_API.Repository.Properties
@@ -155,8 +157,14 @@ namespace UnivateProperties_API.Repository.Properties
 
             if (images != null)
             {
+                var lastID = (from p in dBContext.PropertyImages
+                              orderby p.Id descending
+                              select p.Id).FirstOrDefault();
+
                 foreach (PropertyImage image in images)
                 {
+                    lastID++;
+                    image.Id = lastID;
                     image.PropertyId = item.Id;
                     dBContext.PropertyImages.Add(image);
                     Save();
@@ -241,16 +249,14 @@ namespace UnivateProperties_API.Repository.Properties
 
             return GetDisplayDetails(props);
         }
-
+        
         public List<PropertyDisplay> GetDisplay(PropertySearch search)
         {
-            //Save to Log
-            dBContext.SearchLogs.Add(new Model.Logging.SearchLog()
+            SearchObject obj = new SearchObject()
             {
-                Type = "Property",
-                Search = JsonConvert.SerializeObject(search)
-            });
-            Save();
+                UserName = search.UserName,
+                Type = "Property"
+            };
 
             if (!string.IsNullOrEmpty(search.Keyword) && search.Keyword.ToUpper() != "ALL")
             {
@@ -267,6 +273,9 @@ namespace UnivateProperties_API.Repository.Properties
                                         || EF.Functions.Like(s.Description.ToLower(), $"%{keyword}%")
                                         || EF.Functions.Like(pt.Description.ToLower(), $"%{keyword}%")
                                         select p).ToList();
+                obj.Property = "Keyword";
+                obj.Value = search.Keyword;
+                SaveLog(obj);
 
                 return GetDisplayDetails(props);
             }
@@ -275,7 +284,7 @@ namespace UnivateProperties_API.Repository.Properties
                 List<Property> props;
                 PropertyUsageType uType = PropertyUsageType.Both;
 
-                if (!string.IsNullOrEmpty(search.PropertyUsageType) && search.PropertyUsageType != "undefined")
+                if (!string.IsNullOrEmpty(search.PropertyUsageType) && search.PropertyUsageType != "undefined" && search.PropertyUsageType.ToUpper() != "ALL")
                 {
                     if (search.PropertyUsageType.ToUpper() == "COMMERCIAL")
                         uType = PropertyUsageType.Commercial;
@@ -287,12 +296,20 @@ namespace UnivateProperties_API.Repository.Properties
                          where pt.UsageType == uType
                          select p).ToList();
 
+                obj.Property = "PropertyUsageType";
+                obj.Value = search.PropertyUsageType;
+                SaveLog(obj);
+
                 if (!string.IsNullOrEmpty(search.SalesType) && search.SalesType != "undefined" && search.SalesType.ToUpper() != "ALL")
                 {
                     if (search.SalesType.ToUpper() == "SALE")
                         props = props.Where(p => p.IsSale).ToList();
                     else
                         props = props.Where(p => !p.IsSale).ToList();
+
+                    obj.Property = "SalesType";
+                    obj.Value = search.SalesType;
+                    SaveLog(obj);
                 }
 
                 if (!string.IsNullOrEmpty(search.Province) && search.Province != "undefined" && search.Province.ToUpper() != "ALL")
@@ -301,6 +318,10 @@ namespace UnivateProperties_API.Repository.Properties
                              join pp in dBContext.Provinces on p.ProvinceId equals pp.Id
                              where pp.Description.ToUpper() == search.Province.ToUpper()
                              select p).ToList();
+
+                    obj.Property = "Province";
+                    obj.Value = search.Province;
+                    SaveLog(obj);
                 }
 
                 if (!string.IsNullOrEmpty(search.City) && search.City != "undefined" && search.City.ToUpper() != "ALL")
@@ -309,6 +330,10 @@ namespace UnivateProperties_API.Repository.Properties
                              join c in dBContext.Cities on p.CityId equals c.Id
                              where c.Description.ToUpper() == search.City.ToUpper()
                              select p).ToList();
+
+                    obj.Property = "City";
+                    obj.Value = search.City;
+                    SaveLog(obj);
                 }
 
                 if (!string.IsNullOrEmpty(search.Suburb) && search.Suburb != "undefined" && search.Suburb.ToUpper() != "ALL")
@@ -317,6 +342,10 @@ namespace UnivateProperties_API.Repository.Properties
                              join s in dBContext.Suburbs on p.SuburbId equals s.Id
                              where s.Description.ToUpper() == search.Suburb.ToUpper()
                              select p).ToList();
+
+                    obj.Property = "Suburb";
+                    obj.Value = search.Suburb;
+                    SaveLog(obj);
                 }
                 if (!string.IsNullOrEmpty(search.PropertyType) && search.PropertyType != "Undefined" && search.PropertyType.ToUpper() != "ALL")
                 {
@@ -325,12 +354,43 @@ namespace UnivateProperties_API.Repository.Properties
                     {
                         props = props.Where(p => p.PropertyTypeId == pType.Id).ToList();
                     }
+
+                    obj.Property = "PropertyType";
+                    obj.Value = search.PropertyType;
+                    SaveLog(obj);
+                }
+                if (search.MinPrice > 0)
+                {
+                    props = props.Where(p => p.Price >= search.MinPrice).ToList();
+
+                    obj.Property = "MinPrice";
+                    obj.Value = search.MinPrice.ToString();
+                    SaveLog(obj);
+                }
+                if (search.MaxPrice > 0)
+                {
+                    props = props.Where(p => p.Price <= search.MaxPrice).ToList();
+
+                    obj.Property = "MaxPrice";
+                    obj.Value = search.MaxPrice.ToString();
+                    SaveLog(obj);
                 }
 
                 return GetDisplayDetails(props);
             }
         }        
 
+        private void SaveLog(SearchObject item)
+        {
+            var searchLog = new SearchLog
+            {
+                Type = item.Type,
+                Search = JsonConvert.SerializeObject(item)
+            };
+            dBContext.SearchLogs.Add(searchLog);
+            Save();
+        }
+
         private List<PropertyDisplay> GetDisplayDetails(List<Property> props)
         {
             var properties = new List<PropertyDisplay>();
@@ -376,7 +436,10 @@ namespace UnivateProperties_API.Repository.Properties
                               where s.Id == item.SuburbId
                               select s.Description).FirstOrDefault(),
                     Price = item.Price,
-                    DateCreated = item.Created
+                    DateCreated = item.Created,
+                    PropertyUsageType = (from p in dBContext.PropertyTypes
+                                         where p.Id == item.PropertyTypeId
+                                         select p.UsageType.ToString()).FirstOrDefault()
                 };
 
                 if (!string.IsNullOrEmpty(display.Area) && display.Area.EndsWith("2"))

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -116,7 +116,15 @@ namespace UnivateProperties_API.Repository.Timeshare
         public void Insert(TimeshareWeek item)
         {
             item = GetDetailedWeek(item);
-            if(item.Status == null)
+            item.Id = _dbContext.Weeks.Max(x => x.Id) + 1;
+            if (item.Owner != null && item.Owner.Id == 0)
+            {
+                item.Owner.Id = _dbContext.Individuals.Max(x => x.Id) + 1;
+            }
+            // Set starting Status of A1
+            StatusRepository repo = new StatusRepository(_dbContext);
+            item.Status = repo.GetDetailed(s => s.Code == "A1");
+            if(item.Status != null)
             {
                 //Create initial
                 item.Status = new Status()

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

@@ -274,5 +274,27 @@ namespace UnivateProperties_API.Repository.Users
             id += 1;
             return id;
         }
+
+        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;
+            }
+        }
     }
 }