Property Search & fixes to property API

UnivateProperties_API/Containers/Property/PropertyContainer.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using UnivateProperties_API.Model.Properties;
 
 namespace UnivateProperties_API.Containers.Property
 {
@@ -40,4 +41,10 @@ namespace UnivateProperties_API.Containers.Property
         public string Image { get; set;  }
         public bool IsDefault { get; set; }
     }
+
+    public class PropertyImageContainer
+    {
+        public int PropertyId { get; set; }
+        public List<PropertyImage> Images { get; set; }
+    }
 }

UnivateProperties_API/Controllers/Properties/PropertyController.cs

@@ -88,20 +88,20 @@ namespace UnivateProperties_API.Controllers.Properties
         [HttpPost]
         public IActionResult Post([FromBody] PropertyContainer property)
         {
-            using (var scope = new TransactionScope())
+            using (var scope = new TransactionScope(TransactionScopeOption.Suppress))
             {
                 _Repo.Insert(property);
-                scope.Complete();
+                scope.Complete();                
                 return CreatedAtAction(nameof(Get), new { id = property.Id }, property);
-            }
-        }       
+            }            
+        }      
 
         [HttpPut]
         public IActionResult Put([FromBody] PropertyContainer property)
         {
             if (property != null)
             {
-                using (var scope = new TransactionScope())
+                using (var scope = new TransactionScope(TransactionScopeOption.Suppress))
                 {
                     _Repo.Update(property);
                     scope.Complete();

UnivateProperties_API/Repository/Properties/IPropertyRepository.cs

@@ -16,6 +16,8 @@ namespace UnivateProperties_API.Repository.Properties
         void Insert(PropertyContainer items);
         PropertyContainer GetDetailed(int id, bool detailed);
         void Update(PropertyContainer item);
-        bool MayEdit(int id);        
+        bool MayEdit(int id);
+        void InsertImages(int propertyID, List<PropertyImage> Images);
+        void InsertFields(int propertyID, List<PropertyUserField> Fields);
     }
 }

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -548,7 +548,7 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<PropertyDisplay> GetLatestDisplay()
         {
-            List<Property> props = GetAll().OrderBy(x => x.Created).Take(3).ToList();
+            List<Property> props = GetAll().OrderByDescending(x => x.Created).Take(3).ToList();
             return GetDisplayDetails(props);
         }
 
@@ -565,13 +565,17 @@ namespace UnivateProperties_API.Repository.Properties
                 if (agent != null)
                     properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgentId == agent.Id).ToList();
             }
-            else
+            else if (Type.ToUpper() == "ADMIN")
             {
                 if (individual != null)
                     properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.OwnerId == individual.Id).ToList();
                 if (agent != null)
                     properties = dBContext.Properties.Include("City").Include("Suburb").Where(x => x.AgencyId == agent.AgencyId).ToList();
             }
+            else if (Type.ToUpper() == "SUPERADMIN")
+            {
+                properties = dBContext.Properties.Include("City").Include("Suburb").ToList();
+            }
             
             List<PropertyList> list = new List<PropertyList>();
 
@@ -655,7 +659,7 @@ namespace UnivateProperties_API.Repository.Properties
 
             foreach( string prop in property.GetAllProperties())
             {
-                if (prop != "Item")
+                if (prop != "Item" && prop != "Display")
                     property[prop] = items[prop];
             }
 
@@ -669,14 +673,9 @@ namespace UnivateProperties_API.Repository.Properties
 
             property.Video = property.Video.Replace("https://www.youtube.com/watch?v=", "");
 
-            dBContext.Properties.Add(property);
-            Save();
-
             if (images != null)
             {
-                var lastID = (from p in dBContext.PropertyImages
-                              orderby p.Id descending
-                              select p.Id).FirstOrDefault();
+                var lastID = dBContext.GetMaxID("PropertyImages");
 
                 bool saveFiles = false;
                 var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
@@ -690,6 +689,7 @@ namespace UnivateProperties_API.Repository.Properties
                     }
                 }
 
+                property.PropertyImages = new List<PropertyImage>();
                 foreach (PropertyImage image in images)
                 {
                     lastID++;
@@ -700,26 +700,27 @@ namespace UnivateProperties_API.Repository.Properties
                         string path = ImageFormatter.Base64ToImage(image.Image, loc, lastID.ToString());
                         image.Image = path;
                     }
-                    dBContext.PropertyImages.Add(image);
-                    Save();
+                    property.PropertyImages.Add(image);
                 }
             }
 
             if (fields != null)
             {
-                var lastID = (from p in dBContext.PropertyUserFields
-                              orderby p.Id descending
-                              select p.Id).FirstOrDefault();
-
+                var lastID = dBContext.GetMaxID("PropertyUserFields");
+                property.PropertyUserFields = new List<PropertyUserField>();
                 foreach (PropertyUserField field in fields)
                 {
                     lastID++;
                     field.Id = lastID;
                     field.PropertyId = property.Id;
-                    dBContext.PropertyUserFields.Add(field);
-                    Save();
+                    property.PropertyUserFields.Add(field);
                 }
             }
+
+            dBContext.Properties.Add(property);
+            Save();
+
+            items.Id = property.Id;            
         }
 
         public bool MayEdit(int id)
@@ -730,6 +731,45 @@ namespace UnivateProperties_API.Repository.Properties
                                select b).FirstOrDefault();
 
             return (hasBidItems == null) ? true : false;
-        }                
+        }
+
+        public void InsertImages(int propertyID, List<PropertyImage> Images)
+        {
+            if (Images != null)
+            {
+                var lastID = dBContext.GetMaxID("PropertyImages");
+
+                bool saveFiles = false;
+                var loc = dBContext.Location.FirstOrDefault().PropertyImageLocation;
+                if (!string.IsNullOrEmpty(loc))
+                {
+                    saveFiles = true;
+                    loc += string.Format("\\{0}", propertyID);
+                    if (Directory.Exists(loc))
+                    {
+                        Directory.CreateDirectory(loc);
+                    }
+                }
+
+                foreach (PropertyImage image in Images)
+                {
+                    lastID++;
+                    image.Id = lastID;
+                    image.PropertyId = propertyID;
+                    if (saveFiles)
+                    {
+                        string path = ImageFormatter.Base64ToImage(image.Image, loc, lastID.ToString());
+                        image.Image = path;
+                    }
+                    dBContext.PropertyImages.Add(image);
+                    Save();
+                }
+            }
+        }
+
+        public void InsertFields(int propertyID, List<PropertyUserField> Fields)
+        {
+            throw new NotImplementedException();
+        }
     }
 }

UnivateProperties_API/Repository/Region/SuburbRepository.cs

@@ -121,8 +121,7 @@ namespace UnivateProperties_API.Repository.Region
             foreach (var sub in suburbs)
             {
                 searchList.Add(new SuburbSearch()
-                {
-                    Id = sub.Id,
+                {                       
                     Province = sub.City.Province.Description,
                     City = sub.City.Description,
                     Suburb = sub.Description,
@@ -130,7 +129,19 @@ namespace UnivateProperties_API.Repository.Region
                 });
             }
 
-            return searchList;
+            var cities = dBContext.Cities.Include("Province").ToList();
+            foreach(var city in cities)
+            {
+                searchList.Add(new SuburbSearch()
+                {                    
+                    Province = city.Province.Description,
+                    City = city.Description,
+                    Suburb = "",
+                    Display = string.Format("{0}", city.Description)
+                });
+            }
+
+            return searchList.OrderBy(s => s.City).ThenBy(s => s.Suburb).ToList();
         }
 
         public List<Suburb> GetByProperty(int propertyId)