Multiple Updates and Fixes

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

             return new OkObjectResult(item);
         }
 
+        [HttpGet("indivWeekCount/{id}")]
+        public IActionResult IndivWeekCount(int id)
+        {
+            var count = (_Repo as WeekRepository).IndivWeekCount(id);
+            return new OkObjectResult(count);
+        }
+
 
         [HttpPost]
         public IActionResult Post([FromBody] TimeshareWeekDto item)

UnivateProperties_API/Migrations/20201124064130_nonRegUserSpouse.cs

+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class nonRegUserSpouse : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "HowMarried",
+                table: "NonRegIndividuals",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseCellnumber",
+                table: "NonRegIndividuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseEmail",
+                table: "NonRegIndividuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseName",
+                table: "NonRegIndividuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseSurname",
+                table: "NonRegIndividuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "SpouseTelephone",
+                table: "NonRegIndividuals",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "HowMarried",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseCellnumber",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseEmail",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseName",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseSurname",
+                table: "NonRegIndividuals");
+
+            migrationBuilder.DropColumn(
+                name: "SpouseTelephone",
+                table: "NonRegIndividuals");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

 
                     b.Property<string>("EmailAddress");
 
+                    b.Property<int>("HowMarried");
+
                     b.Property<string>("IDNumber");
 
                     b.Property<bool>("IsDeleted");
 
                     b.Property<string>("Name");
 
+                    b.Property<string>("SpouseCellnumber");
+
+                    b.Property<string>("SpouseEmail");
+
+                    b.Property<string>("SpouseName");
+
+                    b.Property<string>("SpouseSurname");
+
+                    b.Property<string>("SpouseTelephone");
+
                     b.Property<string>("Surname");
 
                     b.Property<string>("TelephoneNumber");

UnivateProperties_API/Model/Users/Individual.cs

                     User.Role = owner.User.Role;
                     User.LoginPasswordChange = owner.User.LoginPasswordChange;
                 }
+
+                if (owner.HowMarried != "0")
+                {
+                    switch (owner.HowMarried)
+                    {
+                        case "1":
+                            HowMarried = MarriedType.ICOP;
+                            break;
+                        case "2":
+                            HowMarried = MarriedType.OCOP;
+                            break;
+                        case "3":
+                            HowMarried = MarriedType.Other;
+                            break;
+                        case "4":
+                            HowMarried = MarriedType.Traditional;
+                            break;
+                        case "5":
+                            HowMarried = MarriedType.Single;
+                            break;
+                        case "6":
+                            HowMarried = MarriedType.Divorced;
+                            break;
+                        case "7":
+                            HowMarried = MarriedType.Widow;
+                            break;
+                        case "8":
+                            HowMarried = MarriedType.CommittedRelationship;
+                            break;
+                        case "9":
+                            HowMarried = MarriedType.Partner;
+                            break;
+                    }
+                    SpouseName = owner.SpouseName;
+                    SpouseSurname = owner.SpouseSurname;
+                    SpouseCellnumber = owner.SpouseCellnumber;
+                    SpouseTelephone = owner.SpouseTelephone;
+                    SpouseEmail = owner.SpouseEmail;                    
+                }
             }
         }
         #endregion Methods

UnivateProperties_API/Model/Users/NonRegIndividual.cs

         public string CellNumber { get; set; }
         [Phone]
         public string TelephoneNumber { get; set; }
+        public MarriedType HowMarried { get; set; }
+        public string SpouseName { get; set; }
+        public string SpouseSurname { get; set; }
+        [DataType(DataType.EmailAddress)]
+        public string SpouseEmail { get; set; }
+        [Phone]
+        public string SpouseTelephone { get; set; }
+        [Phone]
+        public string SpouseCellnumber { get; set; }
 
         [ForeignKey("TimeshareWeek")]
         public int? WeekId { get; set; }

UnivateProperties_API/Repository/Communication/MailRepository.cs

 using Abp.Specifications;
+using MimeKit;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 
         public void ContactUs(MailModel mm)
         {
-            var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "ContactUs").ToList();            
-            string body = _dbContext.Templates.Where(x => x.Name == "ContactUs").FirstOrDefault().Body; 
+            var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "ContactUs").Where(y => y.IsDeleted == false).ToList();            
+            string body = _dbContext.Templates.Where(x => x.Name == "ContactUs").Where(y => y.IsDeleted == false).FirstOrDefault().Body; 
 
             body = body.Replace("[FULLNAME]", mm.Name);
             body = body.Replace("[USEREMAIL]", mm.Email);
             if (toList.Length > 0)
             {
                 if (emailCount == 1)
-                    toList = toList.Substring(0, toList.Length - 3);
+                    toList = toList.Substring(0, toList.Length - 2);
                 else
                     toList = toList.Substring(0, toList.Length - 2);
             }
             if (toList.Length > 0)
             {
                 if (emailCount == 1)
-                    toList = toList.Substring(0, toList.Length - 3);
+                    toList = toList.Substring(0, toList.Length - 2);
                 else
                     toList = toList.Substring(0, toList.Length - 2);
             }
 
         public void ForgotPassword(Individual toPerson, string link)
         {
-            
             string body = "<div style=\"margin: 5px\">" + 
                            "<h4>Dear " + toPerson.FullName + "</h4>" +
                            "<h4>There has been a request to reset your password. If this is incorrect please send an email to info@univateproperties.co.za</h4>" +
                            "</div>";
 
             var host = _dbContext.Hosts.FirstOrDefault();
+
             using (SmtpClient smtp = new SmtpClient(host.Host))
             {
                 MailMessage mail = new MailMessage();
                 smtp.Credentials = host.GetNetworkCredential();
                 smtp.EnableSsl = host.UseSSL;
                 smtp.Send(mail);
-            }                        
+            }
         }
 
         public void WeekOfferMadeOwner(TimeshareWeek week, BidItem bid)
             if (toList.Length > 0)
             {
                 if (emailCount == 1)
-                    toList = toList.Substring(0, toList.Length - 3);
+                    toList = toList.Substring(0, toList.Length - 2);
                 else
                     toList = toList.Substring(0, toList.Length - 2);
             }
             if (toList.Length > 0)
             {
                 if (emailCount == 1)
-                    toList = toList.Substring(0, toList.Length - 3);
+                    toList = toList.Substring(0, toList.Length - 2);
                 else
                     toList = toList.Substring(0, toList.Length - 2);
             }
             if (toList.Length > 0)
             {
                 if (emailCount == 1)
-                    toList = toList.Substring(0, toList.Length - 3);
+                    toList = toList.Substring(0, toList.Length - 2);
                 else
                     toList = toList.Substring(0, toList.Length - 2);
             }

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

     {
         int SaveNewWeek(TimeshareWeekDto sellItem);
         void PublishOnly(WeekDto week);
+        int IndivWeekCount(int id);
         List<WeekDto> GetAllByResortCode(string resortCode);
         List<dynamic> GetLatest();
         void PublishWeek(int WeekId);
             return list;*/
         }
 
+        public int IndivWeekCount(int id)
+        {
+            var agent = _dbContext.Agents.Where(x => x.UserId == id).Where(y => y.IsDeleted == false).FirstOrDefault();
+            var indiv = _dbContext.Individuals.Where(x => x.UserId == id).Where(y => y.IsDeleted == false).FirstOrDefault();
+            int count = 0;
+            if (agent != null)
+            {
+                count = _dbContext.Weeks.Where(x => x.AgentId == agent.Id).Count();
+            }
+            else
+            {
+                count = _dbContext.Weeks.Where(x => x.OwnerId == indiv.Id).Count();
+            }
+            return count;
+        }
+
         public List<WeekDto> GetMyWeeks(int userId)
         {
             List<WeekDto> list = new List<WeekDto>();
             #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.Email = sellItem.OwnerObject.EmailAddress;
-            owner.CellNumber = sellItem.OwnerObject.CellNumber;
-            owner.Telephone = sellItem.OwnerObject.LandlineNumber;
-            sellItem.DisplayOwner = owner.Name + " " +  owner.Surname;
-
-            switch (sellItem.OwnerObject.MaritalStatus.ToUpper())
-            {
-                case "N/A":
-                    owner.HowMarried = MarriedType.NotApplicable;
-                    break;
-                case "IN COMMUNITY OF PROPERTY":
-                    owner.HowMarried = MarriedType.ICOP;
-                    break;
-                case "OUT OF COMMUNITY OF PROPERTY":
-                    owner.HowMarried = MarriedType.OCOP;
-                    break;
-                case "OTHER":
-                    owner.HowMarried = MarriedType.Other;
-                    break;
-                case "TRADITIONAL WEDDING":
-                    owner.HowMarried = MarriedType.Traditional;
-                    break;
-                case "SINGLE":
-                    owner.HowMarried = MarriedType.Single;
-                    break;
-                case "DIVORCED":
-                    owner.HowMarried = MarriedType.Divorced;
-                    break;
-                case "WIDOW":
-                    owner.HowMarried = MarriedType.Widow;
-                    break;
-                case "COMMITTED RELATIONSHIP":
-                    owner.HowMarried = MarriedType.CommittedRelationship;
-                    break;
-                case "PARTNER":
-                    owner.HowMarried = MarriedType.Partner;
-                    break;
-                default:
-                    owner.HowMarried = MarriedType.NotApplicable;
-                    break;
-            }
+            if (!sellItem.CustomOwner)
+            {
+                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.Email = sellItem.OwnerObject.EmailAddress;
+                owner.CellNumber = sellItem.OwnerObject.CellNumber;
+                owner.Telephone = sellItem.OwnerObject.LandlineNumber;
+                sellItem.DisplayOwner = owner.Name + " " + owner.Surname;
+
+                switch (sellItem.OwnerObject.MaritalStatus.ToUpper())
+                {
+                    case "N/A":
+                        owner.HowMarried = MarriedType.NotApplicable;
+                        break;
+                    case "IN COMMUNITY OF PROPERTY":
+                        owner.HowMarried = MarriedType.ICOP;
+                        break;
+                    case "OUT OF COMMUNITY OF PROPERTY":
+                        owner.HowMarried = MarriedType.OCOP;
+                        break;
+                    case "OTHER":
+                        owner.HowMarried = MarriedType.Other;
+                        break;
+                    case "TRADITIONAL WEDDING":
+                        owner.HowMarried = MarriedType.Traditional;
+                        break;
+                    case "SINGLE":
+                        owner.HowMarried = MarriedType.Single;
+                        break;
+                    case "DIVORCED":
+                        owner.HowMarried = MarriedType.Divorced;
+                        break;
+                    case "WIDOW":
+                        owner.HowMarried = MarriedType.Widow;
+                        break;
+                    case "COMMITTED RELATIONSHIP":
+                        owner.HowMarried = MarriedType.CommittedRelationship;
+                        break;
+                    case "PARTNER":
+                        owner.HowMarried = MarriedType.Partner;
+                        break;
+                    default:
+                        owner.HowMarried = MarriedType.NotApplicable;
+                        break;
+                }
 
-            owner.SpouseCellnumber = sellItem.OwnerObject.SpouseCellnumber;
-            owner.SpouseEmail = sellItem.OwnerObject.SpouseEmail;
-            owner.SpouseName = sellItem.OwnerObject.SpouseName;
-            owner.SpouseSurname = sellItem.OwnerObject.SpouseSurname;
-            owner.SpouseTelephone = sellItem.OwnerObject.SpouseSurname;
+                owner.SpouseCellnumber = sellItem.OwnerObject.SpouseCellnumber;
+                owner.SpouseEmail = sellItem.OwnerObject.SpouseEmail;
+                owner.SpouseName = sellItem.OwnerObject.SpouseName;
+                owner.SpouseSurname = sellItem.OwnerObject.SpouseSurname;
+                owner.SpouseTelephone = sellItem.OwnerObject.SpouseSurname;
 
-            if (owner.Id == 0)
-            {
-                _dbContext.Add(owner);
-                Save();
+                if (owner.Id == 0)
+                {
+                    _dbContext.Add(owner);
+                    Save();
+                }
+                else
+                {
+                    _dbContext.Entry(owner).State = EntityState.Modified;
+                    Save();
+                }
             }
-            else
+            else 
             {
-                _dbContext.Entry(owner).State = EntityState.Modified;
-                Save();
+                sellItem.DisplayOwner = sellItem.OwnerObject.Name + " " + sellItem.OwnerObject.Surname;
             }
+            
             #endregion
 
             var week = new TimeshareWeek();
             week.Region = null;
             week.RegionId = sellItem.Region.Id;
             week.OwnerId = owner.Id;
-            sellItem.DisplayOwner = owner.FullName;
+            
             if (week.Mandate)
                 week.DateMandated = DateTime.Now;
 
                 {
                     if (template != null)
                     {
-                        mailRepository.WeekLoadedOwner(sellItem);
+                        //mailRepository.WeekLoadedOwner(sellItem);
                         //templateRepository.SendEmailTemplateWeek(template, owner, sellItem);
                     }
                     template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-UV");
                         week.StatusId = statusItem.Id;
                     }
                 }
-            }
-            
+            }            
             _dbContext.Add(week);
             Save();
+            if (sellItem.CustomOwner)
+            {
+                var indiv = new NonRegIndividual()
+                {
+                    Name = sellItem.OwnerObject.Name,
+                    Surname = sellItem.OwnerObject.Surname,
+                    IDNumber = sellItem.OwnerObject.IdNumber,
+                    CompanyRegNumber = sellItem.OwnerObject.CompanyRegNumber,
+                    EmailAddress = sellItem.OwnerObject.EmailAddress,
+                    CellNumber = sellItem.OwnerObject.CellNumber,
+                    TelephoneNumber = sellItem.OwnerObject.LandlineNumber,
+                    SpouseCellnumber = sellItem.OwnerObject.SpouseCellnumber,
+                    SpouseEmail = sellItem.OwnerObject.SpouseEmail,
+                    SpouseName = sellItem.OwnerObject.SpouseName,
+                    SpouseSurname = sellItem.OwnerObject.SpouseSurname,
+                    SpouseTelephone = sellItem.OwnerObject.SpouseSurname,
+                    WeekId = week.Id
+                };
 
+                switch (sellItem.OwnerObject.MaritalStatus.ToUpper())
+                {
+                    case "":
+                        indiv.HowMarried = MarriedType.NotApplicable;
+                        break;
+                    case "N/A":
+                        indiv.HowMarried = MarriedType.NotApplicable;
+                        break;
+                    case "IN COMMUNITY OF PROPERTY":
+                        indiv.HowMarried = MarriedType.ICOP;
+                        break;
+                    case "OUT OF COMMUNITY OF PROPERTY":
+                        indiv.HowMarried = MarriedType.OCOP;
+                        break;
+                    case "OTHER":
+                        indiv.HowMarried = MarriedType.Other;
+                        break;
+                    case "TRADITIONAL WEDDING":
+                        indiv.HowMarried = MarriedType.Traditional;
+                        break;
+                    case "SINGLE":
+                        indiv.HowMarried = MarriedType.Single;
+                        break;
+                    case "DIVORCED":
+                        indiv.HowMarried = MarriedType.Divorced;
+                        break;
+                    case "WIDOW":
+                        indiv.HowMarried = MarriedType.Widow;
+                        break;
+                    case "COMMITTED RELATIONSHIP":
+                        indiv.HowMarried = MarriedType.CommittedRelationship;
+                        break;
+                    case "PARTNER":
+                        indiv.HowMarried = MarriedType.Partner;
+                        break;
+                    default:
+                        indiv.HowMarried = MarriedType.NotApplicable;
+                        break;
+                }
+                _dbContext.NonRegIndividuals.Add(indiv);
+                _dbContext.SaveChanges();
+            }
             return week.Id;
         }
 

UnivateProperties_API/Repository/Users/AgentRepository.cs

 
         public List<Agent> GetAll()
         {
-            return _dbContext.Agents.Include("User").ToList();
+            return _dbContext.Agents.Include("User").Where(x => x.IsDeleted == false).ToList();
         }
 
         public Agent GetDetailed(Func<Agent, bool> first)
             {
                 item.AgencyId = 10;
             }*/
-            var agent = _dbContext.Agents.Where(x => x.Name == item.Name && x.Surname == item.Surname).FirstOrDefault();
-            var indiv = new Individual();
+            var agent = _dbContext.Agents.Where(x => x.UserId == item.User.Id).FirstOrDefault();
+            var individual = _dbContext.Individuals.Where(x => x.UserId == item.User.Id).FirstOrDefault();
+            var user = _dbContext.Users.Where(x => x.Id == item.User.Id).FirstOrDefault();
 
-            if (agent == null)
+            if (item.User.Role == "Agent" || item.User.Role == "Agency" || item.User.Role == "Managing Agent")
             {
-                indiv = _dbContext.Individuals.Where(x => x.UserId == item.UserId).FirstOrDefault();
-                if (indiv != null)
+                if (agent == null)
+                {                    
+                    if (individual != null)
+                    {
+                        individual.IsDeleted = true;
+                        _dbContext.Individuals.Update(individual);                        
+                    }
+                    item.Id = 0;
+                    _dbContext.Agents.Add(item);
+                    if (item.User.Role != user.Role)
+                    {
+                        user.Role = item.User.Role;
+                    }
+                    _dbContext.Users.Update(user);
+
+                }
+                else
                 {
-                    indiv.IsDeleted = true;
-                    _dbContext.Individuals.Update(indiv);
-                    _dbContext.SaveChanges();
+                    if (agent.Name != item.Name)
+                    {
+                        agent.Name = item.Name;
+                    }
+                    if (agent.Surname != item.Surname)
+                    {
+                        agent.Surname = item.Surname;
+                    }
+                    if (agent.Email != item.Email)
+                    {
+                        agent.Email = item.Email;
+                    }
+                    if (agent.Telephone != item.Telephone)
+                    {
+                        agent.Telephone = item.Telephone;
+                    }
+                    if (agent.CellNumber != item.CellNumber)
+                    {
+                        agent.CellNumber = item.CellNumber;
+                    }
+                    if (agent.AgencyId != item.AgencyId)
+                    {
+                        agent.AgencyId = item.AgencyId;
+                    }
+                    agent.IsDeleted = false;
+                    if (individual != null)
+                    {
+                        individual.IsDeleted = true;
+                        _dbContext.Individuals.Update(individual);                        
+                    }
+                    _dbContext.Agents.Update(agent);
+                    if (item.User.Role != user.Role)
+                    {
+                        user.Role = item.User.Role;
+                    }
+                    _dbContext.Users.Update(user);
                 }
-                item.Id = 0;
-                _dbContext.Agents.Add(item);
-                _dbContext.Users.Update(item.User);
-
             }
             else
             {
-                if (agent.Name != item.Name)
-                {
-                    agent.Name = item.Name;
-                }
-                if (agent.Surname != item.Surname)
+                agent.IsDeleted = true;
+                individual.IsDeleted = false;
+                user.Role = item.User.Role;
+
+                if (individual.Name != item.Name) 
                 {
-                    agent.Surname = item.Surname;
+                    individual.Name = item.Name;
                 }
-                if (agent.Email != item.Email)
+                if (individual.Surname != item.Surname)
                 {
-                    agent.Email = item.Email;
+                    individual.Surname = item.Surname;
                 }
-                if (agent.Telephone != item.Telephone)
+                if (individual.Email != item.Email)
                 {
-                    agent.Telephone = item.Telephone;
+                    individual.Email = item.Email;
                 }
-                if (agent.CellNumber != item.CellNumber)
+                if (individual.Telephone != item.Telephone)
                 {
-                    agent.CellNumber = item.CellNumber;
+                    individual.Telephone = item.Telephone;
                 }
-                if (agent.AgencyId != item.AgencyId)
+                if (individual.CellNumber != item.CellNumber)
                 {
-                    agent.AgencyId = item.AgencyId;
+                    individual.CellNumber = item.CellNumber;
                 }
+
                 _dbContext.Agents.Update(agent);
-                _dbContext.Users.Update(item.User);
+                _dbContext.Users.Update(user);
+                _dbContext.Individuals.Update(individual);
+                
             }
             
+            
             Save();
         }
 

UnivateProperties_API/Repository/Users/IndividualRepository.cs

 
         public List<Individual> GetAll()
         {
-            foreach (var item in _dbContext.Individuals.Include("User").Include("Address").Include("BankAccount").ToList())
+            foreach (var item in _dbContext.Individuals.Include("User").Include("Address").Include("BankAccount").Where(x => x.IsDeleted != true).ToList())
             {
                 var list = MyCommon.GetVisibleColumns(item);
             }
 
         public DetailedOwner GetIndividual(int id)
         {
-            var item = _dbContext.Individuals.Include("Address").Include("BankAccount").FirstOrDefault(x => x.UserId == id);
+            var item = _dbContext.Individuals.Include("Address").Include("BankAccount").Where(y => y.IsDeleted != true).FirstOrDefault(x => x.UserId == id);
             if(item != null)
             {
                 if (item.BankAccount != null && item.BankAccount.BankId > 0)

UnivateProperties_API/Repository/Users/RegisterRepository.cs

         public Agency CreateAgency(AgencyDto agency)
         {
             // validation
-            if (string.IsNullOrWhiteSpace(agency.EaabeffcNumber))
-                throw new AppException("eaabeffcNumber is required");
+            /* 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");
-
-            Agency a = new Agency()
+             if (_dbContext.Agencies.Any(x => x.EAABEFFCNumber == agency.EaabeffcNumber))
+                 throw new AppException("eaabeffcNumber \"" + agency.EaabeffcNumber + "\" already exists");*/
+            if (!string.IsNullOrEmpty(agency.EaabeffcNumber))
             {
-                AgencyName = agency.Name,
-                EAABEFFCNumber = agency.EaabeffcNumber,
-                CompanyRegNumber = agency.RegNo
-            };
-            //a.Id = NewAgencyId();
-            _dbContext.Agencies.Add(a);
-            CreatePerson(agency.User, PersonType.Agent, false, a);
+                var savedAgency = _dbContext.Agencies.Where(x => x.EAABEFFCNumber == agency.EaabeffcNumber).FirstOrDefault();
+                if (savedAgency == null)
+                {
+                    Agency a = new Agency()
+                    {
+                        AgencyName = agency.Name,
+                        EAABEFFCNumber = agency.EaabeffcNumber,
+                        CompanyRegNumber = agency.RegNo
+                    };
+                    _dbContext.Agencies.Add(a);
+                    CreatePerson(agency.User, PersonType.Agent, false, a);
 
-            _dbContext.SaveChanges();
 
-            return a;
+                    return a;
+                }
+                else
+                {
+                    CreatePerson(agency.User, PersonType.Agent, false, savedAgency);
+                    _dbContext.SaveChanges();
+                    return savedAgency;
+                }
+            }
+            else 
+            {
+                CreatePerson(agency.User, PersonType.Agent, false, null);
+                _dbContext.SaveChanges();
+                return null;
+            }
         }
 
         public void CreatePerson(UserDto individual, PersonType personType, bool save, Agency agency)
         [Authorize(Roles = Role.SuperAdmin)]
         public IEnumerable<Individual> GetAllIndividuals()
         {
-            return _dbContext.Individuals;
+            return _dbContext.Individuals.Where(x => x.IsDeleted != true);
         }
 
         public User GetById(int id)
                 //change below to test locally or QA
                 //string url = "http://localhost:8080/#/forgotPasswordReset/" + linkStr;
                 //string url = "http://training.provision-sa.com:122/#/forgotPasswordReset/" + linkStr;
-                string url = "https://www.pvsl.co.za:97/#/forgotPasswordReset/" + linkStr;
+                //string url = "https://www.pvsl.co.za:97/#/forgotPasswordReset/" + linkStr;
+                string url = "https://www.univateproperties.co.za/#/forgotPasswordReset/" + linkStr;
 
                 mailer.ForgotPassword(indiv, url);
             }