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

UnivateProperties_API/Containers/Property/ImageFormatter.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Drawing;
+using System.IO;
+
+namespace UnivateProperties_API.Containers.Property
+{
+    public class ImageFormatter
+    {
+        public static string Base64ToImage(string binData, string path, string name)
+        {
+            string extention = ".jpg";
+            if (binData.StartsWith("data:image/gif;base64,"))
+            {
+                extention = ".gif";
+                binData = binData.Replace("data:image/gif;base64,", "");
+            }
+            if (binData.StartsWith("data:image/jpeg;base64,"))
+            {
+                extention = ".jpg";
+                binData = binData.Replace("data:image/jpeg;base64,", "");
+            }
+            if (binData.StartsWith("data:image/png;base64,"))
+            {
+                extention = ".png";
+                binData = binData.Replace("data:image/png;base64,", "");
+            }
+
+            if (!Directory.Exists(path))
+                Directory.CreateDirectory(path);
+
+            string filePath = string.Format(@"{0}\{1}{2}", path, name, extention);
+            File.WriteAllBytes(filePath, Convert.FromBase64String(binData));
+            return filePath;
+        }
+
+        public static string ImageToBase64(string Path)
+        {
+            using (Image image = Image.FromFile(Path))
+            {
+                using (MemoryStream m = new MemoryStream())
+                {
+                    image.Save(m, image.RawFormat);
+                    byte[] imageBytes = m.ToArray();
+
+                    string base64String = Convert.ToBase64String(imageBytes);
+
+                    if (Path.EndsWith(".jpg") || Path.EndsWith(".jpeg"))
+                        base64String = "data:image/jpeg;base64," + base64String;
+                    if (Path.EndsWith(".gif"))
+                        base64String = "data:image/gif;base64," + base64String;
+                    if (base64String.EndsWith(".png"))
+                        base64String = "data:image/png;base64," + base64String;
+
+                    return base64String;
+                }
+            }
+        }
+    }
+}

UnivateProperties_API/Containers/Property/PropertyList.cs

@@ -7,7 +7,9 @@
         public int Id { get; set; }
         public string Size { get; set; }
         public string Price { get; set; }
+        public string UsageType { get; set;  }
         public string Type { get; set; }
+        public string SaleType { get; set; }
         public string Publish { get; set; }
         public string Status { get; set; }
         #endregion

UnivateProperties_API/Context/DataContext.cs

@@ -68,7 +68,11 @@ namespace UnivateProperties_API.Context
 
         #region Logs
         public DbSet<SearchLog> SearchLogs { get; set; }
-        #endregion 
+        #endregion
+
+        #region Misc
+        public DbSet<Location> Location { get; set; }
+        #endregion
 
         public override int SaveChanges()
         {

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -39,43 +39,11 @@ namespace UnivateProperties_API.Controllers.Properties
         }
 
         [HttpGet("{type}/{by}")]
-        public IActionResult SearchBy(string type, string by)
+        public IActionResult SearchBy(string type, int by)
         {
-            PropertyUsageType pType = PropertyUsageType.Both;
-            switch (type.ToUpper())
-            {
-                case "RESIDENTIAL":
-                    pType = PropertyUsageType.Residential;
-                    break;
-                case "COMMERCIAL":
-                    pType = PropertyUsageType.Commercial;
-                    break;
-            }
-
-            if (pType != PropertyUsageType.Both)
-            {
-                List<int> proptypeIds = (from pt in _Repo.GetPropertyTypes(p => p.UsageType == pType)
-                                         select pt.Id).ToList();
-
-                if (string.IsNullOrEmpty(by) || by.ToUpper() == "ALL")
-                {
-                    return new OkObjectResult(_Repo.GetPropertyList(x => proptypeIds.Contains(x.PropertyTypeId)));
-                }
-                else
-                {
-                    //Needs to change to search on individule/Agent
-                    return new OkObjectResult(_Repo.GetPropertyList(x => proptypeIds.Contains(x.PropertyTypeId)));
-                }
-            }
-            else
-                return new NoContentResult();
-        }
-
-        [HttpGet("GetEditDisplay/{id}")]
-        public IActionResult GetEditDisplay(int id)
-        {
-            return new OkObjectResult(_Repo.GetPropertyList(x => x.Id == id));
+            return new OkObjectResult(_Repo.GetPropertyList(type, by));
         }
+        
         #endregion
 
         [HttpGet("search")]

UnivateProperties_API/Model/Misc/Location.cs

@@ -0,0 +1,8 @@
+namespace UnivateProperties_API.Model.Misc
+{
+    public class Location : BaseEntity
+    {
+        public bool IsTesting { get; set; }
+        public string PropertyImageLocation { get; set; }
+    }
+}

UnivateProperties_API/Repository/Properties/IPropertyRepository.cs

@@ -12,6 +12,6 @@ namespace UnivateProperties_API.Repository.Properties
         List<PropertyDisplay> GetDisplay(PropertySearch search);        
         List<PropertyDisplay> GetLatestDisplay();
         List<PropertyType> GetPropertyTypes(Func<PropertyType, bool> where);
-        List<PropertyList> GetPropertyList(Func<Property, bool> where);
+        List<PropertyList> GetPropertyList(string Type, int By);
     }
 }

UnivateProperties_API/Repository/Properties/PropertyImageRepository.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnivateProperties_API.Containers.Property;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.Properties;
 
@@ -41,7 +42,17 @@ namespace UnivateProperties_API.Repository.Properties
                           where p.PropertyId == PropertyId
                           select p.Image).ToList();
 
-            return images;
+            List<string> formated = new List<string>();
+
+            foreach (string img in images)
+            {
+                if (!img.StartsWith("data:image"))
+                    formated.Add(ImageFormatter.ImageToBase64(img));
+                else
+                    formated.Add(img);
+            }
+
+            return formated;
         }
 
         public void Insert(PropertyImage item)

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Containers.Property;
@@ -8,6 +9,7 @@ using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.Logging;
 using UnivateProperties_API.Model.Properties;
+using System.Drawing;
 
 namespace UnivateProperties_API.Repository.Properties
 {
@@ -161,11 +163,28 @@ namespace UnivateProperties_API.Repository.Properties
                               orderby p.Id descending
                               select p.Id).FirstOrDefault();
 
+                bool saveFiles = false;
+                var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+                if (!string.IsNullOrEmpty(loc))
+                {
+                    saveFiles = true;
+                    loc += string.Format("\\{0}", item.Id);
+                    if (Directory.Exists(loc))
+                    {
+                        Directory.CreateDirectory(loc);
+                    }
+                }
+                
                 foreach (PropertyImage image in images)
                 {
                     lastID++;
                     image.Id = lastID;
                     image.PropertyId = item.Id;
+                    if (saveFiles)
+                    {
+                        string path = ImageFormatter.Base64ToImage(image.Image, loc, lastID.ToString());
+                        image.Image = path;
+                    }
                     dBContext.PropertyImages.Add(image);
                     Save();
                 }
@@ -258,7 +277,7 @@ namespace UnivateProperties_API.Repository.Properties
                 Type = "Property"
             };
 
-            if (!string.IsNullOrEmpty(search.Keyword) && search.Keyword.ToUpper() != "ALL")
+            if (!string.IsNullOrEmpty(search.Keyword) && search.Keyword.ToUpper() != "ALL" && search.Keyword.ToUpper() != "UNDEFINED")
             {
                 string keyword = search.Keyword.ToLower();
 
@@ -442,6 +461,11 @@ namespace UnivateProperties_API.Repository.Properties
                                          select p.UsageType.ToString()).FirstOrDefault()
                 };
 
+                if (!display.DisplayImage.StartsWith("data:image"))
+                {
+                    display.DisplayImage = ImageFormatter.ImageToBase64(display.DisplayImage);
+                }
+
                 if (!string.IsNullOrEmpty(display.Area) && display.Area.EndsWith("2"))
                 {
                     display.Area = display.Area.Substring(0, display.Area.Length - 1) + "<sup>" + display.Area.Last() + "</sup>";
@@ -470,10 +494,27 @@ namespace UnivateProperties_API.Repository.Properties
             return GetDisplayDetails(props);
         }
 
-        public List<PropertyList> GetPropertyList(Func<Property, bool> where)
+        public List<PropertyList> GetPropertyList(string Type, int By)
         {
-            var properties = Get(where);
-
+            var individual = dBContext.Individuals.Where(x => x.UserId == By).FirstOrDefault();
+            var agent = dBContext.Agents.Where(x => x.UserId == By).FirstOrDefault();
+
+            List<Property> properties = new List<Property>();
+            if (Type.ToUpper() == "MY")
+            {                
+                if (individual != null)
+                    properties = Get(x => x.OwnerId == individual.Id);
+                if (agent != null)
+                    properties = Get(x => x.AgentId == agent.Id);
+            }
+            else
+            {
+                if (individual != null)
+                    properties = Get(x => x.OwnerId == individual.Id);
+                if (agent != null)
+                    properties = Get(x => x.AgencyId == agent.AgencyId);
+            }
+            
             List<PropertyList> list = new List<PropertyList>();
 
             foreach (Property p in properties)
@@ -498,6 +539,9 @@ namespace UnivateProperties_API.Repository.Properties
                     prop.Size = prop.Size.Substring(0, prop.Size.Length - 1) + "<sup>" + prop.Size.Last() + "</sup>";
                 }
 
+                prop.UsageType = (dBContext.PropertyTypes.Find(p.PropertyTypeId).UsageType == PropertyUsageType.Residential ? "Residential" : "Commercial");
+                prop.SaleType = p.IsSale ? "Sale" : "Rental";
+
                 list.Add(prop);
             }
                 
@@ -508,6 +552,6 @@ namespace UnivateProperties_API.Repository.Properties
         {
             // Not sure if properties need it
             return 0;
-        }
+        }       
     }
 }

UnivateProperties_API/UnivateProperties_API.csproj

@@ -18,6 +18,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.4" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.4" />
+    <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
   </ItemGroup>
 
 </Project>