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

UnivateProperties_API/Containers/Property/GroupFields.cs

@@ -8,6 +8,7 @@
         public string Type { get; set; }
         public string Value { get; set; }                        
         public int ItemID { get; set; }
+        public int Rank { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Containers/Property/PropertyContainer.cs

@@ -13,6 +13,9 @@ namespace UnivateProperties_API.Containers.Property
         public string SalesTypeString { get; set; }
         public int UserId { get; set; }
         public string PropertyUsageType { get; set; }
+        public decimal OldPrice { get; set; }        
+        public string OldStatus { get; set; }
+        public string CutOffDisplayDateString { get; set; }
         public List<NewImage> NewImages { get; set; }
         public List<PropertyFieldGroup> PropertyOverviewFields { get; set; }
         public List<PropertyFieldGroup> PropertyFields { get; set; }

UnivateProperties_API/Containers/Property/PropertyDisplay.cs

@@ -34,8 +34,8 @@ namespace UnivateProperties_API.Containers.Property
         public decimal Price { get; set; }        
         public DateTime DateCreated { get; set; }
         public DateTime DateAvailable { get; set; }
-        public string Available { get; set; }
-        public bool HasPendingOffer { get; set; }
+        public string DisplayColor { get; set; }
+        public string DisplayText { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Containers/Timeshare/ResortDisplay.cs

@@ -1,4 +1,6 @@
-namespace UnivateProperties_API.Containers.Timeshare
+using System.Collections.Generic;
+
+namespace UnivateProperties_API.Containers.Timeshare
 {
     public class ResortDisplay
     {
@@ -7,4 +9,71 @@
         public string ResortImage { get; set; }
         public int WeeksAvailable { get; set; }
     }
+
+    public class ResortData : GoMeloResort
+    {
+        public string Layout { get; set; }
+        public string Description { get; set; }        
+        public List<string> Images { get; set; }
+    }
+
+    public class GoMeloResort
+    {
+        public int PrIdx { get; set; }
+        public string PrProductIndex { get; set; }
+        public string PrProdType { get; set; }
+        public string PrName { get; set; }
+        public string PrPostAdd1 { get; set; }
+        public Coords PrPostAdd2 { get; set; }
+        public string PrPostTown { get; set; }
+        public string PrPostCountry { get; set; }
+        public string PrPostCode { get; set; }
+        public string PrStreetAdd1 { get; set; }
+        public string PrStreetAdd2 { get; set; }
+        public string PrStreetTown { get; set; }
+        public string PrStreetCountry { get; set; }
+        public string PrStreetCode { get; set; }
+        public string PrLastDate { get; set; }
+        public string PrManager { get; set; }
+        public string PrReservations { get; set; }
+        public string PrStartDate { get; set; }
+        public string PrStartYear { get; set; }
+        public string PrEndDate { get; set; }
+        public string PrNoYears { get; set; }
+        public string PrIntervals { get; set; }
+        public int PrIntervalWe { get; set; }
+        public int PrIntervalMw { get; set; }
+        public string PrRegion { get; set; }
+        public string PrCity { get; set; }
+        public string PrProvince { get; set; }
+        public string PrCheckin { get; set; }
+        public string PrCheckout { get; set; }
+        public string PrCheckInDay { get; set; }
+        public string PrNotes { get; set; }
+        public string PrDirections { get; set; }
+        public string PrUnitFacilities { get; set; }
+        public string PrAttractions { get; set; }
+        public string PrAlerts { get; set; }
+        public string PrManaged { get; set; }
+        public string PrCountry { get; set; }
+        public string PrWww { get; set; }
+        public string PrManAgent { get; set; }
+        public string PrImagePath { get; set; }
+        public string PrRciaffiliated { get; set; }
+        public string PrSelfCatering { get; set; }
+        public string PrLatitude { get; set; }
+        public string PrLongitude { get; set; }
+        public string PrAirport { get; set; }
+        public int PrAirportDistance { get; set; }
+        public string PrStadium { get; set; }
+        public int PrStadiumDistance { get; set; }
+        public string PrWcCity { get; set; }
+        public int PrWcCityDistance { get; set; }
+    }
+
+    public class Coords
+    {
+        public string Lat { get; set; }
+        public string Long { get; set; }
+    }
 }

UnivateProperties_API/Controllers/Timeshare/ResortController.cs

@@ -37,5 +37,11 @@ namespace UnivateProperties_API.Controllers.Timeshare
         {
             return new OkObjectResult(_Repo.GetResortImages(code));
         }
+
+        [HttpGet("GetResortData/{code}")]
+        public IActionResult GetResortData(string code)
+        {
+            return new OkObjectResult(_Repo.GetResortData(code));
+        }
     }
 }

UnivateProperties_API/Helpers/TenderWeeksHelper.cs

@@ -56,5 +56,5 @@ namespace UnivateProperties_API.Helpers
         public string Town { get; set; }
         public string City { get; set; }
         public int Id { get; set; }
-    }
+    }    
 }

UnivateProperties_API/Migrations/20200914092358_Update.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class Update : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

UnivateProperties_API/Migrations/20200917125427_priceredused.cs

@@ -0,0 +1,23 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class priceredused : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "PriceRedused",
+                table: "Properties",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PriceRedused",
+                table: "Properties");
+        }
+    }
+}

UnivateProperties_API/Migrations/20200918092143_Added Cutoff show date.cs

@@ -0,0 +1,24 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class AddedCutoffshowdate : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "CutOffDisplayDate",
+                table: "Properties",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CutOffDisplayDate",
+                table: "Properties");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -670,6 +670,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<DateTime>("Created");
 
+                    b.Property<DateTime>("CutOffDisplayDate");
+
                     b.Property<DateTime>("DateAvailable");
 
                     b.Property<DateTime>("DatePublished");
@@ -694,6 +696,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("PricePer");
 
+                    b.Property<bool>("PriceRedused");
+
                     b.Property<string>("PropertCoords");
 
                     b.Property<string>("PropertyName");

UnivateProperties_API/Model/Communication/Email.cs

@@ -47,7 +47,7 @@ namespace UnivateProperties_API.Model.Communication
                     SenderId = template.SenderId.Value;
                 }
                 Sender = template.Sender;
-                To = "jplouw@provision-sa.com"; // sendTo.Email;
+                To = "abigaildf@provision-sa.com"; // sendTo.Email;
                 ToDisplay = sendTo.FullName;
                 /*BCC = ConcatEmails(template.AgentBCC, template.IndividualBCC);*/
                 IsBodyHtml = true;

UnivateProperties_API/Model/Properties/Property.cs

@@ -38,23 +38,10 @@ namespace UnivateProperties_API.Model.Properties
         public bool Published { get; set; }
         public DateTime DatePublished { get; set; }
         public string VirtualTour { get; set; }
+        public bool PriceRedused { get; set; }
         public string Video { get; set; }
         [ForeignKey("Status")]
-        public int? StatusId 
-        { 
-            get
-            {
-                return _StatusID;
-            }
-            set
-            {
-                _StatusID = value;
-                if (value != null)
-                {
-                    StatusDate = DateTime.Now;
-                }
-            }
-        }
+        public int? StatusId { get; set; }       
         [ForeignKey("Owner")]
         public int? OwnerId { get; set; }
         [ForeignKey("Agent")]
@@ -66,9 +53,10 @@ namespace UnivateProperties_API.Model.Properties
         public virtual PropertyType PropertyType { get; set; }            
         [NotMapped]
         public Status Status { get; set; }        
-        public virtual Individual Owner { get; set; }        
-        public virtual Agent Agent { get; set; }        
+        public virtual Individual Owner { get; set; }
+        public virtual Agent Agent { get; set; }
         public virtual Agency Agency { get; set; }
+        public DateTime CutOffDisplayDate { get; set; }        
 
         public ICollection<PropertyUserField> PropertyUserFields { get; set; }
         public ICollection<PropertyImage> PropertyImages { get; set; }

UnivateProperties_API/Repository/Financial/PaygateRepository.cs

@@ -36,7 +36,7 @@ namespace UnivateProperties_API.Repository.Financial
 
             string amm = Math.Round((total * 100)).ToString();
             string currenc = "ZAR";
-            string retUrl = "http://localhost:57260/api/redirect";
+            string retUrl = "http://training.provision-sa.com:82/api/redirect";
             string transDate = utcDate;
             string loc = "en-za";
             string count = "ZAF";

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -114,22 +114,18 @@ namespace UnivateProperties_API.Repository.Properties
 
                         foreach (var val in groupFields)
                         {
-                            var item = new PropertyDetail()
+                            if (!string.IsNullOrEmpty(val.Value))
                             {
-                                Name = val.FieldName,
-                                Description = val.Description
-                            };
-
-                            detailGroup.Values.Add(item);
-
-                            //if (!string.IsNullOrEmpty(val.Value) && (val.FieldName == "Erf Size" || val.FieldName == "Floor Size") && val.Value.EndsWith("2"))
-                            //{
-                            //    item.Value = val.Value.Substring(0, val.Value.Length - 1) + "<sup>" + val.Value.Last() + "</sup>";
-                            //}
-                            //else
-                                item.Value = val.Value;
+                                var item = new PropertyDetail()
+                                {
+                                    Name = val.FieldName,
+                                    Description = val.Description,
+                                    Value = val.Value
+                                };
+
+                                detailGroup.Values.Add(item);
+                            }
                         }
-
                         property.DisplayData.Add(detailGroup);
                     }
                 }
@@ -142,7 +138,8 @@ namespace UnivateProperties_API.Repository.Properties
 
             var propertyDetails = new PropertyContainer();
 
-            propertyDetails.SalesTypeString = property.IsSale ? "Sale" : "Rental";            
+            propertyDetails.SalesTypeString = property.IsSale ? "Sale" : "Rental";
+            propertyDetails.OldPrice = property.Price;
 
             foreach (string prop in property.GetAllProperties())
             {
@@ -151,7 +148,10 @@ namespace UnivateProperties_API.Repository.Properties
             }
 
             if (property.StatusId != null)
+            {
                 propertyDetails.StatusString = dBContext.Status.Where(s => s.Id == property.StatusId).FirstOrDefault()?.Description;
+                propertyDetails.OldStatus = propertyDetails.StatusString;
+            }
 
             propertyDetails.PropertyUsageType = propertyType.UsageType == PropertyUsageType.Commercial ? "Commercial" : "Residential";
 
@@ -161,7 +161,14 @@ namespace UnivateProperties_API.Repository.Properties
                 propertyDetails.UserId = (dBContext.Agents.Where(p => p.Id == property.AgentId).FirstOrDefault().UserId).Value;
 
             propertyDetails.NewImages = new List<NewImage>();
-            propertyDetails.DateAvailableString = string.Format("{0:yyyy-MM-dd}", property.DateAvailable);
+
+            if (property.DateAvailable != DateTime.MinValue)
+                propertyDetails.DateAvailableString = string.Format("{0:yyyy-MM-dd}", property.DateAvailable);
+
+            if (property.CutOffDisplayDate == DateTime.MinValue)
+                propertyDetails.CutOffDisplayDateString = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddMonths(1));
+            else
+                propertyDetails.CutOffDisplayDateString = string.Format("{0:yyyy-MM-dd}", property.CutOffDisplayDate);
 
             return propertyDetails;
         }
@@ -229,14 +236,34 @@ namespace UnivateProperties_API.Repository.Properties
             {
                 if (prop != "Item" && prop != "Display")
                     property[prop] = item[prop];
-            }
+            }            
 
             property.PropertyUserFields = null;
             property.PropertyImages = null;
 
+            if (item.Price < item.OldPrice)
+            {
+                property.PriceRedused = true;
+            }            
+
             if (!string.IsNullOrEmpty(item.StatusString))
             {
+                if (item.StatusString != item.OldStatus)
+                    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)  
+                {
+                    property.CutOffDisplayDate = DateTime.Now.AddMonths(1);
+                }
+                else
+                {
+                    property.CutOffDisplayDate = DateTime.MinValue;
+                }
+                if (item.StatusString.ToUpper() == "FOR SALE")
+                    property.IsSale = true;
+                if (item.StatusString.ToUpper() == "FOR RENT")
+                    property.IsSale = false;
             }
 
             if (!string.IsNullOrEmpty(item.DateAvailableString))
@@ -539,8 +566,7 @@ namespace UnivateProperties_API.Repository.Properties
                 PropertyDisplay display = new PropertyDisplay
                 {
                     PropertyReference = item.PropertyRef,
-                    DateAvailable = item.DateAvailable,
-                    Available = item.DateAvailable.Date > DateTime.Now.Date ? string.Format("Available form: {0: dd MMM yyyy}", item.DateAvailable) : "Available Now",
+                    DateAvailable = item.DateAvailable,                    
                     Id = item.Id,
                     ShortDescription = item.ShortDescription,
                     IsSale = item.IsSale,
@@ -576,29 +602,51 @@ namespace UnivateProperties_API.Repository.Properties
                     DateCreated = item.Created,
                     PropertyUsageType = (from p in dBContext.PropertyTypes
                                          where p.Id == item.PropertyTypeId
-                                         select p.UsageType.ToString()).FirstOrDefault(),
-                    HasPendingOffer = false
-                };                
+                                         select p.UsageType.ToString()).FirstOrDefault()
+                };
 
-                if (item.StatusId != null)
+                var status = dBContext.Status.Where(s => s.Id == item.StatusId).FirstOrDefault();
+                switch (status.Description.ToUpper())
                 {
-                    var status = dBContext.Status.Where(s => s.Id == item.StatusId).FirstOrDefault();
-                    if (status.Description.ToUpper() == "OFFER PENDING")
-                        display.HasPendingOffer = true;                    
+                    case "FOR RENT":
+                        if (item.DateAvailable < DateTime.Now)
+                        {
+                            display.DisplayText = "Available Now";
+                            display.DisplayColor = "green";
+                        }
+                        else
+                        {
+                            display.DisplayText = string.Format("Available From: {0:dd MMM yyyy}", item.DateAvailable);
+                            display.DisplayColor = "blue";
+                        }
+                        break;
+                    case "FOR SALE":
+                        if (item.PriceRedused)
+                        {
+                            display.DisplayText = "Price Redused";
+                            display.DisplayColor = "green";
+                        }
+                        else
+                        {
+                            display.DisplayText = "For Sale";
+                            display.DisplayColor = "blue";
+                        }
+                        break;
+                    case "OFFER PENDING":
+                        display.DisplayText = "Offer Pending";
+                        display.DisplayColor = "orange";
+                        break;
+                    default:
+                        display.DisplayText = status.Description;
+                        display.DisplayColor = "red";
+                        break;
+
                 }
 
                 if (display.DisplayImage != null && !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>";
-                //}
-
-                if (display.HasPendingOffer)
-                    display.Available = "Offer Pending";
 #if !ReturnImages
                 display.DisplayImage = "";
 #endif
@@ -621,7 +669,7 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<PropertyDisplay> GetLatestDisplay()
         {
-            List<Property> props = GetAll().Where(x => x.Published).OrderByDescending(x => x.DatePublished).Take(4).ToList();
+            List<Property> props = GetAll().Where(x => x.Published && (x.CutOffDisplayDate == DateTime.MinValue || x.CutOffDisplayDate.Date > DateTime.Now.Date)).OrderByDescending(x => x.DatePublished).Take(4).ToList();
             return GetDisplayDetails(props);
         }
 
@@ -638,7 +686,9 @@ namespace UnivateProperties_API.Repository.Properties
                     break;
             }
 
-            List<Property> props = dBContext.Properties.Include("PropertyType").Where(x => x.Published && x.PropertyType.UsageType == type).OrderByDescending(x => x.DatePublished).Take(4).ToList();
+            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);
         }
 

UnivateProperties_API/Repository/Properties/UserDefinedGroupRepository.cs

@@ -136,9 +136,11 @@ namespace UnivateProperties_API.Repository.Properties
                         {
                             ID = field.Id,
                             Name = field.FieldName,
-                            Type = field.FieldType
+                            Type = field.FieldType,
+                            Rank = field.Rank
                         });
                     }
+                   
                 }
             }
 
@@ -204,6 +206,9 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<Group> GetSavedList(int PropertyId)
         {
+            if (PropertyId == 0)
+                return null;
+
             var prop = dBContext.Properties.Include("PropertyType").Where(p => p.Id == PropertyId).FirstOrDefault();
             var all = GetFieldListByPropType(prop.PropertyType.PropertyUsageType);
 

UnivateProperties_API/Repository/Timeshare/IResortRepository.cs

@@ -15,6 +15,7 @@ namespace UnivateProperties_API.Repository.Timeshare
         List<ResortDisplay> GetResortsByRegion(string regionCode);
         string GetResortDescription(string resortCode);
         List<string> GetResortImages(string resortCode);
+        ResortData GetResortData(string resortCode);
     }
 
     public class ResortRepository : IResortRepository
@@ -151,5 +152,59 @@ namespace UnivateProperties_API.Repository.Timeshare
 
             return resorts.OrderBy(r => r.ResortCode).ToList();
         }
+
+        public ResortData GetResortData(string resortCode)
+        {             
+            #region Get Resort Data
+            var client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/{0}", resortCode))
+            {
+                Timeout = -1
+            };
+            var request = new RestRequest(Method.GET);
+            IRestResponse response = client.Execute(request);
+            ResortData data = JsonConvert.DeserializeObject<ResortData>(response.Content);
+            #endregion
+
+            #region Get Layout
+            client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/layout", resortCode))
+            {
+                Timeout = -1
+            };
+            request = new RestRequest(Method.GET);
+            response = client.Execute(request);
+            data.Layout = response.Content;
+            if (!string.IsNullOrEmpty(data.Layout))
+            {
+                data.Layout = "data:image/jpeg;base64," + data.Layout;
+            }
+            #endregion
+
+            #region GetImages
+            data.Images = GetResortImages(resortCode);
+            if (data.Images == null || data.Images.Count == 0)
+            {
+                data.Images = new List<string>();
+                int count = 1; 
+                while( count < 5)
+                {
+                    client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/image/{1}", resortCode, count))
+                    {
+                        Timeout = -1
+                    };
+                    request = new RestRequest(Method.GET);
+                    response = client.Execute(request);
+                    var img = string.Format("data:image/jpeg;base64,{0}", response.Content);
+                    data.Images.Add(img);
+                    count++;
+                }
+            }
+            #endregion
+
+            #region Get Description
+            data.Description = GetResortDescription(resortCode);            
+            #endregion
+
+            return data; 
+        }
     }
 }