Reloaded Brian's Changes

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedWeekDto.cs

@@ -1,11 +1,14 @@
 using Abp.Extensions;
 using System;
+using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Timeshare;
 
 namespace UnivateProperties_API.Containers.Timeshare.Detailed
 {
     public class DetailedWeekDto
     {
+        int resortId;
+
         public DetailedWeekDto()
         {
             Owner = new DetailedOwner();
@@ -19,7 +22,8 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             AgencyId = week.AgencyId;
             OtherResort = week.OtherResort;
             OtherResortName = week.OtherResortName;
-            Resort = new ResortDto(week.ResortCode, week.ResortName);
+            resortId = int.Parse(TenderWeeksHelper.GetResortId(week.ResortName));
+            Resort = new ResortDto(resortId, week.ResortCode, week.ResortName);
             ResortCode = week.ResortCode;
             ResortName = week.ResortName;
             RegionId = week.RegionId;

UnivateProperties_API/Containers/Timeshare/RegionDto.cs

@@ -1,10 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
+using UnivateProperties_API.Helpers;
 
 namespace UnivateProperties_API.Containers.Timeshare
 {
     public class RegionDto : IDisplay
     {
+        int resortId;
+
         public RegionDto()
         {
             Resorts = new List<ResortDto>();
@@ -43,7 +46,8 @@ namespace UnivateProperties_API.Containers.Timeshare
         {
             if (!Resorts.Any(x => x.ResortCode == resortCode))
             {
-                Resorts.Add(new ResortDto(resortCode, resortName));
+                resortId = int.Parse(TenderWeeksHelper.GetResortId(resortName));
+                Resorts.Add(new ResortDto(resortId, resortCode, resortName));
             }
         }
 

UnivateProperties_API/Containers/Timeshare/ResortDisplay.cs

@@ -4,6 +4,7 @@ namespace UnivateProperties_API.Containers.Timeshare
 {
     public class ResortDisplay
     {
+        public string ResortId { get; set; }
         public string ResortCode { get; set; }
         public string ResortName { get; set; }
         public string ResortImage { get; set; }

UnivateProperties_API/Containers/Timeshare/ResortDto.cs

@@ -7,12 +7,13 @@
 
         }
 
-        public ResortDto(string resortCode, string resortName)
+        public ResortDto(int resortId, string resortCode, string resortName)
         {
+            ResortId = resortId;
             ResortCode = resortCode;
             ResortName = resortName;
         }
-
+        public int ResortId { get; set; }
         public string ResortCode { get; set; }
         public string ResortName { get; set; }
         public int Available { get; set; }

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -10,6 +10,8 @@ namespace UnivateProperties_API.Containers.Timeshare
 {
     public class WeekDto : IDisplay
     {
+        int resortId;
+
         public WeekDto()
         {
 
@@ -17,85 +19,86 @@ namespace UnivateProperties_API.Containers.Timeshare
 
         public WeekDto(int id, string line)
         {
-            Id = id;
-            List<string> split = line.Split(",").ToList();
-            AgentAsRep = false;
-            Resort = new ResortDto(split[0].Trim(), TenderWeeksHelper.GetResortName(split[0].Trim()));
-            UnitNumber = split[1].Trim();
-            WeekNumber = split[2].Trim();
-            switch (split[8].Trim())
-            {
-                case "R":
-                    Season = "Red";
-                    break;
-                case "W":
-                    Season = "White";
-                    break;
-                case "B":
-                    Season = "Blue";
-                    break;
-                case "1":
-                    Season = "Peak 1";
-                    break;
-                case "2":
-                    Season = "Peak 2";
-                    break;
-                case "3":
-                    Season = "Peak 3";
-                    break;
-                case "4":
-                    Season = "Peak 4";
-                    break;
-                case "5":
-                    Season = "Peak 5";
-                    break;
-                default:
-                    Season = split[8].Trim();
-                    break;
-            }
-            var size = split[3].Trim();
-            if (size.Length == 3 && !size.ToLower().StartsWith('s'))
-            {
-                int.TryParse(size.Substring(0, 1), out int temp);
-                Bedrooms = temp.ToString();
-                int.TryParse(size.Substring(2, 1), out temp);
-                MaxSleep = temp;
-            }
-            bool currentYear = split[9].Trim() == "Y";
-            string amt = split[5].Trim();
-            amt = amt.Replace('.', ',');
-            if (double.TryParse(amt, out double dAmt))
-                LevyAmount = dAmt;
-            DateTime tempDate = MyCommon.GetDateFromString(currentYear ? split[6].Trim() : split[13].Trim());
-            if (tempDate != DateTime.MinValue)
-            {
-                ArrivalDate = tempDate;
-            }
-            tempDate = MyCommon.GetDateFromString(currentYear ? split[7].Trim() : split[14].Trim());
-            if (tempDate != DateTime.MinValue)
-            {
-                DepartureDate = tempDate;
-            }
-            Region = new RegionDto() { RegionCode = split[24].Trim() };
-            IsTender = true;
-            ReferedByAgent = false;
-            // F-Fixed T-Timeshare (Fixed Timeshare Week) 
-            //PML - Peak / Medium / Low Felxi
-            switch (split[25].Trim())
-            {
-                case "T":
-                case "F":
-                    WeekType = "Fixed";
-                    break;
-                case "P":
-                case "M":
-                case "L":
-                    WeekType = "Peak Flexi";
-                    break;
-                default:
-                    WeekType = "";
-                    break;
-            }
+                Id = id;
+                List<string> split = line.Split(",").ToList();
+                AgentAsRep = false;
+                resortId = int.Parse(TenderWeeksHelper.GetResortId(TenderWeeksHelper.GetResortName(split[0].Trim())));
+                Resort = new ResortDto(resortId, split[0].Trim(), TenderWeeksHelper.GetResortName(split[0].Trim()));
+                UnitNumber = split[1].Trim();
+                WeekNumber = split[2].Trim();
+                switch (split[8].Trim())
+                {
+                    case "R":
+                        Season = "Red";
+                        break;
+                    case "W":
+                        Season = "White";
+                        break;
+                    case "B":
+                        Season = "Blue";
+                        break;
+                    case "1":
+                        Season = "Peak 1";
+                        break;
+                    case "2":
+                        Season = "Peak 2";
+                        break;
+                    case "3":
+                        Season = "Peak 3";
+                        break;
+                    case "4":
+                        Season = "Peak 4";
+                        break;
+                    case "5":
+                        Season = "Peak 5";
+                        break;
+                    default:
+                        Season = split[8].Trim();
+                        break;
+                }
+                var size = split[3].Trim();
+                if (size.Length == 3 && !size.ToLower().StartsWith('s'))
+                {
+                    int.TryParse(size.Substring(0, 1), out int temp);
+                    Bedrooms = temp.ToString();
+                    int.TryParse(size.Substring(2, 1), out temp);
+                    MaxSleep = temp;
+                }
+                bool currentYear = split[9].Trim() == "Y";
+                string amt = split[5].Trim();
+                amt = amt.Replace('.', ',');
+                if (double.TryParse(amt, out double dAmt))
+                    LevyAmount = dAmt;
+                DateTime tempDate = MyCommon.GetDateFromString(currentYear ? split[6].Trim() : split[13].Trim());
+                if (tempDate != DateTime.MinValue)
+                {
+                    ArrivalDate = tempDate;
+                }
+                tempDate = MyCommon.GetDateFromString(currentYear ? split[7].Trim() : split[14].Trim());
+                if (tempDate != DateTime.MinValue)
+                {
+                    DepartureDate = tempDate;
+                }
+                Region = new RegionDto() { RegionCode = split[24].Trim() };
+                IsTender = true;
+                ReferedByAgent = false;
+                // F-Fixed T-Timeshare (Fixed Timeshare Week) 
+                //PML - Peak / Medium / Low Felxi
+                switch (split[25].Trim())
+                {
+                    case "T":
+                    case "F":
+                        WeekType = "Fixed";
+                        break;
+                    case "P":
+                    case "M":
+                    case "L":
+                        WeekType = "Peak Flexi";
+                        break;
+                    default:
+                        WeekType = "";
+                        break;
+                }
         }
 
         public WeekDto(TimeshareWeek week)
@@ -110,7 +113,9 @@ namespace UnivateProperties_API.Containers.Timeshare
             Owner = week.DisplayOwner;
             OwnerId = week.Owner.Id;
             UserId = week.Owner.UserId;
-            Resort = new ResortDto(week.ResortCode, week.ResortName);
+            resortId = int.Parse(TenderWeeksHelper.GetResortId(week.ResortName));
+            Resort = new ResortDto(resortId, week.ResortCode, week.ResortName);
+            Resort.ResortId = int.Parse(TenderWeeksHelper.GetResortId(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)

UnivateProperties_API/Containers/Users/AgencyDto.cs

@@ -5,7 +5,7 @@
         public int Id { get; set; }
         public string Name { get; set; }
         public string EaabeffcNumber { get; set; }
-        public string RegNo { get; set; }
+        public string CompanyRegNumber { get; set; }
         public UserDto User { get; set; }
     }
 }

UnivateProperties_API/Context/DataContext.cs

@@ -59,6 +59,7 @@ namespace UnivateProperties_API.Context
         public virtual DbSet<PlaceHolder> PlaceHolders { get; set; }
         public virtual DbSet<MailRecipient> MailRecipients { get; set; }
         public virtual DbSet<MailModel> CommunicationLog { get; set; }
+        public virtual DbSet<MailSource> MailSource { get; set; }
         #endregion Communication
 
         #region Property

UnivateProperties_API/Controllers/Communication/MailController.cs

@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using RestSharp;
+using System;
+using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Repository.Communication;
 
@@ -31,9 +33,9 @@ namespace UnivateProperties_API.Controllers.Communication
                 }
                 return new OkResult();
             }
-            catch
+            catch (Exception ex)
             {
-                return new BadRequestResult();
+                return BadRequest(new { message = ex.Message });
             }
         }
 

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -98,8 +98,8 @@ namespace UnivateProperties_API.Controllers.Users
             }
             catch (AppException ex)
             {
-                //return BadRequest(new { message = ex.Message });
-                return StatusCode(409, ex);
+                return BadRequest(new { message = ex.Message });
+                //return StatusCode(409, ex);
             }
         }
 
@@ -115,7 +115,7 @@ namespace UnivateProperties_API.Controllers.Users
             }
             catch(Exception ex)
             {
-                return BadRequest(new { message = ex.Message + " - " + ex.InnerException + " - " + ex.StackTrace });
+                return BadRequest(new { message = ex.Message });
             }
         }
 
@@ -133,7 +133,7 @@ namespace UnivateProperties_API.Controllers.Users
                 _Repo.CreateAgency(agency);
                 return Ok();
             }
-            catch (AppException ex)
+            catch (Exception ex)
             {
                 // return error message if there was an exception
                 return BadRequest(new { message = ex.Message });

UnivateProperties_API/Helpers/TenderWeeksHelper.cs

@@ -12,7 +12,7 @@ namespace UnivateProperties_API.Helpers
         {
             if (UniResorts.Count == 0)
             {
-                var client = new RestClient("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list/")
+                var client = new RestClient("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list?disabled=true")
                 {
                     Timeout = -1
                 };
@@ -28,11 +28,31 @@ namespace UnivateProperties_API.Helpers
                 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/")
+                var client = new RestClient("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list?disabled=true")
+                {
+                    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 static string GetResortId(string Name)
+        {
+            if (UniResorts.Count == 0)
+            {
+                var client = new RestClient("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list?disabled=true")
                 {
                     Timeout = -1
                 };
@@ -42,6 +62,26 @@ namespace UnivateProperties_API.Helpers
             }
 
             var resort = UniResorts.Find(x => x.ResortName == Name);
+            if (resort != null)
+                return resort.Id.ToString();
+            else
+                return "";
+        }
+
+        public static string GetResortCodeById(int Id)
+        {
+            if (UniResorts.Count == 0)
+            {
+                var client = new RestClient("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/list?disabled=true")
+                {
+                    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.Id == Id);
             if (resort != null)
                 return resort.ResortCode;
             else

UnivateProperties_API/Migrations/20220714123442_MailSource.cs

@@ -0,0 +1,35 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class MailSource : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "MailSource",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    Description = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MailSource", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "MailSource");
+        }
+    }
+}

UnivateProperties_API/Migrations/20220714125536_MailSource-MailModel.cs

@@ -0,0 +1,44 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class MailSourceMailModel : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "MailSourceId",
+                table: "CommunicationLog",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_CommunicationLog_MailSourceId",
+                table: "CommunicationLog",
+                column: "MailSourceId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommunicationLog_MailSource_MailSourceId",
+                table: "CommunicationLog",
+                column: "MailSourceId",
+                principalTable: "MailSource",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_CommunicationLog_MailSource_MailSourceId",
+                table: "CommunicationLog");
+
+            migrationBuilder.DropIndex(
+                name: "IX_CommunicationLog_MailSourceId",
+                table: "CommunicationLog");
+
+            migrationBuilder.DropColumn(
+                name: "MailSourceId",
+                table: "CommunicationLog");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -316,6 +316,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<bool>("IsDeleted");
 
+                    b.Property<int>("MailSourceId");
+
                     b.Property<string>("Message");
 
                     b.Property<DateTime>("Modified");
@@ -332,6 +334,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("MailSourceId");
+
                     b.ToTable("CommunicationLog");
                 });
 
@@ -360,6 +364,27 @@ namespace UnivateProperties_API.Migrations
                     b.ToTable("MailRecipients");
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.MailSource", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Description");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailSource");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.PlaceHolder", b =>
                 {
                     b.Property<int>("Id")
@@ -1639,6 +1664,14 @@ namespace UnivateProperties_API.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.MailModel", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Communication.MailSource", "MailSource")
+                        .WithMany("MailModels")
+                        .HasForeignKey("MailSourceId")
+                        .OnDelete(DeleteBehavior.Cascade);
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.PlaceHolder", b =>
                 {
                     b.HasOne("UnivateProperties_API.Model.Communication.Template", "Template")

UnivateProperties_API/Model/Communication/MailModel.cs

@@ -1,24 +1,21 @@
-namespace UnivateProperties_API.Model.Communication
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace UnivateProperties_API.Model.Communication
 {
     public class MailModel : BaseEntity
     {
         public string ComType { get; set; }
         public string ToAddress { get; set; }
-
         public string FromAddress { get; set; }
-
         public string Name { get; set; }
-
         public string Email { get; set; }
-
         public string Phone { get; set; }
-
         public string Property { get; set; }
-
         public string Message { get; set; }
-
         public string HeardFrom { get; set; }
-
+        [ForeignKey("MailSource")]
+        public int MailSourceId { get; set; }
+        public virtual MailSource MailSource { get; set; }
         public string Error { get; set; }
     }
 }

UnivateProperties_API/Model/Communication/MailSource.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace UnivateProperties_API.Model.Communication
+{
+    public class MailSource : BaseEntity
+    {
+        public string Description { get; set; }
+        public ICollection<MailModel> MailModels { get; set; }
+    }
+}

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -14,7 +14,7 @@ namespace UnivateProperties_API.Model.Timeshare
         {
         }
 
-        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)
+        public TimeshareWeek(bool referedByAgent, int? agentId, int? agencyId, int ownerId, bool agentAsRep, bool otherResort, string otherResortName, int resortId, 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;

UnivateProperties_API/Program.cs

@@ -18,8 +18,8 @@ namespace UnivateProperties_API
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
-                //.UseUrls("http://localhost:57260")
-                .UseUrls("http://training.provision-sa.com:82")
+                .UseUrls("http://localhost:57260")
+                //.UseUrls("http://training.provision-sa.com:82")
                 .UseIISIntegration()
                 .Build();
     }

UnivateProperties_API/Repository/Communication/MailRepository.cs

@@ -101,6 +101,10 @@ namespace UnivateProperties_API.Repository.Communication
             mm.Error = error;
             _dbContext.CommunicationLog.Add(mm);
             _dbContext.SaveChanges();
+            if (error != "None")
+            {
+                throw new AppException("SMTP Server Error - Please try later.");
+            }
         }
 
         public void EnquireNow(MailModel mm)
@@ -166,6 +170,10 @@ namespace UnivateProperties_API.Repository.Communication
             mm.Error = error;
             _dbContext.CommunicationLog.Add(mm);
             _dbContext.SaveChanges();
+            if (error != "None")
+            {
+                throw new AppException("SMTP Server Error - Please try later.");
+            }
         }
 
         public void ForgotPassword(Individual toPerson, string link)

UnivateProperties_API/Repository/Timeshare/IResortRepository.cs

@@ -29,7 +29,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             _dbContext = dbContext;
         }
 
-        public string GetResortDescription(string resortCode)
+        public string GetResortDescription(string resortId)
         {
             var requestDataURL = MyCommon.Reservations.Replace("ReservationsWebService.asmx", "");
             var client = new RestClient(MyCommon.Reservations)
@@ -44,7 +44,7 @@ namespace UnivateProperties_API.Repository.Timeshare
                 , string.Format("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\r\n  <soap:Body>\r\n    <GetResortDescription xmlns=\"{3}\">\r\n      <UserCode>{0}</UserCode>\r\n      <Password>{1}</Password>\r\n      <ResortCode>{2}</ResortCode>\r\n    </GetResortDescription>\r\n  </soap:Body>\r\n</soap:Envelope>"
                 , MyCommon.ReservationsUserCode
                 , MyCommon.ReservationsPassword
-                , resortCode
+                , resortId
                 , requestDataURL)
                 , ParameterType.RequestBody);
             IRestResponse response = client.Execute(request);           
@@ -107,6 +107,7 @@ namespace UnivateProperties_API.Repository.Timeshare
                 if (!resortNames.Contains(week.ResortName))
                 {
                     resortNames.Add(week.ResortName);
+                    resortObject.resortId = int.Parse(TenderWeeksHelper.GetResortId(week.ResortName));
                     resortObject.resortName = week.ResortName;
                     resortObject.resortCode = week.ResortCode;
                     resortObject.resortRegion = provinces.Where(p => p.Id == week.RegionId);
@@ -139,7 +140,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             WeekRepository weekRepo = new WeekRepository(_dbContext);
             var weeks = weekRepo.GetDtoListAll();
 
-            var client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/{0}", regionCode))
+            var client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/resorts/{0}?disabled=true", regionCode))
             {
                 Timeout = -1
             };
@@ -149,18 +150,19 @@ namespace UnivateProperties_API.Repository.Timeshare
 
             foreach(var resort in UniResorts)
             {
-                if (!string.IsNullOrEmpty(resort.ResortCode))
-                {                   
+                //if (!string.IsNullOrEmpty(resort.ResortCode))
+                //{
                     ResortDisplay desp = new ResortDisplay()
                     {
+                        ResortId = resort.Id.ToString(),
                         ResortCode = resort.ResortCode,
                         ResortName = resort.ResortName
                     };
 
-                    var images = GetResortImages(resort.ResortCode);
+                    var images = GetResortImages(desp.ResortId);
                     if (images == null || images.Count == 0)
                     {
-                        var imgClient = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/image/0", resort.ResortCode))
+                        var imgClient = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/image/0", resort.Id))
                         {
                             Timeout = -1
                         };
@@ -178,16 +180,16 @@ namespace UnivateProperties_API.Repository.Timeshare
                     desp.WeeksAvailable = weeks.Where(w => w.Resort.ResortCode == resort.ResortCode).Where(x => x.Publish == true).Count();
 
                     resorts.Add(desp);
-                }
+                //}
             }
 
             return resorts.OrderBy(r => r.ResortCode).ToList();
         }
 
-        public ResortData GetResortData(string resortCode)
+        public ResortData GetResortData(string resortId)
         {             
             #region Get Resort Data
-            var client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/{0}", resortCode))
+            var client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/TRESORT/{0}", resortId))
             {
                 Timeout = -1
             };
@@ -197,7 +199,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             #endregion
 
             #region Get Layout
-            client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/layout", resortCode))
+            client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/layout", resortId))
             {
                 Timeout = -1
             };
@@ -211,14 +213,14 @@ namespace UnivateProperties_API.Repository.Timeshare
             #endregion
 
             #region GetImages
-            data.Images = GetResortImages(resortCode);
+            data.Images = GetResortImages(resortId);
             if (data.Images == null || data.Images.Count == 0)
             {
                 data.Images = new List<string>();
                 int count = 0;
                 while (count < 5)
                 {
-                    client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/image/{1}", resortCode, count))
+                    client = new RestClient(string.Format("https://www.tradeunipoint.com/unibackend/seam/resource/rest/products/{0}/image/{1}", resortId, count))
                     {
                         Timeout = -1
                     };
@@ -232,7 +234,7 @@ namespace UnivateProperties_API.Repository.Timeshare
 #endregion
 
             #region Get Description
-            data.Description = GetResortDescription(resortCode);            
+            data.Description = GetResortDescription(resortId);            
             #endregion
 
             return data; 

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -2,6 +2,7 @@
 using Abp.Extensions;
 using Microsoft.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
 using RestSharp;
 using System;
 using System.Collections.Generic;
@@ -75,21 +76,22 @@ namespace UnivateProperties_API.Repository.Timeshare
             return null;
         }
 
-        public List<WeekDto> GetAllByResortCode(string resortCode) 
+        public List<WeekDto> GetAllByResortCode(string resortCode)
         {
             List<WeekDto> list = new List<WeekDto>();
-            foreach (var item in GetDetailedByResortCode(resortCode))
+            string resort;
+            resort = TenderWeeksHelper.GetResortCodeById(int.Parse(resortCode));
+            foreach (var item in GetDetailedByResortCode(resort))
             {
                 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);
-            }
+                foreach (var item in GetTenderWeeksByResortCode(resort))
+                {
+                    if (!listIds.Contains(item.WeekUni))
+                        list.Add(item);
+                }
             return list;
         }
 
@@ -103,7 +105,6 @@ namespace UnivateProperties_API.Repository.Timeshare
             }
             return weeklist;
         }
-
         private List<TimeshareWeek> GetAllUsingResortCode(string resortCode)
         {
             return _dbContext.Weeks.Where(x => x.ResortCode == resortCode).ToList();
@@ -259,7 +260,7 @@ namespace UnivateProperties_API.Repository.Timeshare
         {
             List<RegionDto> list = new List<RegionDto>();
             var allItems = GetDtoListAll();
-            foreach (var item in allItems)
+             foreach (var item in allItems)
             {
                 if (item.Region != null)
                 {
@@ -270,6 +271,7 @@ namespace UnivateProperties_API.Repository.Timeshare
                     foreach (var i in list.Where(x => x.RegionCode == item.Region.RegionCode))
                     {
                         i.TryAddResort(item.Resort.ResortCode, item.Resort.ResortName);
+                        
                     }
                 }
             }
@@ -280,11 +282,15 @@ namespace UnivateProperties_API.Repository.Timeshare
                 foreach (var resort in region.Resorts)
                 {
                     resort.Available = allItems.Count(x => x.Resort.ResortCode == resort.ResortCode);
+                    //resort.ResortId = int.Parse(TenderWeeksHelper.GetResortId(resort.ResortName));
                 }
             }
+
             return list;
         }
 
+
+
         public List<TimeshareWeek> GetDetailedAll()
         {
             var list = GetAll();
@@ -715,18 +721,21 @@ namespace UnivateProperties_API.Repository.Timeshare
             using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
             {
                 string result = reader.ReadToEnd();
-
-                if (result.Length > 0)
+                result = result.Replace("\n", "").Trim();
+                if (result != "Resort Error")
                 {
-                    string cleanLine;
-                    string[] lines = result.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-                    foreach (string line in lines)
+                    if (result.Length > 0)
                     {
-                        cleanLine = line.Replace("<br>", "");
-                        cleanLine = cleanLine.Replace("<br >", "");
-                        cleanLine = cleanLine.Replace("<br/>", "");
-                        cleanLine = cleanLine.Replace("<br />", "");
-                        list.Add(new WeekDto(GetTenderId(),cleanLine));
+                        string cleanLine;
+                        string[] lines = result.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                        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));
+                        }
                     }
                 }
             }
@@ -749,23 +758,26 @@ namespace UnivateProperties_API.Repository.Timeshare
             using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.UTF8))
             {
                 string result = reader.ReadToEnd();
-
-                if (result.Length > 0)
+                result = result.Replace("\n", "").Trim();
+                if (result != "Resort Error")
                 {
-                    string cleanLine;
-                    string[] lines = result.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-                    if (lines[0].Trim() != "none")
+                    if (result.Length > 0)
                     {
-                        foreach (string line in lines)
+                        string cleanLine;
+                        string[] lines = result.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+                        if (lines[0].Trim() != "none")
                         {
-                            cleanLine = line.Replace("<br>", "");
-                            cleanLine = cleanLine.Replace("<br >", "");
-                            cleanLine = cleanLine.Replace("<br/>", "");
-                            cleanLine = cleanLine.Replace("<br />", "");
-                            list.Add(new WeekDto(GetTenderId(), cleanLine));
+                            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

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -71,11 +71,6 @@ namespace UnivateProperties_API.Repository.Users
         public Agency CreateAgency(AgencyDto agency)
         {
             // validation
-            /* if (string.IsNullOrWhiteSpace(agency.EaabeffcNumber))
-                 throw new AppException("eaabeffcNumber is required");
-
-             if (_dbContext.Agencies.Any(x => x.EAABEFFCNumber == agency.EaabeffcNumber))
-                 throw new AppException("eaabeffcNumber \"" + agency.EaabeffcNumber + "\" already exists");*/
             if (!string.IsNullOrEmpty(agency.EaabeffcNumber))
             {
                 var savedAgency = _dbContext.Agencies.Where(x => x.EAABEFFCNumber == agency.EaabeffcNumber).FirstOrDefault();
@@ -85,12 +80,11 @@ namespace UnivateProperties_API.Repository.Users
                     {
                         AgencyName = agency.Name,
                         EAABEFFCNumber = agency.EaabeffcNumber,
-                        CompanyRegNumber = agency.RegNo
+                        CompanyRegNumber = agency.CompanyRegNumber
                     };
                     _dbContext.Agencies.Add(a);
                     CreatePerson(agency.User, PersonType.Agent, false, a);
-
-
+                    _dbContext.SaveChanges();
                     return a;
                 }
                 else
@@ -99,6 +93,7 @@ namespace UnivateProperties_API.Repository.Users
                     _dbContext.SaveChanges();
                     return savedAgency;
                 }
+
             }
             else 
             {
@@ -115,7 +110,9 @@ namespace UnivateProperties_API.Repository.Users
                 throw new AppException("Password is required");
 
             if (_dbContext.Users.Any(x => x.Username == individual.Username))
-                throw new AppException("Individual \"" + individual.Username + "\" is already taken");
+                throw new AppException("Username \"" + individual.Username + "\" is already taken");
+            if (_dbContext.Individuals.Any(x => x.Email == individual.Email))
+                throw new AppException("Email \"" + individual.Email + "\" is already taken");
 
             MyCommon.CreatePasswordHash(individual.Password, out byte[] passwordHash, out byte[] passwordSalt);
 
@@ -438,7 +435,7 @@ namespace UnivateProperties_API.Repository.Users
             }
             else
             {
-                throw new Exception();
+                throw new AppException("Email address not found!");
             }
         }
 

UnivateProperties_API/appsettings.json

@@ -9,9 +9,10 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;Integrated Security=SSPI;Pooling=false;",
-    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=sa;Password=What123!;Pooling=false;",
+    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Integrated Security=true;Pooling=false;",
+    //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=sa;Password=What123!;Pooling=false;",
     //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
+    //"DefaultConnection": "Data Source=192.168.0.101;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
     "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N",
     "ReservationsURL": "https://www.pvsl.co.za:85/ReservationsWebService.asmx", //Please note that ReservationsWebService must be in this case. 
     "ReservationsUserCode": "UniInt",