Update non registered users

UnivateProperties_API/Containers/ProcessFlow/BidItemDisplay.cs

     public class TenderWeek
     {
         public DateTime ArrivalDate { get; set; }
-        public int Bedrooms { get; set; }
+        public string Bedrooms { get; set; }
         public DateTime DepartureDate { get; set; }
         public decimal LevyAmount { get; set; }
         public int MaxSleeps { get; set; }

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedWeekDto.cs

         public string Season { get; set; }
         public string Module { get; set; }
         public string UnitNumber { get; set; }
-        public int Bedrooms { get; set; }
+        public string Bedrooms { get; set; }
         public int MaxSleep { get; set; }
         public string WeekNumber { get; set; }
         public double LevyAmount { get; set; }

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

 using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Helpers;
+using UnivateProperties_API.Migrations;
 using UnivateProperties_API.Model.Timeshare;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Containers.Timeshare
 {
 
         }
 
-        public WeekDto(int id,string line)
+        public WeekDto(int id, string line)
         {
             Id = id;
             List<string> split = line.Split(",").ToList();
                 default:
                     Season = split[8].Trim();
                     break;
-            }            
+            }
             var size = split[3].Trim();
-            if(size.Length == 3 && !size.ToLower().StartsWith('s'))
+            if (size.Length == 3 && !size.ToLower().StartsWith('s'))
             {
                 int.TryParse(size.Substring(0, 1), out int temp);
-                Bedrooms = temp;
+                Bedrooms = temp.ToString();
                 int.TryParse(size.Substring(2, 1), out temp);
                 MaxSleep = temp;
             }
             if (double.TryParse(amt, out double dAmt))
                 LevyAmount = dAmt;
             DateTime tempDate = MyCommon.GetDateFromString(currentYear ? split[6].Trim() : split[13].Trim());
-            if(tempDate != DateTime.MinValue)
+            if (tempDate != DateTime.MinValue)
             {
                 ArrivalDate = tempDate;
             }
             tempDate = MyCommon.GetDateFromString(currentYear ? split[7].Trim() : split[14].Trim());
-            if(tempDate != DateTime.MinValue)
+            if (tempDate != DateTime.MinValue)
             {
                 DepartureDate = tempDate;
             }
             Resort = new ResortDto(week.ResortCode, week.ResortName);
             Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Code, week.Region?.Description);
             Season = week.Season;
-            if(week.Status != null)
+            if (week.Status != null)
             {
                 Status = new StatusDto(week.Status.Id, week.Status.Code, week.Status.Description);
-            }            
+            }
             Bedrooms = week.Bedrooms;
             MaxSleep = week.MaxSleep;
             UnitNumber = week.UnitNumber;
             WeekNumber = week.WeekNumber;
+            Module = week.Module;
             LevyAmount = week.LevyAmount;
             CurrentYearBanked = week.CurrentYearBanked;
             ArrivalDate = week.ArrivalDate;
             WeekStatus = week.WeekStatus;
             Publish = week.Publish;
             PulbishedDate = week.PulbishedDate;
+            CustomOwner = week.CustomOwner;
         }
 
         public int Id { get; set; }
         public int? UserId { get; set; }
         public bool AgentAsRep { get; set; }
         public bool OtherResort { get; set; }
-        public int Bedrooms { get; set; }
+        public string Bedrooms { get; set; }
         public int MaxSleep { get; set; }
         public double LevyAmount { get; set; }
+        public string Module { get; set; }
         public bool CurrentYearBanked { get; set; }
         public string BankedWith { get; set; }
         public DateTime ArrivalDate { get; set; }
         public string WeekStatus { get; set; }
         public bool Publish { get; set; }
         public DateTime PulbishedDate { get; set; }
-    }    
+        public bool CustomOwner {get; set;}
+    }
 }

UnivateProperties_API/Context/DataContext.cs

         public virtual DbSet<Individual> Individuals { get; set; }
         public virtual DbSet<Address> Addresses { get; set; }
         public virtual DbSet<UserRole> Roles { get; set; }
+        public virtual DbSet<NonRegIndividual> NonRegIndividuals { get; set; }
         #endregion User
 
         #region Communication

UnivateProperties_API/Controllers/Users/NonRegIndividualController.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using UnivateProperties_API.Model.Users;
+using UnivateProperties_API.Repository;
+
+namespace UnivateProperties_API.Controllers.Users
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class NonRegIndividualController : ControllerBase
+    {
+        private readonly IRepository<NonRegIndividual> _Repo;
+
+        public NonRegIndividualController(IRepository<NonRegIndividual> rp)
+        {
+            _Repo = rp;
+        }
+
+        [HttpGet]
+        public IActionResult Get()
+        {
+            var roles = _Repo.GetAll();
+            return new OkObjectResult(roles);
+        }
+
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(_Repo.Get(x => x.WeekId == id));
+        }
+
+       
+    }
+}

UnivateProperties_API/Helpers/Communication/EmailCodedFieldsPopulator.cs

             htmlBody = htmlBody.Replace("[AgentAsRep]", sellItem.AgentAsRep.ToString());
             htmlBody = htmlBody.Replace("[OtherResort]", sellItem.OtherResort.ToString());
             htmlBody = htmlBody.Replace("[OtherResortName]", sellItem.OtherResortName != null ? sellItem.OtherResortName.ToString() : "");
-            htmlBody = htmlBody.Replace("[ResortCode]", sellItem.ResortCode.ToString());
-            htmlBody = htmlBody.Replace("[ResortName]", sellItem.ResortName.ToString());
+            htmlBody = htmlBody.Replace("[ResortCode]", sellItem.ResortCode != null ? sellItem.ResortCode.ToString() : "");
+            htmlBody = htmlBody.Replace("[ResortName]", sellItem.ResortName == null ? sellItem.OtherResortName.ToString() : "");
             htmlBody = htmlBody.Replace("[RegionId]", sellItem.RegionId.ToString());
             htmlBody = htmlBody.Replace("[Season]", sellItem.Season.ToString());
             htmlBody = htmlBody.Replace("[Module]", sellItem.Module.ToString());

UnivateProperties_API/Migrations/20201117073109_customOwnerCheck.cs

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

UnivateProperties_API/Migrations/20201117074922_nonRegIndiv.cs

+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class nonRegIndiv : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "NonRegIndividuals",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Name = table.Column<string>(nullable: true),
+                    Surname = table.Column<string>(nullable: true),
+                    IDNumber = table.Column<string>(nullable: true),
+                    CompanyRegNumber = table.Column<string>(nullable: true),
+                    EmailAddress = table.Column<string>(nullable: true),
+                    CellNumber = table.Column<string>(nullable: true),
+                    TelephoneNumber = table.Column<string>(nullable: true),
+                    WeekId = table.Column<int>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_NonRegIndividuals", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "NonRegIndividuals");
+        }
+    }
+}

UnivateProperties_API/Migrations/20201117083414_nonRegUserUpdate.cs

+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class nonRegUserUpdate : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "Created",
+                table: "NonRegIndividuals",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<bool>(
+                name: "IsDeleted",
+                table: "NonRegIndividuals",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "Modified",
+                table: "NonRegIndividuals",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "ModifiedBy",
+                table: "NonRegIndividuals",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Created",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "IsDeleted",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "Modified",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "ModifiedBy",
+                table: "NonRegIndividuals");
+        }
+    }
+}

UnivateProperties_API/Migrations/20201117095903_UpdatedBedrooms.cs

+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class UpdatedBedrooms : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "Bedrooms",
+                table: "Weeks",
+                nullable: true,
+                oldClrType: typeof(int));
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<int>(
+                name: "Bedrooms",
+                table: "Weeks",
+                nullable: false,
+                oldClrType: typeof(string),
+                oldNullable: true);
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

 
                     b.Property<string>("BankedWith");
 
-                    b.Property<int>("Bedrooms");
+                    b.Property<string>("Bedrooms");
 
                     b.Property<DateTime>("Created");
 
                     b.Property<bool>("CurrentYearBanked");
 
+                    b.Property<bool>("CustomOwner");
+
                     b.Property<DateTime>("DateMandated");
 
                     b.Property<DateTime>("DepartureDate");
                     b.ToTable("Individuals");
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Users.NonRegIndividual", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("CellNumber");
+
+                    b.Property<string>("CompanyRegNumber");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("EmailAddress");
+
+                    b.Property<string>("IDNumber");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Surname");
+
+                    b.Property<string>("TelephoneNumber");
+
+                    b.Property<int?>("WeekId");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("NonRegIndividuals");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Users.Person", b =>
                 {
                     b.Property<int>("Id")

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

         {
         }
 
-        public TimeshareWeek(bool referedByAgent, int? agentId, int? agencyId, int ownerId, bool agentAsRep, bool otherResort, string otherResortName, string resortCode, string resortName, int regionId, string season, string module, int bedrooms, int maxSleep, string unitNumber, string weekNumber, double levyAmount, bool currentYearBanked, string bankedWith, bool leviesPaidInFull, bool weekPlacedForRental, double originalPurchasePrice, DateTime originalPurchaseDate, DateTime arrivalDate, DateTime departureDate, double sellPrice, double askingPrice, double agentCommision, bool mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows, string weekStatus, DateTime datePublished, bool published, string displayOwner)
+        public TimeshareWeek(bool referedByAgent, int? agentId, int? agencyId, int ownerId, bool agentAsRep, bool otherResort, string otherResortName, string resortCode, string resortName, int regionId, string season, string module, string bedrooms, int maxSleep, string unitNumber, string weekNumber, double levyAmount, bool currentYearBanked, string bankedWith, bool leviesPaidInFull, bool weekPlacedForRental, double originalPurchasePrice, DateTime originalPurchaseDate, DateTime arrivalDate, DateTime departureDate, double sellPrice, double askingPrice, double agentCommision, bool mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows, string weekStatus, DateTime datePublished, bool published, string displayOwner, bool customOwner)
         {
             ReferedByAgent = referedByAgent;
             AgentId = agentId;
             Publish = published;
             PulbishedDate = datePublished;
             DisplayOwner = displayOwner;
+            CustomOwner = customOwner;
         }
 
         #region Properties
         public int? AgencyId { get; set; }
         [ForeignKey("Owner")]
         public int OwnerId { get; set; }
+        public bool CustomOwner { get; set; }
 
         public bool AgentAsRep { get; set; }
         public bool OtherResort { get; set; }
         public int RegionId { get; set; }
         public string Season { get; set; }
         public string Module { get; set; }
-        public int Bedrooms { get; set; }
+        public string Bedrooms { get; set; }
         public int MaxSleep { get; set; }
         public string UnitNumber { get; set; }
         public string WeekNumber { get; set; }

UnivateProperties_API/Model/Users/NonRegIndividual.cs

+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace UnivateProperties_API.Model.Users
+{
+    public class NonRegIndividual : BaseEntity
+    {
+        public string Name { get; set; }
+        public string Surname { get; set; }
+        public string IDNumber { get; set; }
+        public string CompanyRegNumber { get; set; }
+        [DataType(DataType.EmailAddress)]
+        public string EmailAddress { get; set; }
+        [Phone]
+        public string CellNumber { get; set; }
+        [Phone]
+        public string TelephoneNumber { get; set; }
+
+        [ForeignKey("TimeshareWeek")]
+        public int? WeekId { get; set; }
+    }
+}

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

                 if (item.TimeshareId > 0)
                 {
                     var timeshare = dBContext.Weeks.Where(t => t.Id == item.TimeshareId).FirstOrDefault();
-                    carItem.Bedrooms = timeshare.Bedrooms;
+                    //carItem.Bedrooms = timeshare.Bedrooms;
                     carItem.Sleeps = timeshare.MaxSleep;
                     carItem.Arrival = timeshare.ArrivalDate;
                     carItem.Departure = timeshare.DepartureDate;
                 if (item.TimeshareId > 0)
                 {
                     var timeshare = dBContext.Weeks.Where(t => t.Id == item.TimeshareId).FirstOrDefault();
-                    item.Bedrooms = timeshare.Bedrooms;
+                    //item.Bedrooms = timeshare.Bedrooms;
                     item.Sleeps = timeshare.MaxSleep;
                     item.Arrival = timeshare.ArrivalDate;
                     item.Departure = timeshare.DepartureDate;

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

 using Abp.Domain.Entities;
 using Abp.Extensions;
+using Microsoft.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Model.Region;
 using UnivateProperties_API.Model.Timeshare;
+using UnivateProperties_API.Model.Users;
 using UnivateProperties_API.Repository.Communication;
 using UnivateProperties_API.Repository.Region;
 using UnivateProperties_API.Repository.Users;
                 saved.OwnerId = item.OwnerId;
             }
 
-            if (saved.DisplayOwner != item.Owner.Name + " " + item.Owner.Surname)
+            
+
+            if (saved.CustomOwner != item.CustomOwner)
+            {
+                saved.CustomOwner = item.CustomOwner;
+            }
+
+            if (item.CustomOwner)
+            {
+                var customOwner = _dbContext.NonRegIndividuals.Where(x => x.WeekId == item.Id).FirstOrDefault();
+
+                if (customOwner != null)
+                {
+                    if (item.Owner.Name != customOwner.Name)
+                    {
+                        customOwner.Name = item.Owner.Name;
+                    }
+
+                    if (item.Owner.Surname != customOwner.Surname)
+                    {
+                        customOwner.Surname = item.Owner.Surname;
+                    }
+
+                    if (item.Owner.IdNumber != customOwner.IDNumber)
+                    {
+                        customOwner.IDNumber = item.Owner.IdNumber;
+                    }
+
+                    if (item.Owner.CompanyRegNumber != customOwner.CompanyRegNumber)
+                    {
+                        customOwner.CompanyRegNumber = item.Owner.CompanyRegNumber;
+                    }
+
+                    if (item.Owner.Email != customOwner.EmailAddress)
+                    {
+                        customOwner.EmailAddress = item.Owner.Email;
+                    }
+
+                    if (item.Owner.CellNumber != customOwner.CellNumber)
+                    {
+                        customOwner.CellNumber = item.Owner.CellNumber;
+                    }
+
+                    if (item.Owner.Telephone != customOwner.TelephoneNumber)
+                    {
+                        customOwner.TelephoneNumber = item.Owner.Telephone;
+                    }
+                    saved.DisplayOwner = item.Owner.Name + " " + item.Owner.Surname;
+                    _dbContext.NonRegIndividuals.Update(customOwner);
+                    _dbContext.SaveChanges();
+                }
+                else
+                {
+                    var nonRegUserObj = new NonRegIndividual
+                    {
+                        Name = item.Owner.Name,
+                        Surname = item.Owner.Surname,
+                        IDNumber = item.Owner.IdNumber,
+                        CompanyRegNumber = item.Owner.CompanyRegNumber,
+                        EmailAddress = item.Owner.Email,
+                        CellNumber = item.Owner.CellNumber,
+                        TelephoneNumber = item.Owner.Telephone,
+                        WeekId = item.Id
+                    };
+                    _dbContext.NonRegIndividuals.Add(nonRegUserObj);
+                    _dbContext.SaveChanges();
+
+                    
+                    saved.DisplayOwner = item.Owner.Name + " " + item.Owner.Surname;
+                }
+                
+            }
+            else 
             {
-                saved.DisplayOwner = item.Owner.Name + " " + item.Owner.Surname;
+                if (saved.DisplayOwner != item.Owner.Name + " " + item.Owner.Surname)
+                {
+                    saved.DisplayOwner = item.Owner.Name + " " + item.Owner.Surname;
+                }
             }
 
             /*var owner = _dbContext.Individuals.Where(x => x.Id == item.OwnerId).FirstOrDefault();

UnivateProperties_API/Repository/Users/NonRegIndividual.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnivateProperties_API.Context;
+using UnivateProperties_API.Model.Users;
+
+namespace UnivateProperties_API.Repository.Users
+{
+    public class NonRegIndividualRepo : IRepository<NonRegIndividual>
+    {
+        private readonly DataContext _dbContext;
+
+        public NonRegIndividualRepo(DataContext db)
+        {
+            _dbContext = db;
+        }
+
+        public List<NonRegIndividual> GetAll()
+        {
+            return _dbContext.NonRegIndividuals.ToList();
+        }
+
+        public List<NonRegIndividual> Get(Func<NonRegIndividual, bool> where)
+        {
+            return _dbContext.NonRegIndividuals.Where(where).ToList();
+        }
+
+        public NonRegIndividual GetDetailed(Func<NonRegIndividual, bool> first)
+        {
+            return null;
+        }
+
+        public List<NonRegIndividual> GetDetailedAll()
+        {
+            return null;
+        }
+
+        public void Insert(NonRegIndividual item)
+        { 
+        }
+
+        public void Insert(IEnumerable<NonRegIndividual> items)
+        { 
+        }
+
+        public void Remove(NonRegIndividual item)
+        { 
+        }
+
+        public void Remove(IEnumerable<NonRegIndividual> items)
+        { 
+        }
+
+        public void RemoveAtId(int item)
+        { 
+        }
+
+        public void Update(NonRegIndividual item)
+        {
+        
+        }
+        //int NewId();
+        public void Save() 
+        {
+        }
+    }
+}

UnivateProperties_API/Startup.cs

             services.AddTransient<IRepository<Agency>, AgencyRepository>();
             services.AddTransient<IUserRepository, UserRepository>();
             services.AddTransient<IRepository<Individual>, IndividualRepository>();
+            services.AddTransient<IRepository<NonRegIndividual>, NonRegIndividualRepo>();
             #endregion User
             #region Communication
             services.AddTransient<IRepository<Template>, TemplateRepository>();