Added getNeedApproval

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedAddress.cs

@@ -30,10 +30,10 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
         }
 
         public int Id { get; set; }
-        public string StreetNumber { get; set; }
-        public string Street { get; set; }
-        public string Suburb { get; set; }
-        public string City { get; set; }
-        public string PostalCode { get; set; }
+        public string StreetNumber { get; set; } = "";
+        public string Street { get; set; } = "";
+        public string Suburb { get; set; } = "";
+        public string City { get; set; } = "";
+        public string PostalCode { get; set; } = "";
     }
 }

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedBankDetails.cs

@@ -27,7 +27,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
 
         public int Id { get; set; }
         public int? BankId { get; set; }
-        public string AccountHolder { get; set; }
-        public string AccountNumber { get; set; }
+        public string AccountHolder { get; set; } = "";
+        public string AccountNumber { get; set; } = "";
     }
 }

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedOwner.cs

@@ -6,7 +6,8 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
     {
         public DetailedOwner()
         {
-
+            BankingDetails = new DetailedBankDetails();
+            Address = new DetailedAddress();
         }
 
         public DetailedOwner(Individual individual)
@@ -22,12 +23,12 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             LandlineNumber = individual.Telephone;
             if (individual.Address != null)
             {
-                Address = new DetailedAddress(individual.Address);
+                Address = individual.Address != null ? new DetailedAddress(individual.Address) : new DetailedAddress();
             }
             else Address = new DetailedAddress();
             if (BankingDetails != null)
             {
-                BankingDetails = new DetailedBankDetails(individual.BankAccount);
+                BankingDetails = individual.BankAccount != null ? new DetailedBankDetails(individual.BankAccount) : new DetailedBankDetails();
             }
             else BankingDetails = new DetailedBankDetails();
         }

UnivateProperties_API/Containers/Timeshare/Detailed/DetailedWeekDto.cs

@@ -7,7 +7,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
     {
         public DetailedWeekDto()
         {
-
+            Owner = new DetailedOwner();
         }
 
         public DetailedWeekDto(TimeshareWeek week)
@@ -41,7 +41,7 @@ namespace UnivateProperties_API.Containers.Timeshare.Detailed
             AgentCommission = week.AgentCommision;
             Mandate = week.Mandate;
             Status = week.Status.Display;
-            Owner = new DetailedOwner(week.Owner);
+            Owner = week.Owner != null ? new DetailedOwner(week.Owner) : new DetailedOwner();
         }
 
         public int Id { get; set; }

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -54,6 +54,17 @@ namespace UnivateProperties_API.Controllers.Timeshare
             else return new OkResult();
         }
 
+        [HttpGet("getNeedApproval")]
+        public IActionResult GetNeedApproval()
+        {
+            if (_Repo is WeekRepository)
+            {
+                var item = (_Repo as WeekRepository).GetNeedApproval();
+                return new OkObjectResult(item);
+            }
+            else return new OkResult();
+        }
+
         [HttpGet("getBy")]
         public IActionResult GetBy(WeekFilterDto week)
         {

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -377,5 +377,17 @@ namespace UnivateProperties_API.Repository.Timeshare
                     return value;
             }
         }
+
+        public List<DetailedWeekDto> GetNeedApproval()
+        {
+            List<DetailedWeekDto> detList = new List<DetailedWeekDto>();
+            var status = _dbContext.Status.FirstOrDefault(x => x.Code == "A1" && x.StatusType == StatusType.Timeshare);
+            if(status != null)
+            {
+                var list = GetDetailedAll().Where(x => x.Status != null && x.Status.Id == status.Id).ToList();
+                list.ForEach(x => detList.Add(new DetailedWeekDto(x)));
+            }
+            return detList;
+        }
     }
 }