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

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -74,6 +74,23 @@ namespace UnivateProperties_API.Containers.Timeshare
             Region = new RegionDto() { RegionCode = split[24].Trim() };
             IsTender = true;
             ReferedByAgent = false;
+            // F-Fixed T-Timeshare (Fixed Timeshare Week) 
+            //PML - Peak / Medium / Low Felxi
+            switch (split[25].Trim())
+            {
+                case "T":
+                case "F":
+                    WeekType = "Fixed";
+                    break;
+                case "P":
+                case "M":
+                case "L":
+                    WeekType = "Peak Flexi";
+                    break;
+                default:
+                    WeekType = "";
+                    break;
+            }
         }
 
         public WeekDto(TimeshareWeek week)
@@ -102,6 +119,7 @@ namespace UnivateProperties_API.Containers.Timeshare
             SellPrice = week.SellPrice;
             IsTender = false;
             ReferedByAgent = week.ReferedByAgent;
+            WeekType = week.WeekType.ToString();
         }
 
         public int Id { get; set; }
@@ -126,7 +144,7 @@ namespace UnivateProperties_API.Containers.Timeshare
         public double SellPrice { get; set; }
         public bool IsTender { get; set; }
         public bool ReferedByAgent { get; set; }
-
+        public string WeekType { get; set; }
         public string Display => $"{Resort.Display}  ({ArrivalDate.ToShortDateString()} - {DepartureDate.ToShortDateString()})";
         public string WeekUni => $"{Resort.ResortCode}-{UnitNumber}-{WeekNumber}";
     }    

UnivateProperties_API/Enums.cs

@@ -25,4 +25,12 @@
         Property,
         Bid
     }
+
+    public enum WeekType
+    {
+        Flexi,
+        Fixed,
+        Module,
+        Syndicate
+    }
 }

UnivateProperties_API/Migrations/20200904080501_WeekType added for weeks.cs

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

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -1023,6 +1023,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("WeekPlacedForRental");
 
+                    b.Property<int>("WeekType");
+
                     b.HasKey("Id");
 
                     b.HasIndex("AgencyId");

UnivateProperties_API/Model/Properties/Property.cs

@@ -34,6 +34,7 @@ namespace UnivateProperties_API.Model.Properties
         public string PostalCode { get; set; }
         public string PropertCoords { get; set; }  
         public string AddressURL { get; set; }
+        public string PropertyRef { get; set; }
         public bool Published { get; set; }
         public DateTime DatePublished { get; set; }
         public string VirtualTour { get; set; }

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -94,6 +94,8 @@ namespace UnivateProperties_API.Model.Timeshare
 
         [ForeignKey("Status")]
         public int StatusId { get; set; }
+
+        public WeekType WeekType { get; set; }
         #endregion
 
         #region Navigation

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -502,7 +502,8 @@ namespace UnivateProperties_API.Repository.Properties
         private List<PropertyDisplay> GetDisplayDetails(List<Property> props)
         {
             var properties = new List<PropertyDisplay>();
-            props = props.Where(p => p.Published).ToList();
+            //Removed publish check for now
+            //props = props.Where(p => p.Published).ToList();
             foreach (var item in props)
             {
                 PropertyDisplay display = new PropertyDisplay
@@ -582,7 +583,9 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<PropertyDisplay> GetLatestDisplay()
         {
-            List<Property> props = GetAll().Where(x => x.Published).OrderByDescending(x => x.DatePublished).Take(3).ToList();
+            //Removed Published Check for now
+            //List<Property> props = GetAll().Where(x => x.Published).OrderByDescending(x => x.DatePublished).Take(3).ToList();
+            List<Property> props = GetAll().OrderByDescending(x => x.Created).Take(3).ToList();
             return GetDisplayDetails(props);
         }
 
@@ -619,7 +622,9 @@ namespace UnivateProperties_API.Repository.Properties
 
         public List<PropertyList> GetPropertyList()
         {
-            return SetPropertyList(dBContext.Properties.Where(x => x.Published).ToList());
+            //Removed Published check for now
+            //return SetPropertyList(dBContext.Properties.Where(x => x.Published).ToList());
+            return SetPropertyList(dBContext.Properties.ToList());
         }
 
         private List<PropertyList> SetPropertyList(List<Property> properties)

UnivateProperties_API/appsettings.json

@@ -9,7 +9,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=192.168.0.219;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
-    "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail_test.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N"
+    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
+    "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N"
   }
 }