Carousel & Search WIP

UnivateProperties_API/Containers/Property/PropertyList.cs

@@ -12,6 +12,7 @@
         public string SaleType { get; set; }
         public string Publish { get; set; }
         public string Status { get; set; }
+        public string CarouselDescription { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Containers/Regions/SuburbSearch.cs

@@ -8,6 +8,8 @@ namespace UnivateProperties_API.Containers.Regions
     public class SuburbSearch
     {
         public int Id { get; set; }
+        public string Province { get; set; }
+        public string City { get; set; }
         public string Suburb { get; set; }
         public string Display { get; set; }
     }

UnivateProperties_API/Context/DataContext.cs

@@ -181,7 +181,7 @@ namespace UnivateProperties_API.Context
             modelBuilder.Entity<BidItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<ProcessFlow>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<Template>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
-
+            modelBuilder.Entity<Carousel>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             
         }
 

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using UnivateProperties_API.Containers.Misc;
 using UnivateProperties_API.Containers.Property;
@@ -56,8 +57,32 @@ namespace UnivateProperties_API.Repository.Misc
 
         public void Insert(Carousel item)
         {
-            dBContext.Carousel.Add(item);
+            string image = item.Image;
+            item.Image = "";
+            dBContext.Add(item);
             Save();
+
+            bool saveFiles = false;
+            var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+            var lastID = item.Id;
+            item.Id = lastID;
+            if (!string.IsNullOrEmpty(loc))
+            {
+                saveFiles = true;
+                loc = loc.Replace("Properties", "Carousel");
+                if (Directory.Exists(loc))
+                {
+                    Directory.CreateDirectory(loc);
+                }
+            }
+            if (saveFiles)
+            {
+                string path = ImageFormatter.Base64ToImage(item.Image, loc, lastID.ToString());
+                item.Image = path;
+            }
+
+            Update(item);
+            
         }
 
         public void Insert(IEnumerable<Carousel> items)

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -561,16 +561,16 @@ namespace UnivateProperties_API.Repository.Properties
             if (Type.ToUpper() == "MY")
             {                
                 if (individual != null)
-                    properties = Get(x => x.OwnerId == individual.Id);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.OwnerId == individual.Id).ToList();
                 if (agent != null)
-                    properties = Get(x => x.AgentId == agent.Id);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgentId == agent.Id).ToList();
             }
             else
             {
                 if (individual != null)
-                    properties = Get(x => x.OwnerId == individual.Id);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.OwnerId == individual.Id).ToList();
                 if (agent != null)
-                    properties = Get(x => x.AgencyId == agent.AgencyId);
+                    properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgencyId == agent.AgencyId).ToList();
             }
             
             List<PropertyList> list = new List<PropertyList>();
@@ -583,7 +583,8 @@ namespace UnivateProperties_API.Repository.Properties
                     Name = string.IsNullOrEmpty(p.PropertyName) ? p.ShortDescription : p.PropertyName,
                     Price = string.Format("R {0:n}", p.Price),
                     Publish = p.Published.ToString(),
-                    Type = dBContext.PropertyTypes.Find(p.PropertyTypeId)?.Description
+                    Type = dBContext.PropertyTypes.Find(p.PropertyTypeId)?.Description,
+                    CarouselDescription = string.Format("{0}, {1} <br/>{2}", p.Suburb.Description, p.City.Description, p.AddressLine3)
                 };
 
                 prop.Size = (from u in dBContext.PropertyUserFields

UnivateProperties_API/Repository/Region/SuburbRepository.cs

@@ -115,7 +115,7 @@ namespace UnivateProperties_API.Repository.Region
 
         public List<SuburbSearch> GetSearchList()
         {
-            var suburbs = dBContext.Suburbs.Include("City").ToList();
+            var suburbs = dBContext.Suburbs.Include("City").Include("City.Province").ToList();
             List<SuburbSearch> searchList = new List<SuburbSearch>();
             
             foreach (var sub in suburbs)
@@ -123,6 +123,8 @@ namespace UnivateProperties_API.Repository.Region
                 searchList.Add(new SuburbSearch()
                 {
                     Id = sub.Id,
+                    Province = sub.City.Province.Description,
+                    City = sub.City.Description,
                     Suburb = sub.Description,
                     Display = string.Format("{0} - {1}", sub.Description, sub.City.Description)
                 });