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

UnivateProperties_API/Containers/Misc/CarouselList.cs

+using System;
+using UnivateProperties_API.Model.Misc;
+
+namespace UnivateProperties_API.Containers.Misc
+{
+    public class CarouselList : Carousel
+    {
+        public string Address { get; set; }
+        public bool IsProperty { get; set; }
+        public int Bedrooms { get; set; }
+        public int Sleeps { get; set; }
+        public DateTime Arrival { get; set; }
+        public DateTime Departure { get; set; }
+    }
+}

UnivateProperties_API/Controllers/Misc/CarouselController.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
 using System.Transactions;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using UnivateProperties_API.Model.Misc;
-using UnivateProperties_API.Repository;
+using UnivateProperties_API.Repository.Misc;
 
 namespace UnivateProperties_API.Controllers.Misc
 {
     [ApiController]
     public class CarouselController : ControllerBase
     {
-        private readonly IRepository<Carousel> _Repo;
+        private readonly ICarouselRepository _Repo;
 
-        public CarouselController(IRepository<Carousel> repo)
+        public CarouselController(ICarouselRepository repo)
         {
             _Repo = repo;
         }
         [HttpGet]
         public IActionResult Get()
         {
-            return new OkObjectResult(_Repo.GetAll());
+            return new OkObjectResult(_Repo.GetCarouselItems());
         }
 
         [HttpGet("{id}")]

UnivateProperties_API/Repository/Misc/CarouselRepository.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnivateProperties_API.Containers.Misc;
 using UnivateProperties_API.Containers.Property;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.Misc;
 
 namespace UnivateProperties_API.Repository.Misc
 {
-    public class CarouselRepository : IRepository<Carousel>
+    public class CarouselRepository : ICarouselRepository
     {
         private readonly DataContext dBContext;
 
             // Not sure if properties need it
             return 0;
         }
+
+        public List<CarouselList> GetCarouselItems()
+        {
+            List<CarouselList> list = new List<CarouselList>();
+            var CarouselList = dBContext.Carousel.ToList();
+
+            foreach (var item in CarouselList)
+            {
+                if (!string.IsNullOrEmpty(item.Image) && !item.Image.StartsWith("data:image"))
+                    item.Image = ImageFormatter.ImageToBase64(item.Image);
+
+                var carItem = new CarouselList()
+                {
+                    Image = item.Image,
+                    Header = item.Header
+                };
+                if (item.PropertyId > 0)
+                {
+                    var property = dBContext.Properties.Include("Province").Include("City").Include("Suburb").Where(p => p.Id == item.PropertyId).FirstOrDefault();
+                    carItem.Address = string.Format("{0}, {1} <br/>{2}", property.Suburb.Description, property.City.Description, property.AddressLine3);
+                    carItem.IsProperty = true;
+                }
+                if (item.TimeshareId > 0)
+                {
+                    var timeshare = dBContext.Weeks.Where(t => t.Id == item.TimeshareId).FirstOrDefault();
+                    carItem.Bedrooms = timeshare.Bedrooms;
+                    carItem.Sleeps = timeshare.MaxSleep;
+                    carItem.Arrival = timeshare.ArrivalDate;
+                    carItem.Departure = timeshare.DepartureDate;
+                    carItem.IsProperty = false;
+                }
+
+                list.Add(carItem);
+            }
+
+            return list;
+        }
     }
 }

UnivateProperties_API/Repository/Misc/ICarouselRepository.cs

+using System.Collections.Generic;
+using UnivateProperties_API.Containers.Misc;
+using UnivateProperties_API.Model.Misc;
+
+namespace UnivateProperties_API.Repository.Misc
+{
+    public interface ICarouselRepository : IRepository<Carousel>
+    {
+        List<CarouselList> GetCarouselItems();
+    }
+}

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

 
             foreach (string prop in property.GetAllProperties())
             {
-                if (prop != "Item")
+                if (prop != "Item" && prop != "Display")
                     propertyDetails[prop] = property[prop];
             }            
 
             var property = new Property();
             foreach (string prop in property.GetAllProperties())
             {
-                if (prop != "Item")
+                if (prop != "Item" && prop != "Display")
                     property[prop] = item[prop];
             }
 

UnivateProperties_API/Startup.cs

             services.AddTransient<ISearchLogRepository, SearchLogRepository>();
             #endregion
             #region Misc
-            services.AddTransient<IRepository<Carousel>, CarouselRepository>();
+            services.AddTransient<ICarouselRepository, CarouselRepository>();
             #endregion
             services.Configure<MvcOptions>(options =>
             {