Property Coords

UnivateProperties_API/Containers/ProcessFlow/BidItemDisplay.cs

@@ -28,5 +28,37 @@ namespace UnivateProperties_API.Containers.ProcessFlow
     public class BidItemNew : BidItem
     {
         public int UserId { get; set; }
+
+        public TenderWeek TenderWeek { get; set; }
+    }
+
+    public class TenderWeek
+    {
+        public DateTime ArrivalDate { get; set; }
+        public int Bedrooms { get; set; }
+        public DateTime DepartureDate { get; set; }
+        public decimal LevyAmount { get; set; }
+        public int MaxSleeps { get; set; }
+        public string Season { get; set; }
+        public decimal SellingPrice { get; set; }
+        public string UnitNumber { get; set; }
+        public string WeekNumber { get; set; }
+
+        public TenderResort Resort { get; set; }
+
+        public TenderRegion Region { get; set; }
+    }
+
+    public class TenderResort
+    {        
+        public string ResortCode { get; set; }    
+        public string ResortName { get; set; }
+    }
+
+    public class TenderRegion 
+    { 
+        public int Id { get; set; }
+        public string RegionCode { get; set; }
+        public string RegionName { get; set; }
     }
 }

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/Containers/Timeshare/WeekDto.cs

@@ -18,7 +18,7 @@ namespace UnivateProperties_API.Containers.Timeshare
             Id = id;
             List<string> split = line.Split(",").ToList();
             AgentAsRep = false;
-            Resort = new ResortDto(split[0].Trim(), split[0].Trim());
+            Resort = new ResortDto(split[0].Trim(), TenderWeeksHelper.GetResortName(split[0].Trim()));
             UnitNumber = split[1].Trim();
             WeekNumber = split[2].Trim();
             switch (split[8].Trim())
@@ -128,6 +128,6 @@ namespace UnivateProperties_API.Containers.Timeshare
         public bool ReferedByAgent { get; set; }
 
         public string Display => $"{Resort.Display}  ({ArrivalDate.ToShortDateString()} - {DepartureDate.ToShortDateString()})";
-        public string WeekUni => $"{Resort.ResortCode} - {WeekNumber} - {UnitNumber}";
-    }
+        public string WeekUni => $"{Resort.ResortCode}-{UnitNumber}-{WeekNumber}";
+    }    
 }

UnivateProperties_API/Controllers/Communication/MailController.cs

@@ -29,7 +29,9 @@ namespace UnivateProperties_API.Controllers.Communication
                     case 0:
                         _repo.ContactUs(mm);
                         break;
-
+                    case 1:
+                        _repo.EnquireNow(mm);
+                        break;
                 }
                 return new OkResult();
             }
@@ -37,7 +39,6 @@ namespace UnivateProperties_API.Controllers.Communication
             {
                 return new BadRequestResult();
             }
-
         }
     }
 }

UnivateProperties_API/Controllers/ProcessFlow/BidController.cs

@@ -28,7 +28,7 @@ namespace UnivateProperties_API.Controllers.ProcessFlow
         [HttpGet("{id}")]
         public IActionResult Get(int id)
         {
-            var item = _Repo.Get(x => x.Id == id);
+            var item = _Repo.GetDetailed(x => x.Id == id);
             return new OkObjectResult(item);
         }
 
@@ -46,6 +46,12 @@ namespace UnivateProperties_API.Controllers.ProcessFlow
             return new OkObjectResult(item);
         }
 
+        [HttpGet("GetNewBidTemplate")]
+        public IActionResult GetNewBidTemplate()
+        {
+            return new OkObjectResult(_Repo.NewBidTemplate());
+        }
+
         [HttpPost]
         public IActionResult Post([FromBody] BidItemNew item)
         {

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

@@ -0,0 +1,60 @@
+using Newtonsoft.Json;
+using RestSharp;
+using System.Collections.Generic;
+
+namespace UnivateProperties_API.Helpers
+{
+    public static class TenderWeeksHelper
+    {
+        public static List<UniPointResorts> UniResorts = new List<UniPointResorts>();
+
+        public static string GetResortName(string Code)
+        {
+            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.ResortCode == Code);
+            if (resort != null)
+                return resort.ResortName;
+            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
+    {
+        public string ResortName { get; set; }
+        public string ResortCode { get; set; }
+        public string Town { get; set; }
+        public string City { get; set; }
+        public int Id { get; set; }
+    }
+}

UnivateProperties_API/Repository/Communication/MailRepository.cs

@@ -7,6 +7,7 @@ namespace UnivateProperties_API.Repository.Communication
     public interface IMailRepository
     {
         void ContactUs(MailModel mm);
+        void EnquireNow(MailModel mm);
     }
 
     public class MailRepository : IMailRepository
@@ -56,6 +57,41 @@ namespace UnivateProperties_API.Repository.Communication
             client.Dispose();
         }
 
+        public void EnquireNow(MailModel mm)
+        {
+            string phone = mm.Phone;
+            string name = mm.Name;
+            string email = mm.Email;
+            string message = mm.Message;
+
+            from = new MailboxAddress("Admin", mm.FromAddress);
+
+            to = new MailboxAddress("User", mm.ToAddress);
+
+            messageObj.From.Add(from);
+            messageObj.To.Add(to);
 
+            messageObj.Subject = "Uni-Vate - Enquiry to view property";
+
+            bodyBuilder.HtmlBody = "<div style=\"margin: 5px\">" +
+                "<h4>Contact from: " + name + "!</h4>" +
+                "<h4>Email: " + email + "</h4>" +
+                "<h4>Phone: " + phone + "</h4>" +
+                "<div>" +
+                "<h4>Message: </h4>" +
+                "<p>" + message + "</p>" +
+                "</div>" +
+                "</div>" +
+                "</div>";
+
+            messageObj.Body = bodyBuilder.ToMessageBody();
+
+            client.Connect("smtp.gmail.com", 465, true);
+            client.Authenticate("jlouw365@gmail.com", "setskohatxpsceqo");
+
+            client.Send(messageObj);
+            client.Disconnect(true);
+            client.Dispose();
+        }
     }
 }

UnivateProperties_API/Repository/ProccessFlow/BidRepository.cs

@@ -34,6 +34,12 @@ namespace UnivateProperties_API.Repository.ProccessFlow
         public BidItem GetDetailed(Func<BidItem, bool> first)
         {
             var item = _dbContext.BidItems.FirstOrDefault(first);
+
+            if (item == null)
+            {
+                item = new BidItem();
+            }
+
             return item;
         }
 
@@ -185,8 +191,49 @@ namespace UnivateProperties_API.Repository.ProccessFlow
         }
 
         public void InsertNew(BidItemNew item)
-        {            
+        {
+            var status = _dbContext.Status.Where(x => x.Code == "E1").FirstOrDefault();
             var week = _dbContext.Weeks.Include("Owner").Where(x => x.Id == item.TimeshareWeekId).FirstOrDefault();
+
+            if (item.TenderWeek != null)
+            {
+                //owner is set to UniVate2018 user - will need to check who the owner of a tender week will be. 
+                var owner = _dbContext.Individuals.Where(o => o.UserId == 14).FirstOrDefault();
+                var region = _dbContext.Provinces.Where(p => p.Id == item.TenderWeek.Region.Id).FirstOrDefault();
+
+                week = new Model.Timeshare.TimeshareWeek();
+                week.Owner = owner;
+                week.OwnerId = owner.Id;
+                week.ResortCode = item.TenderWeek.Resort.ResortCode;
+                week.ResortName = item.TenderWeek.Resort.ResortName;
+                week.Region = region;
+                week.RegionId = region.Id;
+                week.Module = item.TenderWeek.WeekNumber;
+                week.Season = item.TenderWeek.Season;
+                week.Bedrooms = item.TenderWeek.Bedrooms;
+                week.MaxSleep = item.TenderWeek.MaxSleeps;
+                week.UnitNumber = item.TenderWeek.UnitNumber;
+                week.WeekNumber = item.TenderWeek.WeekNumber;
+                week.LevyAmount = (double)item.TenderWeek.LevyAmount;
+                week.CurrentYearBanked = false;
+                week.BankedWith = "";
+                week.LeviesPaidInFull = false;
+                week.WeekPlacedForRental = false;
+                week.OriginalPurchasePrice = (double)item.TenderWeek.SellingPrice;
+                week.OriginalPurchaseDate = DateTime.Now;
+                week.ArrivalDate = item.TenderWeek.ArrivalDate;
+                week.DepartureDate = item.TenderWeek.DepartureDate;
+                week.SellPrice = (double)item.TenderWeek.SellingPrice;
+                week.AgentCommision = 0;                
+                week.Status = status;
+                week.StatusId = status.Id;
+
+                _dbContext.Weeks.Add(week);
+                Save();
+
+                item.TimeshareWeek = week;
+            }
+
             var property = _dbContext.Properties.Include("Owner").Where(x => x.Id == item.PropertyId).FirstOrDefault();
             BidItem bid = new BidItem();            
 
@@ -196,7 +243,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                     bid[prop] = item[prop];
             }            
 
-            var status = _dbContext.Status.Where(x => x.Code == "E1").FirstOrDefault();
+           
             if (status != null)            
                 bid.StatusId = status.Id;
 
@@ -273,7 +320,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
                 Save();
             }
             item.Id = bid.Id;
-        }
+        }     
 
         public void Insert(IEnumerable<BidItem> items)
         {
@@ -447,6 +494,11 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             bid.Date = item.Created;
 
             return bid;
-        }        
+        }
+
+        public BidItemNew NewBidTemplate()
+        {
+            return new BidItemNew();
+        }
     }
 }

UnivateProperties_API/Repository/ProccessFlow/IBidRepository.cs

@@ -14,6 +14,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
         List<BidItemDisplay> GetMyBid(Func<BidItem, bool> where);
         BidItemDisplay AcceptBid(int id);
         BidItemDisplay DecineBid(BitItemDecline item);
+        BidItemNew NewBidTemplate();
         void InsertNew(BidItemNew item);
         BidItemDisplay GetDispaly(int id);
     }

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;
 
@@ -64,9 +70,13 @@ namespace UnivateProperties_API.Repository.Timeshare
             {
                 list.Add(new WeekDto(item));
             }
+
+            var listIds = list.Select(x => x.WeekUni).ToList();
+
             foreach (var  item in GetTenderWeeks())
             {
-                list.Add(item);
+                if (!listIds.Contains(item.WeekUni))
+                    list.Add(item);
             }
             return list;
         }
@@ -430,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