Fixes to the to sell page.

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedBankDetails.cs

@@ -23,11 +23,13 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             BankId = bankAccount.BankId;
             AccountHolder = bankAccount.AccountHolder;
             AccountNumber = bankAccount.AccountNumber;
+            Bank = bankAccount.Bank;
         }
 
         public int Id { get; set; }
         public int? BankId { get; set; }
         public string AccountHolder { get; set; } = "";
         public string AccountNumber { get; set; } = "";
+        public Bank Bank { get; set; }
     }
 }

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs

@@ -26,7 +26,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
                 Address = individual.Address != null ? new DetailedAddress(individual.Address) : new DetailedAddress();
             }
             else Address = new DetailedAddress();
-            if (BankingDetails != null)
+            if (individual.BankAccount != null)
             {
                 BankingDetails = individual.BankAccount != null ? new DetailedBankDetails(individual.BankAccount) : new DetailedBankDetails();
             }

UnivateProperties_API/Containers/Timeshare/TimeshareWeekDto.cs

@@ -0,0 +1,57 @@
+using JetBrains.Annotations;
+using Org.BouncyCastle.Asn1.Mozilla;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using UnivateProperties_API.Model.Misc;
+using UnivateProperties_API.Model.Timeshare;
+
+namespace UnivateProperties_API.Containers.Timeshare
+{
+    public class TimeshareWeekDto : TimeshareWeek
+    {
+        public OwnerObject OwnerObject { get; set; }
+    }
+
+    public class OwnerObject
+    {
+        public int Id { get; set; }
+        public string Name { get; set; }
+        public string Surname { get; set; }
+        public string IdNumber { get; set; }
+        public string CompanyRegNumber { get; set; }
+        public string MaritalStatus { get; set; }
+        public string EmailAddress { get; set; }
+        public string CellNumber { get; set; }
+        public string LandlineNumber { get; set; }
+        public OwnerAddress Address { get; set; }
+        public OnwerBankingDetails BankingDetails { get; set; }
+    }
+
+    public class OwnerAddress
+    {
+        public int Id { get; set; }
+        public string StreetNumber { get; set; }
+        public string Street { get; set; }
+        public string Suburb { get; set; }
+        public string City { get; set; }
+        public string Province { get; set; }
+        public string PostalCode { get; set; }
+    }
+
+    public class OnwerBankingDetails
+    {
+        public int Id { get; set; }
+        public string AccountNumber { get; set; }
+        public string AccountHolder { get; set; }
+        public OwnerBank Bank { get; set; }
+    }
+
+    public class OwnerBank
+    {
+        public string Name { get; set;  }
+        public string UniversalBranchCode { get; set; }
+        public int Id { get; set; }        
+    }
+}

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
+using System.Linq;
 using System.Transactions;
 using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Model.Timeshare;
@@ -11,9 +12,9 @@ namespace UnivateProperties_API.Controllers.Timeshare
     [ApiController]
     public class TimeshareWeekController : ControllerBase
     {
-        private readonly IRepository<TimeshareWeek> _Repo;
+        private readonly IWeekRepository _Repo;
 
-        public TimeshareWeekController(IRepository<TimeshareWeek> repo)
+        public TimeshareWeekController(IWeekRepository repo)
         {
             _Repo = repo;
         }
@@ -25,6 +26,12 @@ namespace UnivateProperties_API.Controllers.Timeshare
             return new OkObjectResult(items);
         }
 
+        [HttpGet("GetTemplate")]
+        public IActionResult GetTemplate()
+        {
+            return new OkObjectResult(new TimeshareWeekDto());
+        }
+
         [HttpGet("{id}")]
         public IActionResult Get(int id)
         {
@@ -71,15 +78,16 @@ namespace UnivateProperties_API.Controllers.Timeshare
             var item = (_Repo as WeekRepository).GetBy(week);
             return new OkObjectResult(item);
         }
-        
+
         [HttpPost]
-        public IActionResult Post([FromBody] TimeshareWeek item)
+        public IActionResult Post([FromBody] TimeshareWeekDto item)
         {
             using (var scope = new TransactionScope())
             {
-                _Repo.Insert(item);
+                var id = _Repo.SaveNewWeek(item);                
+                var savedItem = _Repo.Get(x => x.Id == id).FirstOrDefault();
                 scope.Complete();
-                return CreatedAtAction(nameof(Get), new { id = item.Id }, item);
+                return new OkObjectResult(savedItem);
             }
         }
 

UnivateProperties_API/Helpers/TenderWeeksHelper.cs

@@ -27,6 +27,26 @@ namespace UnivateProperties_API.Helpers
             else
                 return Code;
         }
+
+        public static string GetResortCode(string Name)
+        {
+            if (UniResorts.Count == 0)
+            {
+                var client = new RestClient("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list/")
+                {
+                    Timeout = -1
+                };
+                var request = new RestRequest(Method.GET);
+                IRestResponse response = client.Execute(request);
+                UniResorts = JsonConvert.DeserializeObject<List<UniPointResorts>>(response.Content);
+            }
+
+            var resort = UniResorts.Find(x => x.ResortName == Name);
+            if (resort != null)
+                return resort.ResortCode;
+            else
+                return "";
+        }
     }
 
     public class UniPointResorts

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Abp.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -21,7 +22,12 @@ using UnivateProperties_API.Repository.Users;
 
 namespace UnivateProperties_API.Repository.Timeshare
 {
-    public class WeekRepository : IRepository<TimeshareWeek>
+    public interface IWeekRepository : IRepository<TimeshareWeek>
+    {
+        int SaveNewWeek(TimeshareWeekDto sellItem);        
+    }
+
+    public class WeekRepository : IWeekRepository
     {
         private readonly DataContext _dbContext;
 
@@ -434,5 +440,116 @@ namespace UnivateProperties_API.Repository.Timeshare
                 Update(week);
             }
         }
+
+        public int SaveNewWeek(TimeshareWeekDto sellItem)
+        {
+            var owner = _dbContext.Individuals.Where(x => x.Id == sellItem.OwnerObject.Id).FirstOrDefault();
+            var address = _dbContext.Addresses.Where(a => a.Id == sellItem.OwnerObject.Address.Id).FirstOrDefault();
+            var banking = _dbContext.BankAccounts.Where(b => b.Id == sellItem.OwnerObject.BankingDetails.Id).FirstOrDefault();
+            var status = _dbContext.Status.Where(s => s.Code == "A1" && s.StatusType == StatusType.Timeshare).FirstOrDefault();
+
+            #region Address
+            if (sellItem.OwnerObject.Address.PostalCode != "")
+            {
+                if (address == null)
+                {
+                    address = new Model.Misc.Address();
+                }
+                address.StreetNumber = sellItem.OwnerObject.Address.StreetNumber;
+                address.Street = sellItem.OwnerObject.Address.Street;
+                address.Suburb = sellItem.OwnerObject.Address.Suburb;
+                address.City = sellItem.OwnerObject.Address.City;
+                address.Province = sellItem.OwnerObject.Address.Province;
+                address.PostalCode = sellItem.OwnerObject.Address.PostalCode;
+
+                if (address.Id == 0)
+                {
+                    _dbContext.Add(address);
+                    Save();
+                }
+                else
+                {
+                    _dbContext.Entry(address).State = EntityState.Modified;
+                    Save();
+                }
+            }
+            #endregion
+
+            #region Banking
+            if (sellItem.OwnerObject.BankingDetails.AccountHolder != "")
+            {
+                if (banking == null)
+                {
+                    banking = new Model.Banks.BankAccount();
+                }
+                banking.AccountHolder = sellItem.OwnerObject.BankingDetails.AccountHolder;
+                banking.AccountNumber = sellItem.OwnerObject.BankingDetails.AccountNumber;
+                banking.BankId = sellItem.OwnerObject.BankingDetails.Bank.Id;
+
+                if (banking.Id == 0)
+                {
+                    _dbContext.Add(banking);
+                    Save();
+                }
+                else
+                {
+                    _dbContext.Entry(banking).State = EntityState.Modified;
+                    Save();
+                }
+            }
+            #endregion
+
+            #region Owner
+            if (owner == null)
+            {
+                owner = new Model.Users.Individual();
+            }
+            if (address != null)
+            {
+                owner.AddressId = address.Id;
+                owner.Address = address;
+            }
+            if (banking != null)
+            {
+                owner.BankAccount = banking;
+                owner.BankAccountId = banking.Id;
+            }
+            owner.Name = sellItem.OwnerObject.Name;
+            owner.Surname = sellItem.OwnerObject.Surname;
+            owner.IdNumber = sellItem.OwnerObject.IdNumber;
+            owner.CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber;
+            owner.MaritalStatus = sellItem.OwnerObject.MaritalStatus;
+            owner.Email = sellItem.OwnerObject.EmailAddress;
+            owner.CellNumber = sellItem.OwnerObject.CellNumber;
+            owner.Telephone = sellItem.OwnerObject.LandlineNumber;
+
+            if (owner.Id == 0)
+            {
+                _dbContext.Add(owner);
+                Save();
+            }
+            else
+            {
+                _dbContext.Entry(owner).State = EntityState.Modified;
+                Save();
+            }
+            #endregion
+
+            var week = new TimeshareWeek();
+            foreach(string prop in week.GetAllProperties())
+            {
+                if (prop != "Item" && prop != "Display")
+                    week[prop] = sellItem[prop];
+            }
+            week.Region = null;
+            week.RegionId = sellItem.Region.Id;
+            week.OwnerId = owner.Id;
+
+            week.StatusId = status.Id;
+            _dbContext.Add(week);
+            Save();
+
+            return week.Id;
+        }
     }
 }

UnivateProperties_API/Repository/Users/IndividualRepository.cs

@@ -61,6 +61,10 @@ namespace UnivateProperties_API.Repository.Users
             var item = _dbContext.Individuals.Include("Address").Include("BankAccount").FirstOrDefault(x => x.UserId == id);
             if(item != null)
             {
+                if (item.BankAccount != null && item.BankAccount.BankId > 0)
+                {
+                    item.BankAccount.Bank = _dbContext.Banks.Where(b => b.Id == item.BankAccount.BankId).FirstOrDefault();
+                }
                 return new DetailedOwner(item);
             }
             else

UnivateProperties_API/Startup.cs

@@ -135,7 +135,7 @@ namespace UnivateProperties_API
             services.AddTransient<IRepository<Season>, SeasonRepository>();
             services.AddTransient<IRepository<UnitConfiguration>, UnitConfigurationRepository>();
             services.AddTransient<IRepository<TimeshareWeek>, WeekRepository>();
-            services.AddTransient<IRepository<TimeshareWeek>, WeekRepository>();
+            services.AddTransient<IWeekRepository, WeekRepository>();
             services.AddTransient<IRepository<Bank>, BankAccountRepository>();
             services.AddTransient<IRepository<BankAccount>, BankAccountRepository>();
             #endregion Timeshare