Timeshare Sell & Property Listing Fix

UnivateProperties_API/Containers/Property/PropertyContainer.cs

@@ -16,6 +16,7 @@ namespace UnivateProperties_API.Containers.Property
         public decimal OldPrice { get; set; }        
         public string OldStatus { get; set; }
         public string CutOffDisplayDateString { get; set; }
+        public string StatusCode { get; set; }
         public List<NewImage> NewImages { get; set; }
         public List<PropertyFieldGroup> PropertyOverviewFields { get; set; }
         public List<PropertyFieldGroup> PropertyFields { get; set; }

UnivateProperties_API/Migrations/20210628145251_dotNet5Update.cs

@@ -0,0 +1,17 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class dotNet5Update : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -133,9 +133,10 @@ namespace UnivateProperties_API.Repository.Properties
             else
             {
                 if (!string.IsNullOrEmpty(property.Video))
-                    property.Video = string.Format("https://www.youtube.com/watch?v={0}", property.Video);
+                    property.Video = string.Format("https://www.youtube.com/watch?v={0}", property.Video);            
             }
 
+
             var propertyDetails = new PropertyContainer();
 
             propertyDetails.SalesTypeString = property.IsSale ? "Sale" : "Rental";
@@ -147,6 +148,8 @@ namespace UnivateProperties_API.Repository.Properties
                     propertyDetails[prop] = property[prop];
             }
 
+            propertyDetails.StatusCode = dBContext.Status.Where(x => x.Id == property.StatusId).FirstOrDefault().Code;
+
             if (property.StatusId != null)
             {
                 propertyDetails.StatusString = dBContext.Status.Where(s => s.Id == property.StatusId).FirstOrDefault()?.Description;

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -1095,81 +1095,92 @@ namespace UnivateProperties_API.Repository.Timeshare
             #endregion           
 
             var week = new TimeshareWeek();
-            foreach (string prop in week.GetAllProperties())
-            {
-                if (prop != "Item" && prop != "Display")
-                    week[prop] = sellItem[prop];
-            }
-            week.Region = null;
-            week.RegionId = sellItem.Region.Id;
-
-            //if agentWeek then set week owner equal to agentWeek.id else
-            if (agentWeek != null)
-            {
-                week.OwnerId = agentWeek.Id;
-            }
-            else
-            {
-                week.OwnerId = owner.Id;
-            }
-
-            if (week.Mandate)
-                week.DateMandated = DateTime.Now;
-
-            TemplateRepository templateRepository = new TemplateRepository(_dbContext);
-            MailRepository mailRepository = new MailRepository(_dbContext);
-            var template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Owner");
 
             try
             {
+                foreach (string prop in week.GetAllProperties())
+                {
+                    if (prop != "Item" && prop != "Display")
+                        week[prop] = sellItem[prop];
+                }
+                week.Region = null;
+                week.RegionId = sellItem.Region.Id;
+
+                //if agentWeek then set week owner equal to agentWeek.id else
                 if (agentWeek != null)
                 {
-                    template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Agent");
-                    if (template != null)
-                    {
-                        mailRepository.WeekLoadedAgent(sellItem);
-                        //templateRepository.SendEmailTemplateWeek(template, agent, sellItem);
-                    }
+                    week.OwnerId = agentWeek.Id;
                 }
                 else
                 {
-                    if (template != null)
+                    week.OwnerId = owner.Id;
+                }
+
+                if (week.Mandate)
+                    week.DateMandated = DateTime.Now;
+
+                TemplateRepository templateRepository = new TemplateRepository(_dbContext);
+                MailRepository mailRepository = new MailRepository(_dbContext);
+                var template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Owner");
+
+                try
+                {
+                    if (agentWeek != null)
                     {
-                        mailRepository.WeekLoadedOwner(sellItem);
-                        //templateRepository.SendEmailTemplateWeek(template, owner, sellItem);
+                        template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-Agent");
+                        if (template != null)
+                        {
+                            mailRepository.WeekLoadedAgent(sellItem);
+                            //templateRepository.SendEmailTemplateWeek(template, agent, sellItem);
+                        }
                     }
-                    /*template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-UV");
-                    if (template != null)
+                    else
                     {
-                        templateRepository.SendEmailTemplate(template, sellItem.Owner, new List<BaseEntity>() { sellItem, sellItem.Owner });
-                    }*/
+                        if (template != null)
+                        {
+                            mailRepository.WeekLoadedOwner(sellItem);
+                            //templateRepository.SendEmailTemplateWeek(template, owner, sellItem);
+                        }
+                        /*template = _dbContext.Templates.FirstOrDefault(x => x.Name == "WeekLoaded-UV");
+                        if (template != null)
+                        {
+                            templateRepository.SendEmailTemplate(template, sellItem.Owner, new List<BaseEntity>() { sellItem, sellItem.Owner });
+                        }*/
 
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MailModel mm = new MailModel();
+                    mm.ComType = "WeekLoad";
+                    mm.Error = ex.ToString();
+                    _dbContext.CommunicationLog.Add(mm);
                 }
-            }
-            catch (Exception ex)
-            {
-                throw (ex);
-            }
 
-            if (sellItem.StatusId == 0)
-            {
-                var statuses = _dbContext.Status.ToList();
-                foreach (var statusItem in statuses)
+                if (sellItem.StatusId == 0)
                 {
-                    if (statusItem.Code == "AP")
+                    var statuses = _dbContext.Status.ToList();
+                    foreach (var statusItem in statuses)
                     {
-                        week.StatusId = statusItem.Id;
+                        if (statusItem.Code == "AP")
+                        {
+                            week.StatusId = statusItem.Id;
+                        }
                     }
                 }
-            }
 
-            _dbContext.Add(week);
-            Save();
-            if (sellItem.CustomOwner)
-            {
-                indiv.WeekId = week.Id;
-                _dbContext.NonRegIndividuals.Update(indiv);
+                _dbContext.Add(week);
                 Save();
+                if (sellItem.CustomOwner)
+                {
+                    indiv.WeekId = week.Id;
+                    _dbContext.NonRegIndividuals.Update(indiv);
+                    Save();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw (ex);
             }
             return week.Id;
         }

UnivateProperties_API/UnivateProperties_API.csproj

@@ -23,6 +23,10 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="5.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.4" />