Added fields and bank entity

UnivateProperties_API/Containers/Timeshare/WeekFilterDto.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace UnivateProperties_API.Containers.Timeshare
+{
+    public class WeekFilterDto
+    {
+        public string RegionCode { get; set; }
+        public string ResortCode { get; set; }
+        public DateTime? Date { get; set; }
+        public double? MinAmount { get; set; }
+        public double? MaxAmount { get; set; }
+    }
+}

UnivateProperties_API/Context/DataContext.cs

@@ -6,6 +6,7 @@ using UnivateProperties_API.Model.Region;
 using UnivateProperties_API.Model.Timeshare;
 using System.Linq;
 using UnivateProperties_API.Model;
+using UnivateProperties_API.Model.Bank;
 
 namespace UnivateProperties_API.Context
 {
@@ -50,6 +51,8 @@ namespace UnivateProperties_API.Context
         public DbSet<UnitConfiguration> UnitConfigurations { get; set; }
         public DbSet<UnitConfigurationType> UnitConfigurationTypes { get; set; }
         public DbSet<Season> Seasons { get; set; }
+        public DbSet<Bank> Banks { get; set; }
+        public DbSet<BankAccount> BankAccounts { get; set; }
         #endregion Timeshare
 
         public override int SaveChanges()

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -1,7 +1,12 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Transactions;
+using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Model.Timeshare;
 using UnivateProperties_API.Repository;
+using UnivateProperties_API.Repository.Timeshare;
 
 namespace UnivateProperties_API.Controllers.Timeshare
 {
@@ -30,6 +35,13 @@ namespace UnivateProperties_API.Controllers.Timeshare
             return new OkObjectResult(item);
         }
 
+        [HttpGet("getBy")]
+        public IActionResult GetBy(WeekFilterDto week)
+        {
+            var item = (_Repo as WeekRepository).GetBy(week);
+            return new OkObjectResult(item);
+        }
+        
         [HttpPost]
         public IActionResult Post([FromBody] TimeshareWeek item)
         {

UnivateProperties_API/Migrations/20190904110840_Initial.Designer.cs

@@ -0,0 +1,771 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using UnivateProperties_API.Context;
+
+namespace UnivateProperties_API.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20190904110840_Initial")]
+    partial class Initial
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.Email", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("BCC");
+
+                    b.Property<string>("Body");
+
+                    b.Property<string>("CC");
+
+                    b.Property<string>("Comment");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsBodyHtml");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("SenderId");
+
+                    b.Property<string>("Subject");
+
+                    b.Property<string>("To");
+
+                    b.Property<string>("ToDisplay");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SenderId");
+
+                    b.ToTable("Emails");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPAccount", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Address");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("DisplayName");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("SMTPHostId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SMTPHostId");
+
+                    b.ToTable("Accounts");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPHost", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Host");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("NeedsAuthorize");
+
+                    b.Property<string>("Password");
+
+                    b.Property<bool>("UseSSL");
+
+                    b.Property<string>("User");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Hosts");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.Property", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AddressLine1");
+
+                    b.Property<string>("AddressLine2");
+
+                    b.Property<string>("AddressLine3");
+
+                    b.Property<int>("CityId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("CreatedBy");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsSale");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("OperationalCosts");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<string>("PricePer");
+
+                    b.Property<string>("PropertyName");
+
+                    b.Property<int>("PropertyTypeId");
+
+                    b.Property<int>("ProvinceId");
+
+                    b.Property<bool>("Published");
+
+                    b.Property<string>("ShortDescription");
+
+                    b.Property<int>("SuburbId");
+
+                    b.Property<string>("Unit");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CityId");
+
+                    b.HasIndex("PropertyTypeId");
+
+                    b.HasIndex("ProvinceId");
+
+                    b.HasIndex("SuburbId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyImage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Image");
+
+                    b.Property<bool>("IsDefault");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("PropertyId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("PropertyImages");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("UsageType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PropertyTypes");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyUserField", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("PropertyId");
+
+                    b.Property<int>("UserDefinedFieldId");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("UserDefinedFieldId");
+
+                    b.ToTable("PropertyUserFields");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.UserDefinedField", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("FieldName");
+
+                    b.Property<string>("FieldType");
+
+                    b.Property<int>("GroupId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("UserDefinedFields");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.UserDefinedGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("Rank");
+
+                    b.Property<int>("UsageType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserDefinedGroups");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.City", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("ProvinceId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProvinceId");
+
+                    b.ToTable("Cities");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.Province", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Provinces");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.Suburb", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("CityId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("PostalCode");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CityId");
+
+                    b.ToTable("Suburbs");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.Season", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Seasons");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.Status", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("StatusType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Status");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.TimeshareWeek", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("AgencyId");
+
+                    b.Property<int?>("AgentId");
+
+                    b.Property<DateTime>("ArrivalDate");
+
+                    b.Property<string>("BankedWith");
+
+                    b.Property<int>("Bedrooms");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("CurrentYearBanked");
+
+                    b.Property<DateTime>("DepartureDate");
+
+                    b.Property<bool>("LeviesPaidInFull");
+
+                    b.Property<double>("LevyAmount");
+
+                    b.Property<int>("MaxSleep");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Module");
+
+                    b.Property<DateTime>("OriginalPurchaseDate");
+
+                    b.Property<double>("OriginalPurchasePrice");
+
+                    b.Property<bool>("OtherResort");
+
+                    b.Property<int>("OwnerId");
+
+                    b.Property<bool>("ReferedByAgent");
+
+                    b.Property<int>("RegionId");
+
+                    b.Property<string>("ResortCode");
+
+                    b.Property<string>("ResortName");
+
+                    b.Property<string>("Season");
+
+                    b.Property<int>("StatusId");
+
+                    b.Property<string>("WeekNumber");
+
+                    b.Property<bool>("WeekPlacedForRental");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AgencyId");
+
+                    b.HasIndex("AgentId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("RegionId");
+
+                    b.HasIndex("StatusId");
+
+                    b.ToTable("Weeks");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Adults");
+
+                    b.Property<int>("Bedrooms");
+
+                    b.Property<int>("Children");
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code")
+                        .IsUnique();
+
+                    b.ToTable("UnitConfigurations");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfigurationType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("UnitConfigurationId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UnitConfigurationId");
+
+                    b.ToTable("UnitConfigurationTypes");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Agency", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AgencyName");
+
+                    b.Property<string>("CompanyRegNumber");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("EAABEFFCNumber");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Agencies");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Agent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("AgencyId");
+
+                    b.Property<string>("CellNumber");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Email");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<string>("Telephone");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AgencyId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Agents");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Individual", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CellNumber");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Email");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<string>("Telephone");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Individuals");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<byte[]>("PasswordHash");
+
+                    b.Property<byte[]>("PasswordSalt");
+
+                    b.Property<string>("Role");
+
+                    b.Property<string>("Token");
+
+                    b.Property<string>("Username");
+
+                    b.Property<bool>("Verified");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.Email", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Communication.SMTPAccount", "Sender")
+                        .WithMany("Emails")
+                        .HasForeignKey("SenderId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPAccount", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Communication.SMTPHost", "SMTPHost")
+                        .WithMany("SMTPAccounts")
+                        .HasForeignKey("SMTPHostId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.Property", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Region.City", "City")
+                        .WithMany()
+                        .HasForeignKey("CityId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Property.PropertyType", "PropertyType")
+                        .WithMany()
+                        .HasForeignKey("PropertyTypeId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Region.Province", "Province")
+                        .WithMany()
+                        .HasForeignKey("ProvinceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Region.Suburb", "Suburb")
+                        .WithMany()
+                        .HasForeignKey("SuburbId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyImage", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Property.Property", "Property")
+                        .WithMany("PropertyImages")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyUserField", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Property.Property", "Property")
+                        .WithMany("PropertyUserFields")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Property.UserDefinedField", "UserDefinedField")
+                        .WithMany()
+                        .HasForeignKey("UserDefinedFieldId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.UserDefinedField", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Property.UserDefinedGroup", "Group")
+                        .WithMany("Fields")
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.City", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Region.Province", "Province")
+                        .WithMany()
+                        .HasForeignKey("ProvinceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.Suburb", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Region.City", "City")
+                        .WithMany()
+                        .HasForeignKey("CityId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.TimeshareWeek", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Users.Agency", "Agency")
+                        .WithMany()
+                        .HasForeignKey("AgencyId");
+
+                    b.HasOne("UnivateProperties_API.Model.Users.Agent", "Agent")
+                        .WithMany()
+                        .HasForeignKey("AgentId");
+
+                    b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Region.Province", "Region")
+                        .WithMany()
+                        .HasForeignKey("RegionId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Timeshare.Status", "Status")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfigurationType", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Timeshare.UnitConfiguration", "UnitConfiguration")
+                        .WithMany("Types")
+                        .HasForeignKey("UnitConfigurationId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Agent", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Users.Agency", "Agency")
+                        .WithMany("Agents")
+                        .HasForeignKey("AgencyId");
+
+                    b.HasOne("UnivateProperties_API.Model.Users.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Individual", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Users.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

UnivateProperties_API/Migrations/20190903062247_initial.cs → UnivateProperties_API/Migrations/20190904110840_Initial.cs

@@ -4,7 +4,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace UnivateProperties_API.Migrations
 {
-    public partial class initial : Migration
+    public partial class Initial : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -160,8 +160,6 @@ namespace UnivateProperties_API.Migrations
                     Created = table.Column<DateTime>(nullable: false),
                     Modified = table.Column<DateTime>(nullable: false),
                     ModifiedBy = table.Column<string>(nullable: true),
-                    Name = table.Column<string>(nullable: true),
-                    Surname = table.Column<string>(nullable: true),
                     Username = table.Column<string>(nullable: true),
                     Role = table.Column<string>(nullable: true),
                     PasswordHash = table.Column<byte[]>(nullable: true),
@@ -434,9 +432,9 @@ namespace UnivateProperties_API.Migrations
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Restrict);
                     table.ForeignKey(
-                        name: "FK_Weeks_Users_OwnerId",
+                        name: "FK_Weeks_Individuals_OwnerId",
                         column: x => x.OwnerId,
-                        principalTable: "Users",
+                        principalTable: "Individuals",
                         principalColumn: "Id",
                         onDelete: ReferentialAction.Cascade);
                     table.ForeignKey(
@@ -681,9 +679,6 @@ namespace UnivateProperties_API.Migrations
             migrationBuilder.DropTable(
                 name: "Emails");
 
-            migrationBuilder.DropTable(
-                name: "Individuals");
-
             migrationBuilder.DropTable(
                 name: "PropertyImages");
 
@@ -714,6 +709,9 @@ namespace UnivateProperties_API.Migrations
             migrationBuilder.DropTable(
                 name: "Agents");
 
+            migrationBuilder.DropTable(
+                name: "Individuals");
+
             migrationBuilder.DropTable(
                 name: "Status");
 

UnivateProperties_API/Migrations/20190903062247_initial.Designer.cs → UnivateProperties_API/Migrations/20190904111234_AgentAsRep.Designer.cs

@@ -10,8 +10,8 @@ using UnivateProperties_API.Context;
 namespace UnivateProperties_API.Migrations
 {
     [DbContext(typeof(DataContext))]
-    [Migration("20190903062247_initial")]
-    partial class initial
+    [Migration("20190904111234_AgentAsRep")]
+    partial class AgentAsRep
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -400,6 +400,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<int?>("AgencyId");
 
+                    b.Property<bool>("AgentAsRep");
+
                     b.Property<int?>("AgentId");
 
                     b.Property<DateTime>("ArrivalDate");
@@ -611,16 +613,12 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("ModifiedBy");
 
-                    b.Property<string>("Name");
-
                     b.Property<byte[]>("PasswordHash");
 
                     b.Property<byte[]>("PasswordSalt");
 
                     b.Property<string>("Role");
 
-                    b.Property<string>("Surname");
-
                     b.Property<string>("Token");
 
                     b.Property<string>("Username");
@@ -726,7 +724,7 @@ namespace UnivateProperties_API.Migrations
                         .WithMany()
                         .HasForeignKey("AgentId");
 
-                    b.HasOne("UnivateProperties_API.Model.Users.User", "Owner")
+                    b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);

UnivateProperties_API/Migrations/20190904111234_AgentAsRep.cs

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

UnivateProperties_API/Migrations/20190905084739_AddedSellPrice.Designer.cs

@@ -0,0 +1,775 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
+using UnivateProperties_API.Context;
+
+namespace UnivateProperties_API.Migrations
+{
+    [DbContext(typeof(DataContext))]
+    [Migration("20190905084739_AddedSellPrice")]
+    partial class AddedSellPrice
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
+                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062")
+                .HasAnnotation("Relational:MaxIdentifierLength", 63);
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.Email", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("BCC");
+
+                    b.Property<string>("Body");
+
+                    b.Property<string>("CC");
+
+                    b.Property<string>("Comment");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsBodyHtml");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("SenderId");
+
+                    b.Property<string>("Subject");
+
+                    b.Property<string>("To");
+
+                    b.Property<string>("ToDisplay");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SenderId");
+
+                    b.ToTable("Emails");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPAccount", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Address");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("DisplayName");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("SMTPHostId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("SMTPHostId");
+
+                    b.ToTable("Accounts");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPHost", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Host");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<bool>("NeedsAuthorize");
+
+                    b.Property<string>("Password");
+
+                    b.Property<bool>("UseSSL");
+
+                    b.Property<string>("User");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Hosts");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.Property", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AddressLine1");
+
+                    b.Property<string>("AddressLine2");
+
+                    b.Property<string>("AddressLine3");
+
+                    b.Property<int>("CityId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("CreatedBy");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsSale");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<decimal>("OperationalCosts");
+
+                    b.Property<decimal>("Price");
+
+                    b.Property<string>("PricePer");
+
+                    b.Property<string>("PropertyName");
+
+                    b.Property<int>("PropertyTypeId");
+
+                    b.Property<int>("ProvinceId");
+
+                    b.Property<bool>("Published");
+
+                    b.Property<string>("ShortDescription");
+
+                    b.Property<int>("SuburbId");
+
+                    b.Property<string>("Unit");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CityId");
+
+                    b.HasIndex("PropertyTypeId");
+
+                    b.HasIndex("ProvinceId");
+
+                    b.HasIndex("SuburbId");
+
+                    b.ToTable("Properties");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyImage", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Image");
+
+                    b.Property<bool>("IsDefault");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("PropertyId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.ToTable("PropertyImages");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("UsageType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("PropertyTypes");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyUserField", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("PropertyId");
+
+                    b.Property<int>("UserDefinedFieldId");
+
+                    b.Property<string>("Value");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("PropertyId");
+
+                    b.HasIndex("UserDefinedFieldId");
+
+                    b.ToTable("PropertyUserFields");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.UserDefinedField", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("FieldName");
+
+                    b.Property<string>("FieldType");
+
+                    b.Property<int>("GroupId");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("Rank");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("GroupId");
+
+                    b.ToTable("UserDefinedFields");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.UserDefinedGroup", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("Rank");
+
+                    b.Property<int>("UsageType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("UserDefinedGroups");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.City", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("ProvinceId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ProvinceId");
+
+                    b.ToTable("Cities");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.Province", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Provinces");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.Suburb", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("CityId");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("PostalCode");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CityId");
+
+                    b.ToTable("Suburbs");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.Season", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Seasons");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.Status", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("StatusType");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Status");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.TimeshareWeek", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("AgencyId");
+
+                    b.Property<bool>("AgentAsRep");
+
+                    b.Property<int?>("AgentId");
+
+                    b.Property<DateTime>("ArrivalDate");
+
+                    b.Property<string>("BankedWith");
+
+                    b.Property<int>("Bedrooms");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("CurrentYearBanked");
+
+                    b.Property<DateTime>("DepartureDate");
+
+                    b.Property<bool>("LeviesPaidInFull");
+
+                    b.Property<double>("LevyAmount");
+
+                    b.Property<int>("MaxSleep");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Module");
+
+                    b.Property<DateTime>("OriginalPurchaseDate");
+
+                    b.Property<double>("OriginalPurchasePrice");
+
+                    b.Property<bool>("OtherResort");
+
+                    b.Property<int>("OwnerId");
+
+                    b.Property<bool>("ReferedByAgent");
+
+                    b.Property<int>("RegionId");
+
+                    b.Property<string>("ResortCode");
+
+                    b.Property<string>("ResortName");
+
+                    b.Property<string>("Season");
+
+                    b.Property<double>("SellPrice");
+
+                    b.Property<int>("StatusId");
+
+                    b.Property<string>("WeekNumber");
+
+                    b.Property<bool>("WeekPlacedForRental");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AgencyId");
+
+                    b.HasIndex("AgentId");
+
+                    b.HasIndex("OwnerId");
+
+                    b.HasIndex("RegionId");
+
+                    b.HasIndex("StatusId");
+
+                    b.ToTable("Weeks");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfiguration", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int>("Adults");
+
+                    b.Property<int>("Bedrooms");
+
+                    b.Property<int>("Children");
+
+                    b.Property<string>("Code");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("Code")
+                        .IsUnique();
+
+                    b.ToTable("UnitConfigurations");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfigurationType", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<int>("UnitConfigurationId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UnitConfigurationId");
+
+                    b.ToTable("UnitConfigurationTypes");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Agency", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("AgencyName");
+
+                    b.Property<string>("CompanyRegNumber");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("EAABEFFCNumber");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Agencies");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Agent", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<int?>("AgencyId");
+
+                    b.Property<string>("CellNumber");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Email");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<string>("Telephone");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("AgencyId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Agents");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Individual", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<string>("CellNumber");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Email");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<string>("Telephone");
+
+                    b.Property<int>("UserId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("Individuals");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.User", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<byte[]>("PasswordHash");
+
+                    b.Property<byte[]>("PasswordSalt");
+
+                    b.Property<string>("Role");
+
+                    b.Property<string>("Token");
+
+                    b.Property<string>("Username");
+
+                    b.Property<bool>("Verified");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Users");
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.Email", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Communication.SMTPAccount", "Sender")
+                        .WithMany("Emails")
+                        .HasForeignKey("SenderId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.SMTPAccount", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Communication.SMTPHost", "SMTPHost")
+                        .WithMany("SMTPAccounts")
+                        .HasForeignKey("SMTPHostId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.Property", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Region.City", "City")
+                        .WithMany()
+                        .HasForeignKey("CityId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Property.PropertyType", "PropertyType")
+                        .WithMany()
+                        .HasForeignKey("PropertyTypeId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Region.Province", "Province")
+                        .WithMany()
+                        .HasForeignKey("ProvinceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Region.Suburb", "Suburb")
+                        .WithMany()
+                        .HasForeignKey("SuburbId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyImage", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Property.Property", "Property")
+                        .WithMany("PropertyImages")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.PropertyUserField", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Property.Property", "Property")
+                        .WithMany("PropertyUserFields")
+                        .HasForeignKey("PropertyId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Property.UserDefinedField", "UserDefinedField")
+                        .WithMany()
+                        .HasForeignKey("UserDefinedFieldId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Property.UserDefinedField", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Property.UserDefinedGroup", "Group")
+                        .WithMany("Fields")
+                        .HasForeignKey("GroupId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.City", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Region.Province", "Province")
+                        .WithMany()
+                        .HasForeignKey("ProvinceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Region.Suburb", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Region.City", "City")
+                        .WithMany()
+                        .HasForeignKey("CityId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.TimeshareWeek", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Users.Agency", "Agency")
+                        .WithMany()
+                        .HasForeignKey("AgencyId");
+
+                    b.HasOne("UnivateProperties_API.Model.Users.Agent", "Agent")
+                        .WithMany()
+                        .HasForeignKey("AgentId");
+
+                    b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
+                        .WithMany()
+                        .HasForeignKey("OwnerId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Region.Province", "Region")
+                        .WithMany()
+                        .HasForeignKey("RegionId")
+                        .OnDelete(DeleteBehavior.Cascade);
+
+                    b.HasOne("UnivateProperties_API.Model.Timeshare.Status", "Status")
+                        .WithMany()
+                        .HasForeignKey("StatusId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Timeshare.UnitConfigurationType", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Timeshare.UnitConfiguration", "UnitConfiguration")
+                        .WithMany("Types")
+                        .HasForeignKey("UnitConfigurationId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Agent", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Users.Agency", "Agency")
+                        .WithMany("Agents")
+                        .HasForeignKey("AgencyId");
+
+                    b.HasOne("UnivateProperties_API.Model.Users.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.Individual", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Users.User", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}

UnivateProperties_API/Migrations/20190905084739_AddedSellPrice.cs

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

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -398,6 +398,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<int?>("AgencyId");
 
+                    b.Property<bool>("AgentAsRep");
+
                     b.Property<int?>("AgentId");
 
                     b.Property<DateTime>("ArrivalDate");
@@ -442,6 +444,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Season");
 
+                    b.Property<double>("SellPrice");
+
                     b.Property<int>("StatusId");
 
                     b.Property<string>("WeekNumber");
@@ -609,16 +613,12 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("ModifiedBy");
 
-                    b.Property<string>("Name");
-
                     b.Property<byte[]>("PasswordHash");
 
                     b.Property<byte[]>("PasswordSalt");
 
                     b.Property<string>("Role");
 
-                    b.Property<string>("Surname");
-
                     b.Property<string>("Token");
 
                     b.Property<string>("Username");
@@ -724,7 +724,7 @@ namespace UnivateProperties_API.Migrations
                         .WithMany()
                         .HasForeignKey("AgentId");
 
-                    b.HasOne("UnivateProperties_API.Model.Users.User", "Owner")
+                    b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
                         .WithMany()
                         .HasForeignKey("OwnerId")
                         .OnDelete(DeleteBehavior.Cascade);

UnivateProperties_API/Model/Bank/Bank.cs

@@ -0,0 +1,8 @@
+namespace UnivateProperties_API.Model.Bank
+{
+    public class Bank : BaseEntity
+    {
+        public string Name { get; set; }
+        public string UniversalBranchCode { get; set; }
+    }
+}

UnivateProperties_API/Model/Bank/BankAccount.cs

@@ -0,0 +1,19 @@
+using UnivateProperties_API.Model.Users;
+
+namespace UnivateProperties_API.Model.Bank
+{
+    public class BankAccount : BaseEntity
+    {
+        #region Properties
+        public string AccountHolder { get; set; }
+        public string AccountNumber { get; set; }
+        public int BankId { get; set; }
+        public int? OwnerId { get; set; }
+        #endregion Properties
+
+        #region Navigation
+        public virtual Bank Bank { get; set; }
+        public virtual Individual Owner { get; set; } 
+        #endregion
+    }
+}

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -16,6 +16,7 @@ namespace UnivateProperties_API.Model.Timeshare
         [ForeignKey("Owner")]
         public int OwnerId { get; set; }
 
+        public bool AgentAsRep { get; set; }
         public bool OtherResort { get; set; }
         public string ResortCode { get; set; }
         public string ResortName { get; set; }
@@ -37,6 +38,8 @@ namespace UnivateProperties_API.Model.Timeshare
         public DateTime OriginalPurchaseDate { get; set; }
         public DateTime ArrivalDate { get; set; }
         public DateTime DepartureDate { get; set; }
+        
+        public double SellPrice { get; set; }
 
         [ForeignKey("Status")]
         public int StatusId { get; set; }
@@ -45,7 +48,7 @@ namespace UnivateProperties_API.Model.Timeshare
         #region Navigation
         public virtual Status Status { get; set; }
         public virtual Province Region { get; set; }
-        public virtual User Owner { get; set; }
+        public virtual Individual Owner { get; set; }
         public virtual Agent Agent { get; set; }
         public virtual Agency Agency { get; set; }
         #endregion Navigation

UnivateProperties_API/Model/Users/Person.cs

@@ -1,7 +1,5 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Model.Users
 {

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.Timeshare;
 using UnivateProperties_API.Repository.Region;
@@ -82,7 +83,17 @@ namespace UnivateProperties_API.Repository.Timeshare
             // Set starting Status of A1
             StatusRepository repo = new StatusRepository(_dbContext);
             item.Status = repo.GetDetailed(s => s.Code == "A1");
-            item.StatusId = item.Status.Id;
+            if(item.Status != null)
+            {
+                //Create initial
+                item.Status = new Status()
+                {
+                    Code = "A1",
+                    Description = "Pending verification",
+                    StatusType = StatusType.Timeshare,
+                    ModifiedBy = "KobusB"
+                };
+            }            
             _dbContext.Add(item);
             Save();
         }
@@ -130,5 +141,33 @@ namespace UnivateProperties_API.Repository.Timeshare
             _dbContext.Entry(item).State = EntityState.Modified;
             Save();
         }
+
+        public List<TimeshareWeek> GetBy(WeekFilterDto week)
+        {
+            List<TimeshareWeek> item = GetDetailedAll();
+            if (!string.IsNullOrEmpty(week.RegionCode))
+            {
+                item = item.Where(x => x.Region != null && x.Region.Code?.ToLower() == week.RegionCode.ToLower()).ToList();
+            }
+            if (!string.IsNullOrEmpty(week.ResortCode))
+            {
+                item = item.Where(x => x.ResortCode?.ToLower() == week.ResortCode).ToList();
+            }
+            if (week.Date != null)
+            {
+                item = item.Where(x =>
+                                        x.ArrivalDate >= week.Date.Value.AddDays(-7)
+                                        && x.DepartureDate <= week.Date.Value.AddDays(7)).ToList();
+            }
+            if (week.MinAmount != null && week.MinAmount != 0)
+            {
+                item = item.Where(x => x.SellPrice >= week.MinAmount).ToList();
+            }
+            if (week.MaxAmount != null && week.MaxAmount != 0)
+            {
+                item.Where(x => x.SellPrice <= week.MaxAmount).ToList();
+            }
+            return item;
+        }
     }
 }

UnivateProperties_API/Startup.cs

@@ -131,6 +131,7 @@ namespace UnivateProperties_API
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env)
         {
+            UpdateDatabase(app);
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
@@ -143,5 +144,18 @@ namespace UnivateProperties_API
             app.UseHttpsRedirection();
             app.UseMvc();
         }
+
+        private static void UpdateDatabase(IApplicationBuilder app)
+        {
+            using (var serviceScope = app.ApplicationServices
+                .GetRequiredService<IServiceScopeFactory>()
+                .CreateScope())
+            {
+                using (var context = serviceScope.ServiceProvider.GetService<DataContext>())
+                {
+                    context.Database.Migrate();
+                }
+            }
+        }
     }
 }

UnivateProperties_API/UnivateProperties_API.csproj

@@ -5,13 +5,6 @@
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Remove="Migrations\**" />
-    <Content Remove="Migrations\**" />
-    <EmbeddedResource Remove="Migrations\**" />
-    <None Remove="Migrations\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Remove="Model\Users\AgencyAgent.cs" />
   </ItemGroup>

UnivateProperties_API/appsettings.json

@@ -9,6 +9,6 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Server=localhost;Port=5432;Database=Univate;User Id=postgres;Password=Prov1s1on;"
+    "DefaultConnection": "Server=192.168.6.188;Port=5432;Database=Univate;User Id=postgres;Password=prov1s1on;"
   }
 }