Carine & Delia Feedback

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedWeekDto.cs

@@ -1,4 +1,5 @@
-using System;
+using Abp.Extensions;
+using System;
 using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Containers.Timeshare.Detailed
@@ -38,6 +39,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             ArrivalDate = week.ArrivalDate.ToShortDateString().Replace('/', '-');
             DepartureDate = week.DepartureDate.ToShortDateString().Replace('/', '-');
             SellPrice = week.SellPrice;
+            AskingPrice = week.AskingPrice;
             AgentCommission = week.AgentCommision;
             Mandate = week.Mandate;
             Status = week.Status.Display;
@@ -74,6 +76,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
         public string ArrivalDate { get; set; }
         public string DepartureDate { get; set; }
         public double SellPrice { get; set; }
+        public double AskingPrice { get; set; }
         public double AgentCommission { get; set; }
         public bool Mandate { get; set; }
         public string Status { get; set; }

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -60,7 +60,9 @@ namespace UnivateProperties_API.Containers.Timeshare
                 MaxSleep = temp;
             }
             bool currentYear = split[9].Trim() == "Y";
-            LevyAmount = Convert.ToDouble(split[5].Trim());
+            string amt = split[5].Trim();
+            amt = amt.Replace('.', ',');
+            LevyAmount = Convert.ToDouble(amt);
             DateTime tempDate = MyCommon.GetDateFromString(currentYear ? split[6].Trim() : split[13].Trim());
             if(tempDate != DateTime.MinValue)
             {

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -50,6 +50,17 @@ namespace UnivateProperties_API.Controllers.Timeshare
             else return new OkResult();
         }
 
+        [HttpGet("getByResortCode/{resortCode}")]
+        public IActionResult GetAvailResort(string resortCode)
+        {
+            if (_Repo is WeekRepository)
+            {
+                var item = (_Repo as WeekRepository).GetAllByResortCode(resortCode);
+                return new OkObjectResult(item);
+            }
+            else return new OkResult();
+        }
+
         [HttpGet("getMyWeek/{id}")]
         public IActionResult GetMyWeek(int id)
         {

UnivateProperties_API/Repository/Timeshare/IResortRepository.cs

@@ -184,8 +184,8 @@ namespace UnivateProperties_API.Repository.Timeshare
             if (data.Images == null || data.Images.Count == 0)
             {
                 data.Images = new List<string>();
-                int count = 1; 
-                while( count < 5)
+                int count = 1;
+                while (count < 5)
                 {
                     client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/image/{1}", resortCode, count))
                     {
@@ -198,7 +198,7 @@ namespace UnivateProperties_API.Repository.Timeshare
                     count++;
                 }
             }
-            #endregion
+#endregion
 
             #region Get Description
             data.Description = GetResortDescription(resortCode);            

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -1,4 +1,5 @@
 using Abp.Domain.Entities;
+using Abp.Extensions;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -25,7 +26,8 @@ namespace UnivateProperties_API.Repository.Timeshare
 {
     public interface IWeekRepository : IRepository<TimeshareWeek>
     {
-        int SaveNewWeek(TimeshareWeekDto sellItem);        
+        int SaveNewWeek(TimeshareWeekDto sellItem);
+        List<WeekDto> GetAllByResortCode(string resortCode);
     }
 
     public class WeekRepository : IWeekRepository
@@ -64,6 +66,40 @@ namespace UnivateProperties_API.Repository.Timeshare
             return null;
         }
 
+        public List<WeekDto> GetAllByResortCode(string resortCode) 
+        {
+            List<WeekDto> list = new List<WeekDto>();
+            foreach (var item in GetDetailedByResortCode(resortCode))
+            {
+                list.Add(new WeekDto(item));
+            }
+
+            var listIds = list.Select(x => x.WeekUni).ToList();
+
+            foreach (var item in GetTenderWeeksByResortCode(resortCode))
+            {
+                if (!listIds.Contains(item.WeekUni))
+                    list.Add(item);
+            }
+            return list;
+        }
+
+        private List<TimeshareWeek> GetDetailedByResortCode(string resortCode)
+        {
+            var list = GetAllUsingResortCode(resortCode);
+            List<TimeshareWeek> weeklist = new List<TimeshareWeek>();
+            foreach (var item in list)
+            {
+                weeklist.Add(GetDetailedWeek(item));
+            }
+            return weeklist;
+        }
+
+        private List<TimeshareWeek> GetAllUsingResortCode(string resortCode)
+        {
+            return _dbContext.Weeks.Where(x => x.ResortCode == resortCode).ToList();
+        }
+
         public List<WeekDto> GetDtoListAll()
         {
             List<WeekDto> list = new List<WeekDto>();
@@ -291,6 +327,100 @@ namespace UnivateProperties_API.Repository.Timeshare
         public void Update(TimeshareWeek item)
         {
             var saved = _dbContext.Weeks.Where(w => w.Id == item.Id).FirstOrDefault();
+            
+            if (saved.RegionId != item.RegionId)
+            {
+                saved.RegionId = item.RegionId;
+            }
+            if (saved.ResortCode != item.ResortCode)
+            {
+                saved.ResortCode = item.ResortCode;
+            }
+            if (saved.UnitNumber != item.UnitNumber)
+            {
+                saved.UnitNumber = item.UnitNumber;
+            }
+            if (saved.Module != item.Module)
+            {
+                saved.Module = item.Module;
+            }
+            if (saved.Season != item.Season)
+            {
+                saved.Season = item.Season;
+            }
+            if (saved.Bedrooms != item.Bedrooms)
+            {
+                saved.Bedrooms = item.Bedrooms;
+            }
+            if (saved.MaxSleep != item.MaxSleep)
+            {
+                saved.MaxSleep = item.MaxSleep;
+            }
+            if (saved.LevyAmount != item.LevyAmount)
+            {
+                saved.LevyAmount = item.LevyAmount;
+            }
+            if (saved.WeekType != item.WeekType)
+            {
+                saved.WeekType = item.WeekType;
+            }
+            if (saved.ArrivalDate != item.ArrivalDate)
+            {
+                saved.ArrivalDate = item.ArrivalDate;
+            }
+            if (saved.DepartureDate != item.DepartureDate)
+            {
+                saved.DepartureDate = item.DepartureDate;
+            }
+            if (saved.AskingPrice != item.AskingPrice)
+            {
+                saved.AskingPrice = item.AskingPrice;
+            }
+            if (saved.SellPrice != item.SellPrice)
+            {
+                saved.SellPrice = item.SellPrice;
+            }
+            if (saved.CurrentYearBanked != item.CurrentYearBanked)
+            {
+                saved.CurrentYearBanked = item.CurrentYearBanked;
+            }
+            if (saved.BankedWith != item.BankedWith)
+            {
+                saved.BankedWith = item.BankedWith;
+            }
+
+            var owner = _dbContext.Individuals.Where(x => x.Id == item.Owner.Id).FirstOrDefault();
+
+            if (owner.Name != item.Owner.Name)
+            {
+                owner.Name = item.Owner.Name;
+            }
+            if (owner.Surname != item.Owner.Surname)
+            {
+                owner.Surname = item.Owner.Surname;
+            }
+            if (owner.IdNumber != item.Owner.IdNumber)
+            {
+                owner.IdNumber = item.Owner.IdNumber;
+            }
+            if (owner.CompanyRegNumber != item.Owner.CompanyRegNumber)
+            {
+                owner.CompanyRegNumber = item.Owner.CompanyRegNumber;
+            }
+            if (owner.Email != item.Owner.Email)
+            {
+                owner.Email = item.Owner.Email;
+            }
+            if (owner.CellNumber != item.Owner.CellNumber)
+            {
+                owner.CellNumber = item.Owner.CellNumber;
+            }
+            if (owner.Telephone != item.Owner.Telephone)
+            {
+                owner.Telephone = item.Owner.Telephone;
+            }
+
+
             if (saved.Mandate != item.Mandate)
             {
                 if (item.Mandate)
@@ -390,6 +520,44 @@ namespace UnivateProperties_API.Repository.Timeshare
             return list;
         }
 
+        public List<WeekDto> GetTenderWeeksByResortCode(string resortCode)
+        {
+            List<WeekDto> list = new List<WeekDto>();
+            string conString = string.Format("http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail.sch&CLUB=LPA&RESORT={0}&SUMMARY=N&HEAD=N", resortCode);
+            HttpWebRequest request = (HttpWebRequest)WebRequest.Create(conString);
+            request.Method = "GET";
+            WebResponse response = request.GetResponse();
+            using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
+            {
+                string result = reader.ReadToEnd();
+
+                if (result.Length > 0)
+                {
+                    string cleanLine;
+                    string[] lines = result.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                    if (lines[0].Trim() != "none")
+                    {
+                        foreach (string line in lines)
+                        {
+                            cleanLine = line.Replace("<br>", "");
+                            cleanLine = cleanLine.Replace("<br >", "");
+                            cleanLine = cleanLine.Replace("<br/>", "");
+                            cleanLine = cleanLine.Replace("<br />", "");
+                            list.Add(new WeekDto(GetTenderId(), cleanLine));
+                        }
+                    }
+                    
+                }
+            }
+            // Check that all regions are same as other
+            list
+                .Where(x => x.Region != null && x.Region.RegionCode == "FN")
+                .ToList()
+                .ForEach(x => x.Region.RegionCode = ChangeRegion(x.Region.RegionCode));
+            list = GetRegion(list);
+            return list;
+        }
+
         private List<WeekDto> GetRegion(List<WeekDto> list)
         {
             ProvinceRepository province = new ProvinceRepository(_dbContext);