Added Province to Detailed Address and made changes to Individual

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedAddress.cs

@@ -9,13 +9,14 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
 
         }
 
-        public DetailedAddress(int id, string streetNumber, string street, string suburb, string city, string postalCode)
+        public DetailedAddress(int id, string streetNumber, string street, string suburb, string city, string postalCode, string province)
         {
             Id = id;
             StreetNumber = streetNumber;
             Street = street;
             Suburb = suburb;
             City = city;
+            Province = province;
             PostalCode = postalCode;
         }
 
@@ -26,6 +27,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             Street = address.Street;
             Suburb = address.Suburb;
             City = address.City;
+            Province = address.Province;
             PostalCode = address.PostalCode;
         }
 
@@ -34,6 +36,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
         public string Street { get; set; } = "";
         public string Suburb { get; set; } = "";
         public string City { get; set; } = "";
+        public string Province { get; set; } = "";
         public string PostalCode { get; set; } = "";
     }
 }

UnivateProperties_API/Controllers/Users/IndividualController.cs

@@ -1,5 +1,6 @@
 using System.Transactions;
 using Microsoft.AspNetCore.Mvc;
+using UnivateProperties_API.Containers.Timeshare.Detailed;
 using UnivateProperties_API.Model.Users;
 using UnivateProperties_API.Repository;
 using UnivateProperties_API.Repository.Users;
@@ -27,7 +28,7 @@ namespace User_API.Controllers
         //Gets data from DB by Id
         [HttpGet("{id}")]
         public IActionResult Get(int id)
-        {
+        {            
             return new OkObjectResult(_Repo.Get(x => x.Id == id));
         }
 
@@ -43,15 +44,14 @@ namespace User_API.Controllers
             return new OkObjectResult((_Repo as IndividualRepository).GetAllIndividuals());
         }
 
-        //Updates to DB
         [HttpPut()]
-        public IActionResult Put([FromBody] Individual individual)
+        public IActionResult Put([FromBody]DetailedOwner owner)
         {
-            if (individual != null)
+            if (owner != null)
             {
                 using (var scope = new TransactionScope())
                 {
-                    _Repo.Update(individual);
+                    (_Repo as IndividualRepository).Update(owner);
                     scope.Complete();
                     return new OkResult();
                 }

UnivateProperties_API/Model/Misc/Address.cs

@@ -10,6 +10,7 @@ namespace UnivateProperties_API.Model.Misc
         public string Suburb { get; set; }
         public string City { get; set; }
         public string PostalCode { get; set; }
+        public string Province { get; set; }
         [ForeignKey("Owner")]
         public int? OwnerId { get; set; }
 

UnivateProperties_API/Model/Users/Individual.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Containers.Timeshare.Detailed;
 using UnivateProperties_API.Model.Banks;
 using UnivateProperties_API.Model.Misc;
 using UnivateProperties_API.Model.Properties;
@@ -14,6 +15,7 @@ namespace UnivateProperties_API.Model.Users
         {
 
         }
+
         #endregion Constructor
 
         #region Properties
@@ -29,5 +31,67 @@ namespace UnivateProperties_API.Model.Users
         public virtual BankAccount BankAccount { get; set; }
         public virtual ICollection<Property> Properties { get; set; }
         #endregion Properties
+
+        #region Methods
+        public void UpdateFromDetailedOwner(DetailedOwner owner)
+        {
+            if (owner.Id == Id)
+            {
+                Name = owner.Name;
+                Surname = owner.Surname;
+                IdNumber = owner.IdNumber;
+                CompanyRegNumber = owner.CompanyRegNumber;
+                MaritalStatus = owner.MaritalStatus;
+                Email = owner.EmailAddress;
+                CellNumber = owner.CellNumber;
+                Telephone = owner.LandlineNumber;
+
+                if (owner.Address != null)
+                {
+                    if (Address == null)
+                    {
+                        Address = new Address()
+                        {
+                            StreetNumber = owner.Address.StreetNumber,
+                            Street = owner.Address.Street,
+                            City = owner.Address.City,
+                            Suburb = owner.Address.Suburb,
+                            Province = owner.Address.Province,
+                            PostalCode = owner.Address.PostalCode
+                        };
+                    }
+                    else
+                    {
+                        Address.StreetNumber = owner.Address.StreetNumber;
+                        Address.Street = owner.Address.Street;
+                        Address.City = owner.Address.City;
+                        Address.Suburb = owner.Address.Suburb;
+                        Address.Province = owner.Address.Province;
+                        Address.PostalCode = owner.Address.PostalCode;
+                    }
+
+                }
+
+                if (owner.BankingDetails != null)
+                {
+                    if (BankAccount == null)
+                    {
+                        BankAccount = new BankAccount()
+                        {
+                            BankId = owner.BankingDetails.BankId,
+                            AccountNumber = owner.BankingDetails.AccountNumber,
+                            AccountHolder = owner.BankingDetails.AccountHolder
+                        };
+                    }
+                    else
+                    {
+                        BankAccount.BankId = owner.BankingDetails.BankId;
+                        BankAccount.AccountNumber = owner.BankingDetails.AccountNumber;
+                        BankAccount.AccountHolder = owner.BankingDetails.AccountHolder;
+                    }
+                }
+            }
+        }
+        #endregion Methods
     }
 }

UnivateProperties_API/Repository/Users/IndividualRepository.cs

@@ -25,7 +25,7 @@ namespace UnivateProperties_API.Repository.Users
 
         public List<Individual> GetAll()
         {
-            foreach(var item in _dbContext.Individuals.Include("User").ToList())
+            foreach(var item in _dbContext.Individuals.Include("User").Include("Address").Include("BankAccount").ToList())
             {
                 var list = MyCommon.GetVisibleColumns(item);
             }
@@ -58,7 +58,7 @@ namespace UnivateProperties_API.Repository.Users
 
         public DetailedOwner GetIndividual(int id)
         {
-            var item = _dbContext.Individuals.FirstOrDefault(x => x.UserId == id);
+            var item = _dbContext.Individuals.Include("Address").Include("BankAccount").FirstOrDefault(x => x.UserId == id);
             if(item != null)
             {
                 return new DetailedOwner(item);
@@ -124,6 +124,18 @@ namespace UnivateProperties_API.Repository.Users
             Save();
         }
 
+        public void Update(DetailedOwner item)
+        {
+            var individual = _dbContext.Individuals.Include("Address").Include("BankAccount").FirstOrDefault(x => x.Id == item.Id);
+            if (individual != null)
+            {
+                individual.UpdateFromDetailedOwner(item);
+            }
+            _dbContext.Entry(individual).State = EntityState.Modified;
+            Save();
+        }
+
+
         public void Save()
         {
             _dbContext.SaveChanges();