Email , User & timeshare edits

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs

@@ -29,34 +29,34 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             switch (individual.HowMarried)
             {
                 case MarriedType.NotApplicable:
-                    HowMarried = "N/A";
+                    HowMarried = 0;
                     break;
                 case MarriedType.ICOP:
-                    HowMarried = "In Community Of Property";
+                    HowMarried = 1;
                     break;
                 case MarriedType.OCOP:
-                    HowMarried = "Out of Community Of Property";
+                    HowMarried = 2;
                     break;
                 case MarriedType.Other:
-                    HowMarried = "Other";
+                    HowMarried = 3;
                     break;
                 case MarriedType.Traditional:
-                    HowMarried = "Traditional Wedding";
+                    HowMarried = 4;
                     break;
                 case MarriedType.Single:
-                    HowMarried = "Single";
+                    HowMarried = 5;
                     break;
                 case MarriedType.Divorced:
-                    HowMarried = "Divorced";
+                    HowMarried = 6;
                     break;
                 case MarriedType.Widow:
-                    HowMarried = "Widow";
+                    HowMarried = 7;
                     break;
                 case MarriedType.CommittedRelationship:
-                    HowMarried = "Committed Relationship";
+                    HowMarried = 8;
                     break;
                 case MarriedType.Partner:
-                    HowMarried = "Partner";
+                    HowMarried = 9;
                     break;
             }
             User = individual.User;
@@ -94,7 +94,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
         public string EmailAddress { get; set; }
         public string CellNumber { get; set; }
         public string LandlineNumber { get; set; }  
-        public string HowMarried { get; set; }
+        public int HowMarried { get; set; }
         public string SpouseName { get; set; }
         public string SpouseSurname { get; set; }        
         public string SpouseEmail { get; set; }        

UnivateProperties_API/Containers/Users/Simple/SimplePersonDto.cs

@@ -2,6 +2,7 @@
 {
     public class SimplePersonDto
     {
+        public int? Id { get; set; }
         public string Name { get; set; }
         public string Surname { get; set; }
         public string FullName 

UnivateProperties_API/Controllers/Users/RegisterController.cs

@@ -77,9 +77,9 @@ namespace UnivateProperties_API.Controllers.Users
                 // return basic user info (without password) and token to store client side
                 return Ok(item);
             }
-            catch(Exception)
+            catch(Exception ex)
             {
-                return new UnauthorizedResult();
+                return StatusCode(401, ex);
             }
             
         }

UnivateProperties_API/Model/Users/Individual.cs

@@ -105,35 +105,35 @@ namespace UnivateProperties_API.Model.Users
                     User.LoginPasswordChange = owner.User.LoginPasswordChange;
                 }
 
-                if (owner.HowMarried != "0")
+                if (owner.HowMarried != 0)
                 {
                     switch (owner.HowMarried)
                     {
-                        case "1":
+                        case 1:
                             HowMarried = MarriedType.ICOP;
                             break;
-                        case "2":
+                        case 2:
                             HowMarried = MarriedType.OCOP;
                             break;
-                        case "3":
+                        case 3:
                             HowMarried = MarriedType.Other;
                             break;
-                        case "4":
+                        case 4:
                             HowMarried = MarriedType.Traditional;
                             break;
-                        case "5":
+                        case 5:
                             HowMarried = MarriedType.Single;
                             break;
-                        case "6":
+                        case 6:
                             HowMarried = MarriedType.Divorced;
                             break;
-                        case "7":
+                        case 7:
                             HowMarried = MarriedType.Widow;
                             break;
-                        case "8":
+                        case 8:
                             HowMarried = MarriedType.CommittedRelationship;
                             break;
-                        case "9":
+                        case 9:
                             HowMarried = MarriedType.Partner;
                             break;
                     }
@@ -141,7 +141,11 @@ namespace UnivateProperties_API.Model.Users
                     SpouseSurname = owner.SpouseSurname;
                     SpouseCellnumber = owner.SpouseCellnumber;
                     SpouseTelephone = owner.SpouseTelephone;
-                    SpouseEmail = owner.SpouseEmail;                    
+                    SpouseEmail = owner.SpouseEmail;
+                }
+                else 
+                {
+                    HowMarried = MarriedType.NotApplicable;
                 }
             }
         }

UnivateProperties_API/Repository/Communication/MailRepository.cs

@@ -299,7 +299,7 @@ namespace UnivateProperties_API.Repository.Communication
             {
                 MailMessage mail = new MailMessage();
                 mail.To.Add(toList);
-                mail.Subject = "Uni-Vate - Password Reset Request";
+                mail.Subject = "Uni-Vate - Week Loaded by Agent";
                 mail.Body = body;
                 mail.IsBodyHtml = true;
                 mail.BodyEncoding = Encoding.ASCII;
@@ -345,7 +345,7 @@ namespace UnivateProperties_API.Repository.Communication
             {
                 MailMessage mail = new MailMessage();
                 mail.To.Add(toList);
-                mail.Subject = "Uni-Vate - Password Reset Request";
+                mail.Subject = "Uni-Vate - Week Loaded";
                 mail.Body = body;
                 mail.IsBodyHtml = true;
                 mail.BodyEncoding = Encoding.ASCII;

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -820,7 +820,12 @@ namespace UnivateProperties_API.Repository.Timeshare
         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 address = new Model.Misc.Address();
+            if (sellItem.OwnerObject.Address != null) 
+            {
+                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();
             var agent = _dbContext.Agents.Where(ag => ag.Id == sellItem.AgentId).FirstOrDefault();
@@ -903,7 +908,7 @@ namespace UnivateProperties_API.Repository.Timeshare
                 owner.Telephone = sellItem.OwnerObject.LandlineNumber;
                 sellItem.DisplayOwner = owner.Name + " " + owner.Surname;
 
-                switch (sellItem.OwnerObject.MaritalStatus.ToUpper())
+                switch (sellItem.OwnerObject.MaritalStatus?.ToUpper())
                 {
                     case "N/A":
                         owner.HowMarried = MarriedType.NotApplicable;
@@ -996,14 +1001,14 @@ namespace UnivateProperties_API.Repository.Timeshare
                 {
                     if (template != null)
                     {
-                        //mailRepository.WeekLoadedOwner(sellItem);
+                        mailRepository.WeekLoadedOwner(sellItem);
                         //templateRepository.SendEmailTemplateWeek(template, owner, sellItem);
                     }
-                    template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-UV");
+                    /*template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-UV");
                     if (template != null)
                     {
                         templateRepository.SendEmailTemplate(template, sellItem.Owner, new List<BaseEntity>() { sellItem, sellItem.Owner });
-                    }
+                    }*/
 
                 }
             }

UnivateProperties_API/Repository/Users/AgentRepository.cs

@@ -59,10 +59,9 @@ namespace UnivateProperties_API.Repository.Users
                     }
                     item.Id = 0;
                     _dbContext.Agents.Add(item);
-                    if (item.User.Role != user.Role)
-                    {
-                        user.Role = item.User.Role;
-                    }
+                    
+                     user.Role = item.User.Role;
+                    
                     _dbContext.Users.Update(user);
 
                 }
@@ -181,7 +180,11 @@ namespace UnivateProperties_API.Repository.Users
 
         public void Update(Agent item)
         {
+            //var savedAgent = _dbContext.Agents.Where(x => x.Id == item.Id).FirstOrDefault();
+
+            
             _dbContext.Entry(item).State = EntityState.Modified;
+            _dbContext.Entry(item.User).State = EntityState.Modified;
             Save();
         }
 

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -356,6 +356,7 @@ namespace UnivateProperties_API.Repository.Users
                 {
                     return new SimplePersonDto()
                     {
+                        Id = individual.Id,
                         Name = agent.Name,
                         Surname = agent.Surname,
                         Email = agent.Email
@@ -370,6 +371,7 @@ namespace UnivateProperties_API.Repository.Users
             {
                 return new SimplePersonDto()
                 {
+                    Id = individual.Id,
                     Name = individual.Name,
                     Surname = individual.Surname,
                     Email = individual.Email
@@ -428,9 +430,9 @@ namespace UnivateProperties_API.Repository.Users
 
                 //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 = "http://training.provision-sa.com:122/#/forgotPasswordReset/" + linkStr;
                 //string url = "https://www.pvsl.co.za:97/#/forgotPasswordReset/" + linkStr;
-                string url = "https://www.univateproperties.co.za/#/forgotPasswordReset/" + linkStr;
+                //string url = "https://www.univateproperties.co.za/#/forgotPasswordReset/" + linkStr;
 
                 mailer.ForgotPassword(indiv, url);
             }

UnivateProperties_API/appsettings.json

@@ -9,7 +9,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
+    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;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",