Merge branch 'master' of http://192.168.6.188:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Containers/Timeshare/RegionDto.cs

@@ -0,0 +1,21 @@
+namespace UnivateProperties_API.Containers.Timeshare
+{
+    public class RegionDto
+    {
+        public RegionDto()
+        {
+
+        }
+
+        public RegionDto(int id, string regionName, string regionCode)
+        {
+            Id = id;
+            RegionName = regionName;
+            RegionCode = regionCode;
+        }
+
+        public int Id { get; set; }
+        public string RegionName { get; set; }
+        public string RegionCode { get; set; }
+    }
+}

UnivateProperties_API/Containers/Timeshare/ResortDto.cs

@@ -0,0 +1,19 @@
+namespace UnivateProperties_API.Containers.Timeshare
+{
+    public class ResortDto
+    {
+        public ResortDto()
+        {
+
+        }
+
+        public ResortDto(string resortCode, string resortName)
+        {
+            ResortCode = resortCode;
+            ResortName = resortName;
+        }
+
+        public string ResortCode { get; set; }
+        public string ResortName { get; set; }
+    }
+}

UnivateProperties_API/Containers/Timeshare/StatusDto.cs

@@ -0,0 +1,25 @@
+namespace UnivateProperties_API.Containers.Timeshare
+{
+    public class StatusDto
+    {
+        public StatusDto()
+        {
+
+        }
+
+        public StatusDto(int id, string code, string description)
+        {
+            Id = id;
+            Code = code;
+            Description = description;
+        }
+
+        public int Id { get; set; }
+        public string Code { get; set; }
+        public string Description { get; set; }
+        public override string ToString()
+        {
+            return $"{Code} - {Description}";
+        }
+    }
+}

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -0,0 +1,49 @@
+using System;
+using UnivateProperties_API.Model.Timeshare;
+
+namespace UnivateProperties_API.Containers.Timeshare
+{
+    public class WeekDto
+    {
+        public WeekDto()
+        {
+
+        }
+
+        public WeekDto(TimeshareWeek week)
+        {
+            Id = week.Id;
+            AgentAsRep = week.AgentAsRep;
+            OtherResort = week.OtherResort;
+            Resort = new ResortDto(week.ResortCode, week.ResortName);
+            Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Description, week.Region?.Code);
+            Status = new StatusDto(week.Status.Id, week.Status.Code, week.Status.Description);
+            Bedrooms = week.Bedrooms;
+            MaxSleep = week.MaxSleep;
+            UnitNumber = week.UnitNumber;
+            WeekNumber = week.WeekNumber;
+            LevyAmount = week.LevyAmount;
+            CurrentYearBanked = week.CurrentYearBanked;
+            ArrivalDate = week.ArrivalDate;
+            DepartureDate = week.DepartureDate;
+            SellPrice = week.SellPrice;
+        }
+
+        public int Id { get; set; }
+        public bool AgentAsRep { get; set; }
+        public bool OtherResort { get; set; }
+        public ResortDto Resort { get; set; }
+        public RegionDto Region { get; set; }
+        public StatusDto Status { get; set; }
+        public int Bedrooms { get; set; }
+        public int MaxSleep { get; set; }
+        public string UnitNumber { get; set; }
+        public string WeekNumber { get; set; }
+        public double LevyAmount { get; set; }
+        public bool CurrentYearBanked { get; set; }
+        public string BankedWith { get; set; }
+        public DateTime ArrivalDate { get; set; }
+        public DateTime DepartureDate { get; set; }
+        public double SellPrice { get; set; }
+    }
+}

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -24,7 +24,7 @@ namespace UnivateProperties_API.Controllers.Timeshare
         [HttpGet]
         public IActionResult Get()
         {
-            var items = _Repo.GetAll();
+            var items = (_Repo as WeekRepository).GetDtoListAll();
             return new OkObjectResult(items);
         }
 

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -29,57 +29,67 @@ namespace UnivateProperties_API.Repository.Timeshare
             return _dbContext.Weeks.ToList();
         }
 
-        private TimeshareWeek GetWeekDetailed(TimeshareWeek week)
-        {
-            // Get Agent
-            if(week.AgentId != 0 && week.Agent == null)
-            {
-                AgentRepository agentRepo = new AgentRepository(_dbContext);
-                week.Agent = agentRepo.GetDetailed(x => x.Id == week.AgentId);
-            }
-            // Get Agency
-            if(week.AgencyId != 0 && week.Agency == null)
-            {
-                AgencyRepository agencyRepo = new AgencyRepository(_dbContext);
-                week.Agency = agencyRepo.GetDetailed(x => x.Id == week.AgencyId);
-            }
-            // Get Region
-            if(week.RegionId != 0 && week.Region == null)
-            {
-                ProvinceRepository provinceRepo = new ProvinceRepository(_dbContext);
-                week.Region = provinceRepo.GetDetailed(x => x.Id == week.RegionId);
-            }
-            // Get Status
-            if(week.StatusId != 0 && week.Status == null)
-            {
-                StatusRepository statusRepo = new StatusRepository(_dbContext);
-                week.Status = statusRepo.GetDetailed(x => x.Id == week.StatusId);
-            }
-
-            return week;
-        }
-
         public TimeshareWeek GetDetailed(Func<TimeshareWeek, bool> first)
         {
             var item = _dbContext.Weeks.FirstOrDefault(first);
-            item = GetWeekDetailed(item);
+            item = GetDetailedWeek(item);
             return item;
         }
 
+        public List<WeekDto> GetDtoListAll()
+        {
+            List<WeekDto> list = new List<WeekDto>();
+            foreach(var item in GetDetailedAll())
+            {
+                list.Add(new WeekDto(item));
+            }
+            return list;
+        }
+
         public List<TimeshareWeek> GetDetailedAll()
         {
             var list = GetAll();
             List<TimeshareWeek> weeklist = new List<TimeshareWeek>();
             foreach(var item in list)
             {
-                weeklist.Add(GetWeekDetailed(item));
+                weeklist.Add(GetDetailedWeek(item));
             }
             return weeklist;
         }
 
+        private TimeshareWeek GetDetailedWeek(TimeshareWeek week)
+        {
+            if(week.AgencyId != null)
+            {
+                AgencyRepository agency = new AgencyRepository(_dbContext);
+                week.Agency = agency.Get(x => x.Id == week.AgencyId).FirstOrDefault();
+            }
+            if(week.AgentId != null)
+            {
+                AgentRepository agent = new AgentRepository(_dbContext);
+                week.Agent = agent.Get(x => x.Id == week.AgentId).FirstOrDefault();
+            }
+            if (week.StatusId != 0)
+            {
+                StatusRepository status = new StatusRepository(_dbContext);
+                week.Status = status.Get(x => x.Id == week.StatusId).FirstOrDefault();
+            }
+            if (week.RegionId != 0)
+            {
+                ProvinceRepository province = new ProvinceRepository(_dbContext);
+                week.Region = province.Get(x => x.Id == week.RegionId).FirstOrDefault();
+            }
+            if (week.OwnerId != 0)
+            {
+                IndividualRepository individual = new IndividualRepository(_dbContext);
+                week.Owner = individual.Get(x => x.Id == week.OwnerId).FirstOrDefault();
+            }
+            return week;
+        }
+
         public void Insert(TimeshareWeek item)
         {
-            item = GetWeekDetailed(item);
+            item = GetDetailedWeek(item);
             // Set starting Status of A1
             StatusRepository repo = new StatusRepository(_dbContext);
             item.Status = repo.GetDetailed(s => s.Code == "A1");

UnivateProperties_API/Startup.cs

@@ -164,7 +164,7 @@ namespace UnivateProperties_API
             {
                 using (var context = serviceScope.ServiceProvider.GetService<DataContext>())
                 {
-                    context.Database.Migrate();
+                    //context.Database.Migrate();
                 }
             }
         }