Search log API changes

UnivateProperties_API/Containers/Property/PropertySearch.cs

@@ -3,7 +3,7 @@
     public class PropertySearch
     {
         #region Properties 
-        public int UserID { get; set; }
+        public string UserName { get; set; }
         public string Keyword { get; set; }
         public string SalesType { get; set; }
         public string PropertyUsageType { get; set; }

UnivateProperties_API/Containers/Property/PropertySearchDispaly.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace UnivateProperties_API.Containers.Property
+{
+    public class PropertySearchDispaly
+    {
+        #region Properties 
+        public string UserName { get; set; }
+        public DateTime Date { get; set; }
+        public string Keyword { get; set; }
+        public string SalesType { 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; }
+        #endregion 
+    }
+}

UnivateProperties_API/Containers/Timeshare/TimeshareSearch.cs

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

UnivateProperties_API/Containers/Timeshare/TimeshareSearchDisplay.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace UnivateProperties_API.Containers.Timeshare
+{
+    public class TimeshareSearchDisplay
+    {
+        public string UserName { get; set; }
+        public DateTime Date { get; set; }
+        public string Property { get; set; }
+        public string Value { get; set; }
+    }
+}

UnivateProperties_API/Controllers/Logging/SearchLogController.cs

@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Transactions;
+using UnivateProperties_API.Containers.Timeshare;
+using UnivateProperties_API.Repository.Logging;
+
+namespace UnivateProperties_API.Controllers.Logging
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class SearchLogController : ControllerBase
+    {
+        private readonly ISearchLogRepository _Repo;
+
+        public SearchLogController(ISearchLogRepository repo)
+        {
+            _Repo = repo;
+        }
+      
+
+        [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();
+        }
+        
+
+        [HttpPost]
+        public IActionResult Post([FromBody] TimeshareSearch item)
+        {
+            using (var scope = new TransactionScope())
+            {
+                _Repo.SaveTimeshareSearch(item);
+                scope.Complete();
+                return new OkObjectResult(item);
+            }
+        }        
+    }
+}

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -85,12 +85,12 @@ namespace UnivateProperties_API.Controllers.Properties
         }
 
         //Will need to come out. Post search not working......:(
-        [HttpGet("search/{userId}/{keyword}/{salesType}/{propertyUsageType}/{propertyType}/{province}/{city}/{suburb}")]
-        public IActionResult Search(int userId, string keyword, string salesType, string propertyUsageType, string propertyType, string province, string city, string suburb)
+        [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)
         {
             var search = new PropertySearch()
             {
-                UserID = userId,
+                UserName = userName,
                 Keyword = keyword,
                 SalesType = salesType,
                 PropertyUsageType = propertyUsageType,

UnivateProperties_API/Model/Logging/SearchLog.cs

@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace UnivateProperties_API.Model.Logging
+namespace UnivateProperties_API.Model.Logging
 {
     public class SearchLog : BaseEntity
     {
         #region Properties 
-        public int? UserID { get; set; }
+        public string Type { get; set; }
         public string Search { get; set; }
         #endregion 
     }

UnivateProperties_API/Model/Properties/Property.cs

@@ -35,8 +35,7 @@ namespace UnivateProperties_API.Model.Properties
         [ForeignKey("Agent")]
         public int? AgentId { get; set; }
         [ForeignKey("Agency")]
-        public int? AgencyId { get; set; }
-        public int? GCRecord { get; set; }
+        public int? AgencyId { get; set; }        
 
         public virtual PropertyType PropertyType { get; set; }
         public virtual Province Province { get; set; }

UnivateProperties_API/Repository/Logging/ISearchLogRepository.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using UnivateProperties_API.Containers.Property;
+using UnivateProperties_API.Containers.Timeshare;
+using UnivateProperties_API.Model.Logging;
+
+namespace UnivateProperties_API.Repository.Logging
+{
+    public interface ISearchLogRepository: IRepository<SearchLog>
+    {
+        List<TimeshareSearchDisplay> GetTimeshareSearches();
+        List<PropertySearchDispaly> GetPropertySearches();
+        void SaveTimeshareSearch(TimeshareSearch item);
+    }
+}

UnivateProperties_API/Repository/Logging/SearchLogRepository.cs

@@ -0,0 +1,147 @@
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using UnivateProperties_API.Containers.Property;
+using UnivateProperties_API.Containers.Timeshare;
+using UnivateProperties_API.Context;
+using UnivateProperties_API.Model.Logging;
+
+namespace UnivateProperties_API.Repository.Logging
+{
+    public class SearchLogRepository : ISearchLogRepository
+    {
+        private readonly DataContext _dbContext;
+
+        public SearchLogRepository(DataContext dbContext)
+        {
+            _dbContext = dbContext;
+        }
+
+        public List<SearchLog> Get(Func<SearchLog, bool> where)
+        {
+            return _dbContext.SearchLogs.Where(where).ToList();
+        }
+
+        public List<SearchLog> GetAll()
+        {
+            return _dbContext.SearchLogs.ToList();
+        }
+
+        public SearchLog GetDetailed(Func<SearchLog, bool> first)
+        {
+            var item = _dbContext.SearchLogs.FirstOrDefault(first);
+            return item;
+        }
+
+        public List<SearchLog> GetDetailedAll()
+        {
+            return _dbContext.SearchLogs.ToList();
+        }
+
+        public List<PropertySearchDispaly> GetPropertySearches()
+        {
+            var list = new List<PropertySearchDispaly>();
+            var logs = Get(x => x.Type == "Property");
+            foreach (SearchLog log in logs)
+            {
+                var propSearch = JsonConvert.DeserializeObject<PropertySearch>(log.Search);
+                list.Add(new PropertySearchDispaly()
+                {
+                    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
+                });
+            }
+            return list;
+        }
+
+        public void Insert(SearchLog item)
+        {
+            _dbContext.SearchLogs.Add(item);
+            Save();
+        }
+
+        public void Insert(IEnumerable<SearchLog> items)
+        {
+            foreach (var item in items)
+            {
+                _dbContext.SearchLogs.Add(item);
+                Save();
+            }
+        }
+
+        public void Remove(SearchLog item)
+        {
+            _dbContext.SearchLogs.Remove(item);
+            Save();
+        }
+
+        public void Remove(IEnumerable<SearchLog> items)
+        {
+            foreach (var item in items)
+            {
+                _dbContext.SearchLogs.Remove(item);
+                Save();
+            }
+        }
+
+        public void RemoveAtId(int item)
+        {
+            var searchLog = Get(x => x.Id == item).FirstOrDefault();
+            if (searchLog != null)
+            {
+               _dbContext.SearchLogs.Remove(searchLog);
+                Save();
+            }
+        }
+
+        public void Save()
+        {
+            _dbContext.SaveChanges();
+        }
+
+        public void SaveTimeshareSearch(TimeshareSearch item)
+        {
+            var searchLog = new SearchLog
+            {
+                Type = "Timeshare",
+                Search = JsonConvert.SerializeObject(item)
+            };
+            _dbContext.SearchLogs.Remove(searchLog);
+            Save();
+        }
+
+        public void Update(SearchLog item)
+        {
+            _dbContext.Entry(item).State = EntityState.Modified;
+            Save();
+        }
+    }
+}

UnivateProperties_API/Repository/ProccessFlow/BidRepository.cs

@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using UnivateProperties_API.Containers.ProcessFlow;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.ProcessFlow;
@@ -113,7 +112,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
 
         public void Insert(BidItem item)
         {
-            var status = _dbContext.Status.Where(x => x.Code == "E1" && x.StatusType == StatusType.Bid).FirstOrDefault();
+            var status = _dbContext.Status.Where(x => x.Code == "E1").FirstOrDefault();
             if (status != null)
                 item.StatusId = status.Id;
 
@@ -175,8 +174,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                 .Where(x => x.Id == id).FirstOrDefault();
 
             var status =  (from s in _dbContext.Status
-                           where s.Code == "E2"
-                           && s.StatusType == StatusType.Bid
+                           where s.Code == "E2"                           
                            select s).FirstOrDefault();
 
             if (status != null)
@@ -201,8 +199,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                 .Where(x => x.Id == item.Id).FirstOrDefault();
 
             var status = (from s in _dbContext.Status
-                          where s.Code == "E3"
-                          && s.StatusType == StatusType.Bid
+                          where s.Code == "E3"                          
                           select s).FirstOrDefault();
 
             if (status != null)

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -247,7 +247,7 @@ namespace UnivateProperties_API.Repository.Properties
             //Save to Log
             dBContext.SearchLogs.Add(new Model.Logging.SearchLog()
             {
-                UserID = search.UserID,
+                Type = "Property",
                 Search = JsonConvert.SerializeObject(search)
             });
             Save();

UnivateProperties_API/Startup.cs

@@ -21,6 +21,7 @@ using UnivateProperties_API.Model.Users;
 using UnivateProperties_API.Repository;
 using UnivateProperties_API.Repository.Banks;
 using UnivateProperties_API.Repository.Communication;
+using UnivateProperties_API.Repository.Logging;
 using UnivateProperties_API.Repository.ProccessFlow;
 using UnivateProperties_API.Repository.Properties;
 using UnivateProperties_API.Repository.Region;
@@ -134,6 +135,9 @@ namespace UnivateProperties_API
             services.AddTransient<IRepository<SMTPAccount>, SMTPAccountRepository>();
             services.AddTransient<IRepository<SMTPHost>, SMTPHostRepository>();
             #endregion Communication
+            #region Logs 
+            services.AddTransient<ISearchLogRepository, SearchLogRepository>();
+            #endregion
             services.Configure<MvcOptions>(options =>
             {
                 options.Filters.Add(new CorsAuthorizationFilterFactory("MyPolicy"));