Janneke testing feedback

UnivateProperties_API/Containers/ProcessFlow/BidItemDisplay.cs

@@ -1,4 +1,7 @@
-namespace UnivateProperties_API.Containers.ProcessFlow
+using System;
+using UnivateProperties_API.Model.ProcessFlow;
+
+namespace UnivateProperties_API.Containers.ProcessFlow
 {
     public class BidItemDisplay
     {
@@ -8,15 +11,22 @@
         public string ShortDescription { get; set; }
         public string Description { get; set; }
         public string Resort { get; set; }
-        public string Unit { get; set; }
-        public string Module { get; set; }
+        public string UnitNumber { get; set; }
+        public string WeekNumber { get; set; }
         public string StatusCode { get; set; }
         public string Status { get; set; }
         public decimal Price { get; set; }
         public decimal Offer { get; set; }
         public string MadeBy { get; set; }
+        public DateTime Date { get; set; }
         public string Comment { get; set; }
         public string DeclineReason { get; set; }
+        public decimal SellPrice { get; set; }
         #endregion 
     }
+
+    public class BidItemNew : BidItem
+    {
+        public int UserId { get; set; }
+    }
 }

UnivateProperties_API/Containers/Timeshare/TimeshareSearchDisplay.cs

@@ -6,7 +6,8 @@ namespace UnivateProperties_API.Containers.Timeshare
     {
         public string UserName { get; set; }
         public string Type { get; set; }
-        public DateTime Date { get; set; }
+        public string Date { get; set; }
+        public string Time { get; set; }
         public string Property { get; set; }
         public string Value { get; set; }
     }

UnivateProperties_API/Controllers/ProcessFlow/BidController.cs

@@ -39,12 +39,19 @@ namespace UnivateProperties_API.Controllers.ProcessFlow
             return new OkObjectResult(items);
         }
 
+        [HttpGet("GetBidDetails/{id}")]
+        public IActionResult GetBidDetail(int id)
+        {
+            var item = _Repo.GetDispaly(id);
+            return new OkObjectResult(item);
+        }
+
         [HttpPost]
-        public IActionResult Post([FromBody] BidItem item)
+        public IActionResult Post([FromBody] BidItemNew item)
         {
             using (var scope = new TransactionScope())
             {
-                _Repo.Insert(item);
+                _Repo.InsertNew(item);
                 scope.Complete();
                 return CreatedAtAction(nameof(Get), new { id = item.Id }, item);
             }

UnivateProperties_API/Model/Properties/PropertyType.cs

@@ -1,10 +1,21 @@
-namespace UnivateProperties_API.Model.Properties
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace UnivateProperties_API.Model.Properties
 {
     public class PropertyType : BaseEntity
     {
         #region Properties 
         public string Description { get; set; }
         public PropertyUsageType UsageType { get; set; }
+
+        [NotMapped]
+        public string PropertyUsageType
+        {
+            get
+            {
+                return UsageType.ToString();
+            }
+        }
         #endregion 
     }
 }

UnivateProperties_API/Model/Properties/UserDefinedGroup.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace UnivateProperties_API.Model.Properties
 {
@@ -10,6 +11,15 @@ namespace UnivateProperties_API.Model.Properties
         public int Rank { get; set; }
 
         public ICollection<UserDefinedField> Fields { get; set; }
+
+        [NotMapped]
+        public string PropertyUsageType
+        {
+            get
+            {
+                return UsageType.ToString();
+            }
+        }
         #endregion 
     }
 }

UnivateProperties_API/Repository/Logging/SearchLogRepository.cs

@@ -49,7 +49,8 @@ namespace UnivateProperties_API.Repository.Logging
             {
                 var searchObject = JsonConvert.DeserializeObject<SearchObject>(log.Search);
                 list.Add(new SearchDisplay() {
-                    Date = log.Created,
+                    Date = string.Format("{0:yyyy-MM-dd}", log.Created),
+                    Time = string.Format("{0:HH:mm:ss}", log.Created),
                     Type = log.Type,
                     UserName = searchObject.UserName,
                     Property = searchObject.Property,

UnivateProperties_API/Repository/ProccessFlow/BidRepository.cs

@@ -6,7 +6,6 @@ using UnivateProperties_API.Containers.ProcessFlow;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model;
-using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Model.ProcessFlow;
 using UnivateProperties_API.Repository.Communication;
 using UnivateProperties_API.Repository.Timeshare;
@@ -75,42 +74,8 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             List<BidItemDisplay> list = new List<BidItemDisplay>();
             foreach (BidItem item in bids)
             {
-                BidItemDisplay bid = new BidItemDisplay()
-                {
-                    Id = item.Id,
-                    Offer = (decimal)item.Amount,
-                    Comment = item.Comment,
-                    DeclineReason = item.DeclinedReason
-                };
-
-                if (item.PropertyId != null)
-                {
-                    bid.Type = "Property";
-                    bid.ShortDescription = item.Property.ShortDescription;
-                    bid.Description = item.Property.Description;
-                    bid.Price = item.Property.Price;
-                }
-                if (item.TimeshareWeekId != null)
-                {
-                    bid.Type = "Timeshare";
-                    bid.ShortDescription = string.Format("{0} {1} {2}", item.TimeshareWeek.ResortCode, item.TimeshareWeek.WeekNumber, item.TimeshareWeek.UnitNumber);
-                    bid.Price = (decimal)item.TimeshareWeek.SellPrice;
-                    bid.Resort = item.TimeshareWeek.ResortName;
-                    bid.Unit = item.TimeshareWeek.UnitNumber;
-                    bid.Module = item.TimeshareWeek.Module;
-                }
-                if (item.Status != null)
-                {
-                    bid.StatusCode = item.Status.Code;
-                    bid.Status = string.Format("{0} - {1}", item.Status.Code, item.Status.Description);
-                }
-                if (item.BidMaker != null)
-                    bid.MadeBy = item.BidMaker.Name + " " + item.BidMaker.Surname;
-
-                bid.MadeBy = "Bob";
-
+                BidItemDisplay bid = BidItemDisplay(item);
                 list.Add(bid);
-
             }
             return list;
         }
@@ -158,6 +123,91 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             }
         }
 
+        public void InsertNew(BidItemNew item)
+        {            
+            var week = _dbContext.Weeks.Include("Owner").Where(x => x.Id == item.TimeshareWeekId).FirstOrDefault();
+            var property = _dbContext.Properties.Include("Owner").Where(x => x.Id == item.PropertyId).FirstOrDefault();
+            BidItem bid = new BidItem();
+
+            foreach (string prop in bid.GetAllProperties())
+            {
+                if (prop != "Item" && prop != "Display")
+                    bid[prop] = item[prop];
+            }
+            
+            var status = _dbContext.Status.Where(x => x.Code == "E1").FirstOrDefault();
+            if (status != null)            
+                bid.StatusId = status.Id;
+
+            var individual = _dbContext.Individuals.Where(i => i.UserId == item.UserId).FirstOrDefault();
+            if (individual != null)
+                bid.BidMakerId = individual.Id;
+
+            if (!(bid.TimeshareWeek == null && week == null))
+            {
+                if (week == null && bid.TimeshareWeek != null)
+                {
+                    MyCommon.PostToConsoft(bid.TimeshareWeek);
+                    WeekRepository weekRepository = new WeekRepository(_dbContext);
+                    weekRepository.Insert(bid.TimeshareWeek);
+                }
+                
+                List<BaseEntity> list = new List<BaseEntity>() { bid, week, week.Owner };
+
+                if (bid.TimeshareWeekId != null)
+                {
+                    if (week != null)
+                    {
+                        TemplateRepository templateRepository = new TemplateRepository(_dbContext);
+                        var template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekOfferMade-Owner");
+                        if (template != null)
+                        {
+                            templateRepository.SendEmailTemplate(template, week.Owner, list);
+                        }
+                        template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekOfferMade-User");
+                        if (template != null)
+                        {
+                            var bidMaker = _dbContext.Individuals.FirstOrDefault(x => x.Id == bid.BidMakerId);
+                            if (bidMaker != null)
+                            {
+                                templateRepository.SendEmailTemplate(template, bidMaker, list);
+                            }
+                        }
+                    }
+                }
+                                    
+                _dbContext.Add(bid);
+                Save();
+            }
+            else
+            {                
+                List<BaseEntity> list = new List<BaseEntity>() { bid, property, property.Owner };                    
+                if (bid.PropertyId != null)
+                {
+                    if (property != null)
+                    {
+                        TemplateRepository templateRepository = new TemplateRepository(_dbContext);
+                        var template = _dbContext.Templates.FirstOrDefault(x => x.Name == "PropertyOfferMade-Owner");
+                        if (template != null)
+                        {
+                            templateRepository.SendEmailTemplate(template, property.Owner, list);
+                        }
+                        template = _dbContext.Templates.FirstOrDefault(x => x.Name == "PropertyOfferMade-User");
+                        if (template != null)
+                        {
+                            if (individual != null)
+                            {
+                                templateRepository.SendEmailTemplate(template, individual, list);
+                            }
+                        }
+                    }
+                }
+                
+                _dbContext.Add(bid);
+                Save();
+            }
+        }
+
         public void Insert(IEnumerable<BidItem> items)
         {
             foreach (var item in items)
@@ -259,5 +309,58 @@ namespace UnivateProperties_API.Repository.ProccessFlow
             // Not sure if properties need it
             return 0;
         }
+
+        public BidItemDisplay GetDispaly(int id)
+        {
+            var bid = _dbContext.BidItems
+                .Include("Property")
+                .Include("TimeshareWeek")
+                .Include("BidMaker")
+                .Include("Status")
+                .Where(x => x.Id == id).FirstOrDefault();
+            return BidItemDisplay(bid);
+        }
+
+        private BidItemDisplay BidItemDisplay(BidItem item)
+        {
+            if (item == null)
+                return null;
+
+            BidItemDisplay bid = new BidItemDisplay()
+            {
+                Id = item.Id,
+                Offer = (decimal)item.Amount,
+                Comment = item.Comment,
+                DeclineReason = item.DeclinedReason
+            };
+
+            if (item.PropertyId != null)
+            {
+                bid.Type = "Property";
+                bid.ShortDescription = item.Property.ShortDescription;
+                bid.Description = item.Property.Description;
+                bid.Price = item.Property.Price;
+            }
+            if (item.TimeshareWeekId != null)
+            {
+                bid.Type = "Timeshare";
+                bid.ShortDescription = string.Format("{0} {1} {2}", item.TimeshareWeek.ResortCode, item.TimeshareWeek.WeekNumber, item.TimeshareWeek.UnitNumber);
+                bid.SellPrice = (decimal)item.TimeshareWeek.SellPrice;
+                bid.Resort = item.TimeshareWeek.ResortName;
+                bid.UnitNumber = item.TimeshareWeek.UnitNumber;
+                bid.WeekNumber = item.TimeshareWeek.Module;
+            }
+            if (item.Status != null)
+            {
+                bid.StatusCode = item.Status.Code;
+                bid.Status = string.Format("{0} - {1}", item.Status.Code, item.Status.Description);
+            }
+            if (item.BidMaker != null)
+                bid.MadeBy = (item.BidMaker.Name + " " + item.BidMaker.Surname).Trim();
+
+            bid.Date = item.Created;
+
+            return bid;
+        }
     }
 }

UnivateProperties_API/Repository/ProccessFlow/IBidRepository.cs

@@ -13,5 +13,7 @@ namespace UnivateProperties_API.Repository.ProccessFlow
         List<BidItemDisplay> GetMyBid(Func<BidItem, bool> where);
         BidItemDisplay AcceptBid(int id);
         BidItemDisplay DecineBid(BitItemDecline item);
+        void InsertNew(BidItemNew item);
+        BidItemDisplay GetDispaly(int id);
     }
 }

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -372,6 +372,10 @@ namespace UnivateProperties_API.Repository.Properties
                 //Property ID search will override other searches. 
                 if (search.PropertyId > 0)
                 {
+                    obj.Property = "PropertyID";
+                    obj.Value = search.PropertyId.ToString();
+                    SaveLog(obj);
+
                     props = dBContext.Properties.Where(p => p.Id == search.PropertyId).ToList();
                     return GetDisplayDetails(props);
                 }