Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Containers/Property/ImageFormatter.cs

@@ -60,5 +60,24 @@ namespace UnivateProperties_API.Containers.Property
             else
                 return "";
         }
+
+        public static string ImageToURL(string Path, string URL)
+        {
+            string url = URL;
+
+            string[] folders = Path.Split(new char[] { '\\' });
+            bool startAdd = false;
+            foreach(var folder in folders)
+            {
+                if (!startAdd && folder == "img")
+                    startAdd = true;
+
+                if (startAdd)
+                    url += folder + "/";
+            }
+
+
+            return url.Substring(0, url.Length - 1);
+        }
     }
 }

UnivateProperties_API/Context/DataContext.cs

@@ -1,5 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Npgsql;
+using System.Data.SqlClient;
 using System.Linq;
 using UnivateProperties_API.Model;
 using UnivateProperties_API.Model.Banks;
@@ -27,6 +27,10 @@ namespace UnivateProperties_API.Context
                 {
                     connectionString = ((Npgsql.EntityFrameworkCore.PostgreSQL.Infrastructure.Internal.NpgsqlOptionsExtension)extention).ConnectionString;
                 }
+                else if (extention.GetType().ToString() == "Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal.SqlServerOptionsExtension")
+                {
+                    connectionString = ((Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal.SqlServerOptionsExtension)extention).ConnectionString;
+                }
             }
         }
 
@@ -207,24 +211,24 @@ namespace UnivateProperties_API.Context
             modelBuilder.Entity<PlaceHolderFormat>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
         }
 
-    
-        //public int GetMaxID(string tableName)
-        //{
-        //    NpgsqlConnection connection = new NpgsqlConnection(connectionString);
-        //    connection.Open();
-
-        //    NpgsqlCommand cmd = connection.CreateCommand();
-        //    cmd.CommandText = string.Format("select MAX(\"Id\") from \"{0}\"", tableName);
-        //    NpgsqlDataReader reader = cmd.ExecuteReader();
-        //    int returnValue = 0; 
-
-        //    while(reader.Read())
-        //    {
-        //        returnValue = int.Parse(reader[0] == null ? "0" : reader[0].ToString() == "" ? "0" : reader[0].ToString());
-        //    }
-
-        //    connection.Close();
-        //    return returnValue;
-        //}
+
+        public int GetMaxID(string tableName)
+        {
+            SqlConnection connection = new SqlConnection(connectionString);
+            connection.Open();
+
+            SqlCommand cmd = connection.CreateCommand();
+            cmd.CommandText = string.Format("select MAX(\"Id\") from \"{0}\"", tableName);
+            SqlDataReader reader = cmd.ExecuteReader();
+            int returnValue = 0;
+
+            while (reader.Read())
+            {
+                returnValue = int.Parse(reader[0] == null ? "0" : reader[0].ToString() == "" ? "0" : reader[0].ToString());
+            }
+
+            connection.Close();
+            return returnValue;
+        }
     }
 }

UnivateProperties_API/Controllers/Properties/PropertyImageController.cs

@@ -41,6 +41,13 @@ namespace UnivateProperties_API.Controllers.Properties
             return new OkObjectResult(_Repo.Get(x => x.PropertyId == PropertyId));
         }
 
+        [HttpGet("SavePropImages")]
+        public IActionResult SavePropImages()
+        {
+            _Repo.UpdateToPhysical();
+            return new OkResult();
+        }
+
         [HttpPost]
         public IActionResult Post([FromBody] NewPropertyImages propertyImage)
         {

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -112,7 +112,7 @@ namespace UnivateProperties_API.Controllers.Users
             }
             catch(Exception ex)
             {
-                return new BadRequestResult();
+                return BadRequest(new { message = ex.Message + " - " + ex.InnerException + " - " + ex.StackTrace });
             }
         }
 

UnivateProperties_API/Migrations/20201110092829_URL added to location.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class URLaddedtolocation : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "SiteURL",
+                table: "Location",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "SiteURL",
+                table: "Location");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -556,6 +556,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("PropertyImageLocation");
 
+                    b.Property<string>("SiteURL");
+
                     b.HasKey("Id");
 
                     b.ToTable("Location");

UnivateProperties_API/Model/Misc/Location.cs

@@ -4,5 +4,6 @@
     {
         public bool IsTesting { get; set; }
         public string PropertyImageLocation { get; set; }
+        public string SiteURL { get; set; }
     }
 }

UnivateProperties_API/Repository/Properties/IPropertyImageRepository.cs

@@ -8,5 +8,6 @@ namespace UnivateProperties_API.Repository.Properties
     {
         List<string> GetImages(int PropertyId);
         void Update(NewPropertyImages propertyImages);
+        void UpdateToPhysical();
     }
 }

UnivateProperties_API/Repository/Properties/PropertyImageRepository.cs

@@ -21,10 +21,17 @@ namespace UnivateProperties_API.Repository.Properties
         {
             var images = dBContext.PropertyImages.Where(where).OrderByDescending(i => i.IsDefault).ThenBy(i => i.Id).ToList();
 
+            var url = dBContext.Location.FirstOrDefault()?.SiteURL;
+
             foreach (PropertyImage img in images)
             {
                 if (!img.Image.StartsWith("data:image"))
-                    img.Image = ImageFormatter.ImageToBase64(img.Image);                
+                {
+                    if (!string.IsNullOrEmpty(url))
+                        img.Image = ImageFormatter.ImageToURL(img.Image, url);
+                    else
+                        img.Image = ImageFormatter.ImageToBase64(img.Image);
+                }
             }
 
             return images;
@@ -54,10 +61,17 @@ namespace UnivateProperties_API.Repository.Properties
 
             List<string> formated = new List<string>();
 
+            var url = dBContext.Location.FirstOrDefault()?.SiteURL;
+
             foreach (string img in images)
             {
                 if (!img.StartsWith("data:image"))
-                    formated.Add(ImageFormatter.ImageToBase64(img));
+                {
+                    if (!string.IsNullOrEmpty(url))
+                        formated.Add(ImageFormatter.ImageToURL(img, url));
+                    else
+                        formated.Add(ImageFormatter.ImageToBase64(img));
+                }
                 else
                     formated.Add(img);
             }
@@ -131,8 +145,12 @@ namespace UnivateProperties_API.Repository.Properties
                 if (!string.IsNullOrEmpty(loc))
                 {
                     saveFiles = true;
+                    if (loc.EndsWith("\\"))
+                    {
+                        loc = loc.Substring(0, loc.Length - 1);
+                    }
                     loc += string.Format("\\{0}", propertyImages.PropertyId);
-                    if (Directory.Exists(loc))
+                    if (!Directory.Exists(loc))
                     {
                         Directory.CreateDirectory(loc);
                     }
@@ -162,5 +180,37 @@ namespace UnivateProperties_API.Repository.Properties
                 Save();
             }
         }
+
+        public void UpdateToPhysical()
+        {            
+            bool saveFiles = false;
+            var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
+            if (!string.IsNullOrEmpty(loc))
+            {
+                saveFiles = true;
+                if (loc.EndsWith("\\"))
+                {
+                    loc = loc.Substring(0, loc.Length - 1);
+                }
+            }
+
+            if (saveFiles)
+            {
+                var images = dBContext.PropertyImages.ToList();
+                foreach (var image in images)
+                {
+                    string filePath = string.Format("{0}\\{1}", loc, image.PropertyId );
+                    if (!Directory.Exists(filePath))
+                    {
+                        Directory.CreateDirectory(filePath);
+                    }
+
+                    string path = ImageFormatter.Base64ToImage(image.Image, filePath, image.Id.ToString());
+                    image.Image = path;
+                }
+
+                Save();
+            }
+        }
     }
 }

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -27,7 +27,7 @@ namespace UnivateProperties_API.Repository.Properties
         public List<Property> Get(Func<Property, bool> where)
         {
             return dBContext.Properties
-                .Include("PropertyType")                
+                .Include("PropertyType")
                 .Where(where).ToList();
         }
 
@@ -39,7 +39,7 @@ namespace UnivateProperties_API.Repository.Properties
 
         public Property GetDetailed(Func<Property, bool> first)
         {
-            throw new NotImplementedException();            
+            throw new NotImplementedException();
         }
 
         public PropertyContainer GetDetailed(int id, bool detailed)
@@ -72,10 +72,10 @@ namespace UnivateProperties_API.Repository.Properties
         }
 
         private PropertyContainer GetDetail(Property property, bool detailed)
-        {            
+        {
             int propID = property.Id;
-            var propertyType = dBContext.PropertyTypes.Find(property.PropertyTypeId);           
-            property.DisplayData = new List<PropertyDetailGroup>();            
+            var propertyType = dBContext.PropertyTypes.Find(property.PropertyTypeId);
+            property.DisplayData = new List<PropertyDetailGroup>();
 
             if (detailed)
             {
@@ -236,7 +236,7 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 if (prop != "Item" && prop != "Display")
                     property[prop] = item[prop];
-            }            
+            }
 
             property.PropertyUserFields = null;
             property.PropertyImages = null;
@@ -244,7 +244,7 @@ namespace UnivateProperties_API.Repository.Properties
             if (item.Price < item.OldPrice)
             {
                 property.PriceRedused = true;
-            }            
+            }
 
             if (!string.IsNullOrEmpty(item.StatusString))
             {
@@ -252,7 +252,7 @@ namespace UnivateProperties_API.Repository.Properties
                     property.StatusDate = DateTime.Now;
 
                 property.StatusId = dBContext.Status.Where(s => s.Description == item.StatusString && s.StatusType == StatusType.Property).FirstOrDefault()?.Id;
-                if ((item.StatusString.ToUpper() == "RENTED OUT" || item.StatusString.ToUpper() == "SOLD") && item.StatusString != item.OldStatus)  
+                if ((item.StatusString.ToUpper() == "RENTED OUT" || item.StatusString.ToUpper() == "SOLD") && item.StatusString != item.OldStatus)
                 {
                     property.CutOffDisplayDate = DateTime.Now.AddMonths(1);
                 }
@@ -300,7 +300,7 @@ namespace UnivateProperties_API.Repository.Properties
                             dBContext.Entry(propField).State = EntityState.Modified;
                             Save();
                         }
-                    }                    
+                    }
                 }
             }
             #endregion
@@ -329,23 +329,30 @@ namespace UnivateProperties_API.Repository.Properties
             }
 
             if (item.NewImages != null)
-            {                
+            {
                 bool saveFiles = false;
                 var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
                 if (!string.IsNullOrEmpty(loc))
                 {
                     saveFiles = true;
+                    if (loc.EndsWith("\\"))
+                    {
+                        loc = loc.Substring(0, loc.Length - 1);
+                    }
                     loc += string.Format("\\{0}", property.Id);
-                    if (Directory.Exists(loc))
+                    if (!Directory.Exists(loc))
                     {
                         Directory.CreateDirectory(loc);
                     }
                 }
 
-                             
+
                 var lastID = dBContext.PropertyImages.Max(i => i.Id) + 1;
                 foreach (var image in item.NewImages)
                 {
+                    if (!image.Image.StartsWith("data:image")) 
+                        continue;
+
                     var propImage = new PropertyImage
                     {
                         PropertyId = property.Id,
@@ -366,7 +373,7 @@ namespace UnivateProperties_API.Repository.Properties
                         dBContext.PropertyImages.Add(propImage);
                         Save();
                         lastID++;
-                    }                                        
+                    }
                 }
             }
 
@@ -391,7 +398,7 @@ namespace UnivateProperties_API.Repository.Properties
 
             return GetDisplayDetails(props);
         }
-        
+
         public List<PropertyDisplay> GetDisplay(PropertySearch search)
         {
             //return GetDisplayDetails(dBContext.Properties.ToList());
@@ -410,7 +417,7 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 string keyword = search.Keyword.ToLower();
 
-                List<Property> props = (from p in dBContext.Properties                                       
+                List<Property> props = (from p in dBContext.Properties
                                         join pt in dBContext.PropertyTypes on p.PropertyTypeId equals pt.Id
                                         where EF.Functions.Like(p.PropertyName.ToLower(), $"%{keyword}%")
                                         || EF.Functions.Like(p.Province.ToLower(), $"%{keyword}%")
@@ -474,7 +481,7 @@ namespace UnivateProperties_API.Repository.Properties
 
                 if (!string.IsNullOrEmpty(search.Province) && search.Province != "undefined" && search.Province.ToUpper() != "ALL")
                 {
-                    props = (from p in props                            
+                    props = (from p in props
                              where p.Province.ToUpper() == search.Province.ToUpper()
                              select p).ToList();
 
@@ -485,7 +492,7 @@ namespace UnivateProperties_API.Repository.Properties
 
                 if (!string.IsNullOrEmpty(search.City) && search.City != "undefined" && search.City.ToUpper() != "ALL")
                 {
-                    props = (from p in props                             
+                    props = (from p in props
                              where p.City.ToUpper() == search.City.ToUpper()
                              select p).ToList();
 
@@ -496,7 +503,7 @@ namespace UnivateProperties_API.Repository.Properties
 
                 if (!string.IsNullOrEmpty(search.Suburb) && search.Suburb != "undefined" && search.Suburb.ToUpper() != "ALL")
                 {
-                    props = (from p in props                             
+                    props = (from p in props
                              where p.Suburb.ToUpper() == search.Suburb.ToUpper()
                              select p).ToList();
 
@@ -544,7 +551,7 @@ namespace UnivateProperties_API.Repository.Properties
 
                 return GetDisplayDetails(props);
             }
-        }        
+        }
 
         private void SaveLog(SearchObject item)
         {
@@ -552,7 +559,7 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 Type = item.Type,
                 Search = JsonConvert.SerializeObject(item)
-            };            
+            };
             dBContext.SearchLogs.Add(searchLog);
             Save();
         }
@@ -566,7 +573,7 @@ namespace UnivateProperties_API.Repository.Properties
                 PropertyDisplay display = new PropertyDisplay
                 {
                     PropertyReference = item.PropertyRef,
-                    DateAvailable = item.DateAvailable,                    
+                    DateAvailable = item.DateAvailable,
                     Id = item.Id,
                     ShortDescription = item.ShortDescription,
                     IsSale = item.IsSale,
@@ -686,8 +693,8 @@ namespace UnivateProperties_API.Repository.Properties
                     break;
             }
 
-            List<Property> props = dBContext.Properties.Include("PropertyType").Where(x => x.Published 
-                        && x.PropertyType.UsageType == type 
+            List<Property> props = dBContext.Properties.Include("PropertyType").Where(x => x.Published
+                        && x.PropertyType.UsageType == type
                         && (x.CutOffDisplayDate == DateTime.MinValue || x.CutOffDisplayDate.Date > DateTime.Now.Date)).OrderByDescending(x => x.DatePublished).Take(4).ToList();
             return GetDisplayDetails(props);
         }
@@ -724,7 +731,7 @@ namespace UnivateProperties_API.Repository.Properties
         }
 
         public List<PropertyList> GetPropertyList()
-        {           
+        {
             return SetPropertyList(dBContext.Properties.Where(x => x.Published).ToList());
         }
 
@@ -774,7 +781,7 @@ namespace UnivateProperties_API.Repository.Properties
 
         public void Insert(PropertyContainer items)
         {
-            Property property = new Property();            
+            Property property = new Property();
             PropertyType pt = dBContext.PropertyTypes.Find(items.PropertyTypeId);
             if (pt != null)
             {
@@ -809,9 +816,9 @@ namespace UnivateProperties_API.Repository.Properties
             items.PropertyUserFields = null;
 
             var individual = dBContext.Individuals.Where(i => i.UserId == items.UserId).FirstOrDefault();
-            var agent = dBContext.Agents.Where(a => a.UserId == items.UserId).FirstOrDefault();            
+            var agent = dBContext.Agents.Where(a => a.UserId == items.UserId).FirstOrDefault();
 
-            foreach( string prop in property.GetAllProperties())
+            foreach (string prop in property.GetAllProperties())
             {
                 if (prop != "Item" && prop != "Display")
                     property[prop] = items[prop];
@@ -823,9 +830,9 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 property.AgencyId = agent.AgencyId;
                 property.AgentId = agent.Id;
-            }            
+            }
 
-            if (property.IsSale)            
+            if (property.IsSale)
                 property.StatusId = dBContext.Status.Where(s => s.Description == "For Sale" && s.StatusType == StatusType.Property).FirstOrDefault()?.Id;
             else
                 property.StatusId = dBContext.Status.Where(s => s.Description == "For Rent" && s.StatusType == StatusType.Property).FirstOrDefault()?.Id;
@@ -836,19 +843,29 @@ namespace UnivateProperties_API.Repository.Properties
             if (images != null)
             {
                 bool saveFiles = false;
+                var nextPropID = dBContext.GetMaxID("Properties") + 1;
                 var loc = dBContext.Location.FirstOrDefault()?.PropertyImageLocation;
                 if (!string.IsNullOrEmpty(loc))
                 {
                     saveFiles = true;
-                    loc += string.Format("\\{0}", property.Id);
-                    if (Directory.Exists(loc))
+                    if (loc.EndsWith("\\"))
+                    {
+                        loc = loc.Substring(0, loc.Length - 1);
+                    }
+                    loc += string.Format("\\{0}", nextPropID);
+                    if (!Directory.Exists(loc))
                     {
                         Directory.CreateDirectory(loc);
                     }
                 }
 
                 property.PropertyImages = new List<PropertyImage>();
-                var lastID = dBContext.PropertyImages.Max(i => i.Id) + 1;
+                var lastID = 0;
+                if (dBContext.PropertyImages.Count() == 0)
+                    lastID = 1;
+                else
+                    lastID = dBContext.PropertyImages.Max(i => i.Id) + 1;
+
                 foreach (PropertyImage image in images)
                 {
                     image.PropertyId = property.Id;
@@ -863,7 +880,7 @@ namespace UnivateProperties_API.Repository.Properties
             }
 
             if (fields != null)
-            {                
+            {
                 property.PropertyUserFields = new List<PropertyUserField>();
                 foreach (PropertyUserField field in fields)
                 {
@@ -875,7 +892,7 @@ namespace UnivateProperties_API.Repository.Properties
             dBContext.Properties.Add(property);
             Save();
 
-            items.Id = property.Id;            
+            items.Id = property.Id;
         }
 
         public bool MayEdit(int id)
@@ -907,7 +924,7 @@ namespace UnivateProperties_API.Repository.Properties
                 }
 
                 foreach (PropertyImage image in Images)
-                {                                    
+                {
                     image.PropertyId = propertyID;
                     if (saveFiles)
                     {
@@ -989,7 +1006,7 @@ namespace UnivateProperties_API.Repository.Properties
                     IsPublished = prop.Published,
                     Type = prop.PropertyType.UsageType.ToString()
                 };
-                
+
                 if (prop.StatusId != null)
                 {
                     propAdmin.Status = dBContext.Status.Where(s => s.Id == prop.StatusId).FirstOrDefault()?.Description;

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Drawing.Text;
@@ -195,7 +196,8 @@ namespace UnivateProperties_API.Repository.Users
                 user.PasswordSalt = passwordSalt;
             }
 
-            _dbContext.Users.Update(user);
+            //_dbContext.Users.Update(user);
+            _dbContext.Entry(user).State = EntityState.Modified;
             _dbContext.SaveChanges();
         }
 
@@ -273,7 +275,8 @@ namespace UnivateProperties_API.Repository.Users
             user.PasswordSalt = passwordSalt;
             user.FPToken = "";
 
-            _dbContext.Users.Update(user);
+            //_dbContext.Users.Update(user);
+            _dbContext.Entry(user).State = EntityState.Modified;
             Save();
         }
 
@@ -401,7 +404,8 @@ namespace UnivateProperties_API.Repository.Users
                 //send ecrypted token to db
                 user.FPToken = encryptedToken;
 
-                _dbContext.Users.Update(user);
+                _dbContext.Entry(user).State = EntityState.Modified;
+                //_dbContext.Users.Update(user);
                 _dbContext.SaveChanges();
 
                 string linkStr = encryptedToken.Replace('/', '!');