Property Search Changes

UnivateProperties_API/Containers/Property/PropertySearch.cs

@@ -6,7 +6,8 @@
         public int UserID { get; set; }
         public string Keyword { get; set; }
         public string SalesType { get; set; }
-        public string PropertyType { get; set; }
+        public string PropertyUsageType { get; set; }
+        public string PropertyType { get; set; }        
         public string Province { get; set; }
         public string City { get; set; }
         public string Suburb { get; set; }

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Transactions;
+using UnivateProperties_API.Containers.Property;
 using UnivateProperties_API.Model.Properties;
 using UnivateProperties_API.Repository.Properties;
 
@@ -29,19 +30,7 @@ namespace UnivateProperties_API.Controllers.Properties
         public IActionResult Get(int id)
         {
             return new OkObjectResult(_Repo.GetDetailed(x => x.Id == id));
-        }
-
-        [HttpGet("search/{keyword}")]
-        public IActionResult Search(string Keyword)
-        {
-            return new OkObjectResult(_Repo.GetDisplay(Keyword));
-        }
-
-        [HttpGet("search/{type}/{propertytype}/{province}/{city}/{suburb}/{proptype}")]
-        public IActionResult Get(string type, string propertyType, string province, string city, string suburb, string propType)
-        {
-            return new OkObjectResult(_Repo.GetDisplay(type, propertyType, province, city, suburb, propType));
-        }
+        }          
 
         [HttpGet("latestProperties")]
         public IActionResult GetLatestProperties()
@@ -89,6 +78,12 @@ namespace UnivateProperties_API.Controllers.Properties
         }
         #endregion
 
+        [HttpPost("search")]
+        public IActionResult Search([FromBody] PropertySearch search)
+        {
+            return new OkObjectResult(_Repo.GetDisplay(search));
+        }
+
         [HttpPost]
         public IActionResult Post([FromBody] Property property)
         {

UnivateProperties_API/Repository/Properties/IPropertyRepository.cs

@@ -9,8 +9,7 @@ namespace UnivateProperties_API.Repository.Properties
     {
         List<PropertyDisplay> GetDisplay();
         List<PropertyDisplay> GetDisplay(Func<Property, bool> where);
-        List<PropertyDisplay> GetDisplay(string Keyword);
-        List<PropertyDisplay> GetDisplay(string type, string propertyType, string province, string city, string suburb, string propType);
+        List<PropertyDisplay> GetDisplay(PropertySearch search);        
         List<PropertyDisplay> GetLatestDisplay();
         List<PropertyType> GetPropertyTypes(Func<PropertyType, bool> where);
         List<PropertyList> GetPropertyList(Func<Property, bool> where);

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -241,84 +242,94 @@ namespace UnivateProperties_API.Repository.Properties
             return GetDisplayDetails(props);
         }
 
-        public List<PropertyDisplay> GetDisplay(string Keyword)
+        public List<PropertyDisplay> GetDisplay(PropertySearch search)
         {
-            Keyword = Keyword.ToLower();
-
-            List<Property> props = (from p in dBContext.Properties
-                                    join pr in dBContext.Provinces on p.ProvinceId equals pr.Id
-                                    join c in dBContext.Cities on p.CityId equals c.Id
-                                    join s in dBContext.Suburbs on p.SuburbId equals s.Id
-                                    join pt in dBContext.PropertyTypes on p.PropertyTypeId equals pt.Id
-                                    where EF.Functions.Like(p.PropertyName.ToLower(), $"%{Keyword}%")
-                                    || EF.Functions.Like(pr.Description.ToLower(), $"%{Keyword}%")
-                                    || EF.Functions.Like(c.Description.ToLower(), $"%{Keyword}%")
-                                    || EF.Functions.Like(s.Description.ToLower(), $"%{Keyword}%")
-                                    || EF.Functions.Like(pt.Description.ToLower(), $"%{Keyword}%")
-                                    select p).ToList();
-
-            return GetDisplayDetails(props);
-        }
-
-        public List<PropertyDisplay> GetDisplay(string type, string propertyType, string province, string city, string suburb, string propType)
-        {
-            List<Property> props;
-            PropertyUsageType uType = PropertyUsageType.Both;
-
-            if (propertyType != "" && propertyType != "undefined")
+            //Save to Log
+            dBContext.SearchLogs.Add(new Model.Logging.SearchLog()
             {
-                if (propertyType.ToUpper() == "COMMERCIAL")
-                    uType = PropertyUsageType.Commercial;
-                else
-                    uType = PropertyUsageType.Residential;
-            }
-            props = (from p in dBContext.Properties
-                     join pt in dBContext.PropertyTypes on p.PropertyTypeId equals pt.Id
-                     where pt.UsageType == uType
-                     select p).ToList();
+                UserID = search.UserID,
+                Search = JsonConvert.SerializeObject(search)
+            });
+            Save();
 
-            if (type != "" && type != "undefined")
+            if (!string.IsNullOrEmpty(search.Keyword))
             {
-                if (type.ToUpper() == "SALE")
-                    props = props.Where(p => p.IsSale).ToList();
-                else
-                    props = props.Where(p => !p.IsSale).ToList();
+                string keyword = search.Keyword.ToLower();
+
+                List<Property> props = (from p in dBContext.Properties
+                                        join pr in dBContext.Provinces on p.ProvinceId equals pr.Id
+                                        join c in dBContext.Cities on p.CityId equals c.Id
+                                        join s in dBContext.Suburbs on p.SuburbId equals s.Id
+                                        join pt in dBContext.PropertyTypes on p.PropertyTypeId equals pt.Id
+                                        where EF.Functions.Like(p.PropertyName.ToLower(), $"%{keyword}%")
+                                        || EF.Functions.Like(pr.Description.ToLower(), $"%{keyword}%")
+                                        || EF.Functions.Like(c.Description.ToLower(), $"%{keyword}%")
+                                        || EF.Functions.Like(s.Description.ToLower(), $"%{keyword}%")
+                                        || EF.Functions.Like(pt.Description.ToLower(), $"%{keyword}%")
+                                        select p).ToList();
+
+                return GetDisplayDetails(props);
             }
-
-            if (province != "" && province != "undefined" && province.ToUpper() != "ALL")
+            else
             {
-                props = (from p in props
-                         join pp in dBContext.Provinces on p.ProvinceId equals pp.Id
-                         where pp.Description.ToUpper() == province.ToUpper()
-                         select p).ToList();
-            }
+                List<Property> props;
+                PropertyUsageType uType = PropertyUsageType.Both;
 
-            if (city != "" && city != "undefined" && city.ToUpper() != "ALL")
-            {
-                props = (from p in props
-                         join c in dBContext.Cities on p.CityId equals c.Id
-                         where c.Description.ToUpper() == city.ToUpper()
+                if (!string.IsNullOrEmpty(search.PropertyUsageType) && search.PropertyUsageType != "undefined")
+                {
+                    if (search.PropertyUsageType.ToUpper() == "COMMERCIAL")
+                        uType = PropertyUsageType.Commercial;
+                    else
+                        uType = PropertyUsageType.Residential;
+                }
+                props = (from p in dBContext.Properties
+                         join pt in dBContext.PropertyTypes on p.PropertyTypeId equals pt.Id
+                         where pt.UsageType == uType
                          select p).ToList();
-            }
 
-            if (suburb != "" && suburb != "undefined" && suburb.ToUpper() != "ALL")
-            {
-                props = (from p in props
-                         join s in dBContext.Suburbs on p.SuburbId equals s.Id
-                         where s.Description.ToUpper() == suburb.ToUpper()
-                         select p).ToList();
-            }
-            if (propType != "" && propType != "Undefined" && propType.ToUpper() != "ALL")
-            {
-                var pType = dBContext.PropertyTypes.Where(t => t.Description == propType).FirstOrDefault();
-                if (pType != null)
+                if (!string.IsNullOrEmpty(search.SalesType) && search.SalesType != "undefined" && search.SalesType.ToUpper() != "ALL")
                 {
-                    props = props.Where(p => p.PropertyTypeId == pType.Id).ToList();
+                    if (search.SalesType.ToUpper() == "SALE")
+                        props = props.Where(p => p.IsSale).ToList();
+                    else
+                        props = props.Where(p => !p.IsSale).ToList();
                 }
-            }
 
-            return GetDisplayDetails(props);
-        }
+                if (!string.IsNullOrEmpty(search.Province) && search.Province != "undefined" && search.Province.ToUpper() != "ALL")
+                {
+                    props = (from p in props
+                             join pp in dBContext.Provinces on p.ProvinceId equals pp.Id
+                             where pp.Description.ToUpper() == search.Province.ToUpper()
+                             select p).ToList();
+                }
+
+                if (!string.IsNullOrEmpty(search.City) && search.City != "undefined" && search.City.ToUpper() != "ALL")
+                {
+                    props = (from p in props
+                             join c in dBContext.Cities on p.CityId equals c.Id
+                             where c.Description.ToUpper() == search.City.ToUpper()
+                             select p).ToList();
+                }
+
+                if (!string.IsNullOrEmpty(search.Suburb) && search.Suburb != "undefined" && search.Suburb.ToUpper() != "ALL")
+                {
+                    props = (from p in props
+                             join s in dBContext.Suburbs on p.SuburbId equals s.Id
+                             where s.Description.ToUpper() == search.Suburb.ToUpper()
+                             select p).ToList();
+                }
+                if (!string.IsNullOrEmpty(search.PropertyType) && search.PropertyType != "Undefined" && search.PropertyType.ToUpper() != "ALL")
+                {
+                    var pType = dBContext.PropertyTypes.Where(t => t.Description == search.PropertyType).FirstOrDefault();
+                    if (pType != null)
+                    {
+                        props = props.Where(p => p.PropertyTypeId == pType.Id).ToList();
+                    }
+                }
+
+                return GetDisplayDetails(props);
+            }
+        }        
 
         private List<PropertyDisplay> GetDisplayDetails(List<Property> props)
         {
@@ -428,6 +439,6 @@ namespace UnivateProperties_API.Repository.Properties
             }
                 
             return list;
-        }
+        }       
     }
 }