Fixed warnings and messages

Template changes

UnivateProperties_API/Containers/Communication/PlaceHolderDto.cs

@@ -2,6 +2,7 @@
 {
     public class PlaceHolderDto
     {
+        public int Id { get; set; }
         public string Name { get; set; }
         public string BoundToClass { get; set; }
         public string BoundToClassDisplay { get; set; }

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -56,7 +56,10 @@ namespace UnivateProperties_API.Containers.Timeshare
             Owner = $"{week.Owner?.Name} {week.Owner?.Surname}";
             Resort = new ResortDto(week.ResortCode, week.ResortName);
             Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Code, week.Region?.Description);
-            Status = new StatusDto(week.Status.Id, week.Status?.Code, week.Status?.Description);
+            if(week.Status != null)
+            {
+                Status = new StatusDto(week.Status.Id, week.Status.Code, week.Status.Description);
+            }            
             Bedrooms = week.Bedrooms;
             MaxSleep = week.MaxSleep;
             UnitNumber = week.UnitNumber;

UnivateProperties_API/Context/DataContext.cs

@@ -181,8 +181,7 @@ namespace UnivateProperties_API.Context
             modelBuilder.Entity<BidItem>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<ProcessFlow>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<Template>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
-
-            
+            modelBuilder.Entity<PlaceHolder>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
         }
 
     

UnivateProperties_API/Controllers/Communication/TemplateController.cs

@@ -70,5 +70,16 @@ namespace UnivateProperties_API.Controllers.Communication
             _Repo.RemoveAtId(id);
             return new OkResult();
         }
+
+        [HttpPost("sendTemplate/{id}")]
+        public IActionResult SendTemplate(int id)
+        {
+            using ( var scope = new TransactionScope())
+            {
+                (_Repo as TemplateRepository).SendEmailTemplate(id);
+                scope.Complete();
+                return new OkResult();
+            }
+        }
     }
 }

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -104,5 +104,16 @@ namespace UnivateProperties_API.Controllers.Timeshare
             _Repo.RemoveAtId(id);
             return new OkResult();
         }
+
+        [HttpPost("verifyweek/{id}")]
+        public IActionResult Post(int id)
+        {
+            using (var scope = new TransactionScope())
+            {
+                (_Repo as WeekRepository).VerifyWeek(id);
+                scope.Complete();
+                return new OkResult();
+            }
+        }
     }
 }

UnivateProperties_API/Migrations/20191112124547_templateMod.cs

@@ -0,0 +1,113 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class templateMod : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "SenderId",
+                table: "Templates",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "TemplateId",
+                table: "Individuals",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "TemplateId",
+                table: "Agents",
+                nullable: true);
+
+            migrationBuilder.AddColumn<bool>(
+                name: "Default",
+                table: "Accounts",
+                nullable: false,
+                defaultValue: false);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Templates_SenderId",
+                table: "Templates",
+                column: "SenderId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Individuals_TemplateId",
+                table: "Individuals",
+                column: "TemplateId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Agents_TemplateId",
+                table: "Agents",
+                column: "TemplateId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Agents_Templates_TemplateId",
+                table: "Agents",
+                column: "TemplateId",
+                principalTable: "Templates",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Individuals_Templates_TemplateId",
+                table: "Individuals",
+                column: "TemplateId",
+                principalTable: "Templates",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Templates_Accounts_SenderId",
+                table: "Templates",
+                column: "SenderId",
+                principalTable: "Accounts",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Agents_Templates_TemplateId",
+                table: "Agents");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Individuals_Templates_TemplateId",
+                table: "Individuals");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_Templates_Accounts_SenderId",
+                table: "Templates");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Templates_SenderId",
+                table: "Templates");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Individuals_TemplateId",
+                table: "Individuals");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Agents_TemplateId",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "SenderId",
+                table: "Templates");
+
+            migrationBuilder.DropColumn(
+                name: "TemplateId",
+                table: "Individuals");
+
+            migrationBuilder.DropColumn(
+                name: "TemplateId",
+                table: "Agents");
+
+            migrationBuilder.DropColumn(
+                name: "Default",
+                table: "Accounts");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -148,6 +148,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<DateTime>("Created");
 
+                    b.Property<bool>("Default");
+
                     b.Property<string>("DisplayName");
 
                     b.Property<bool>("IsDeleted");
@@ -210,10 +212,14 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Name");
 
+                    b.Property<int?>("SenderId");
+
                     b.Property<string>("Subject");
 
                     b.HasKey("Id");
 
+                    b.HasIndex("SenderId");
+
                     b.ToTable("Templates");
                 });
 
@@ -903,12 +909,16 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Telephone");
 
+                    b.Property<int?>("TemplateId");
+
                     b.Property<int?>("UserId");
 
                     b.HasKey("Id");
 
                     b.HasIndex("AgencyId");
 
+                    b.HasIndex("TemplateId");
+
                     b.HasIndex("UserId");
 
                     b.ToTable("Agents");
@@ -949,6 +959,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("Telephone");
 
+                    b.Property<int?>("TemplateId");
+
                     b.Property<int?>("UserId");
 
                     b.HasKey("Id");
@@ -957,6 +969,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.HasIndex("BankAccountId");
 
+                    b.HasIndex("TemplateId");
+
                     b.HasIndex("UserId");
 
                     b.HasIndex("Telephone", "CellNumber", "Email")
@@ -1065,6 +1079,13 @@ namespace UnivateProperties_API.Migrations
                         .OnDelete(DeleteBehavior.Cascade);
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.Template", b =>
+                {
+                    b.HasOne("UnivateProperties_API.Model.Communication.SMTPAccount", "Sender")
+                        .WithMany()
+                        .HasForeignKey("SenderId");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Misc.Address", b =>
                 {
                     b.HasOne("UnivateProperties_API.Model.Users.Individual", "Owner")
@@ -1231,6 +1252,10 @@ namespace UnivateProperties_API.Migrations
                         .WithMany("Agents")
                         .HasForeignKey("AgencyId");
 
+                    b.HasOne("UnivateProperties_API.Model.Communication.Template")
+                        .WithMany("AgentBCC")
+                        .HasForeignKey("TemplateId");
+
                     b.HasOne("UnivateProperties_API.Model.Users.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId");
@@ -1246,6 +1271,10 @@ namespace UnivateProperties_API.Migrations
                         .WithMany()
                         .HasForeignKey("BankAccountId");
 
+                    b.HasOne("UnivateProperties_API.Model.Communication.Template")
+                        .WithMany("IndividualBCC")
+                        .HasForeignKey("TemplateId");
+
                     b.HasOne("UnivateProperties_API.Model.Users.User", "User")
                         .WithMany()
                         .HasForeignKey("UserId");

UnivateProperties_API/Model/Communication/Email.cs

@@ -3,6 +3,9 @@ using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Net.Mail;
 using System.Text;
+using UnivateProperties_API.Model.Users;
+using System.Collections;
+using System.Collections.Generic;
 
 namespace UnivateProperties_API.Model.Communication
 {
@@ -30,6 +33,43 @@ namespace UnivateProperties_API.Model.Communication
             Body = body;
             Subject = subject;
         }
+
+        public Email(Template template, Person sendTo, List<BaseEntity> args)
+        {
+            if(sendTo != null && MyCommon.IsValidEmail(sendTo.Email))
+            {
+                if (template.SenderId != null)
+                {
+                    SenderId = template.SenderId.Value;
+                }
+                Sender = template.Sender;
+                To = sendTo.Email;
+                ToDisplay = sendTo.FullName;
+                BCC = ConcatEmails(template.AgentBCC, template.IndividualBCC);
+                IsBodyHtml = true;
+                Body = template.Body;
+                Subject = template.Subject;
+                foreach(var item in template.PlaceHolders)
+                {
+                    foreach(var obj in args)
+                    {
+                        if(obj.GetType() == Type.GetType(item.BoundToClass))
+                        {
+                            string replaceValue = (string)obj[item.BoundTo];
+                            if(Body.Contains(item.Name))
+                            {
+                                Body = Body.Replace(item.Name, replaceValue);
+                            }
+                            if(Subject.Contains(item.Name))
+                            {
+                                Subject = Subject.Replace(item.Name, replaceValue);
+                            }
+                        }
+                    }
+                }
+            }
+            
+        }
         #endregion Constructor
 
         #region Properties
@@ -137,6 +177,32 @@ namespace UnivateProperties_API.Model.Communication
             mail.From = mail.Sender;
             return mail;
         }
+
+        private string ConcatEmails(ICollection<Agent> agents, ICollection<Individual> individuals)
+        {
+            string value = string.Empty;
+            if (agents != null && agents.Count > 0)
+            {
+                foreach(var item in agents)
+                {
+                    if(MyCommon.IsValidEmail(item.Email))
+                    {
+                        value += $"{item.Email};";
+                    }
+                }
+            }
+            if (individuals != null && individuals.Count > 0)
+            {
+                foreach (var item in individuals)
+                {
+                    if (MyCommon.IsValidEmail(item.Email))
+                    {
+                        value += $"{item.Email};";
+                    }
+                }
+            }
+            return value;
+        }
         #endregion Methods
     }
 }

UnivateProperties_API/Model/Communication/SMTPAccount.cs

@@ -33,11 +33,13 @@ namespace UnivateProperties_API.Model.Communication
         #region Properties
         public string Address { get; set; }
         public string DisplayName { get; set; }
+        public bool Default { get; set; }
         [ForeignKey("SMTPHost")]
         public int SMTPHostId { get; set; }
 
         public virtual SMTPHost SMTPHost { get; set; }
         public virtual ICollection<Email> Emails { get; set; }
+        public virtual ICollection<Template> Templates { get; set; }
         #endregion Properties
     }
 }

UnivateProperties_API/Model/Communication/Template.cs

@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Model.Communication
 {
@@ -9,8 +11,13 @@ namespace UnivateProperties_API.Model.Communication
         public string Name { get; set; }
         public string Subject { get; set; }
         public string Body { get; set; }
+        [ForeignKey("Sender")]
+        public int? SenderId { get; set; }
 
         public virtual ICollection<PlaceHolder> PlaceHolders { get; set; }
+        public virtual SMTPAccount Sender { get; set; }
+        public virtual ICollection<Agent> AgentBCC { get; set; }
+        public virtual ICollection<Individual> IndividualBCC { get; set; }
         #endregion
     }
 }

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -10,21 +10,48 @@ namespace UnivateProperties_API.Model.Timeshare
 {
     public class TimeshareWeek : BaseEntity
     {
-        TimeshareWeek()
+        public TimeshareWeek()
         {
-
         }
 
-        TimeshareWeek(WeekDto week)
+        public TimeshareWeek(bool referedByAgent, int? agentId, int? agencyId, int ownerId, bool agentAsRep, bool otherResort, string otherResortName, string resortCode, string resortName, int regionId, string season, string module, int bedrooms, int maxSleep, string unitNumber, string weekNumber, double levyAmount, bool currentYearBanked, string bankedWith, bool leviesPaidInFull, bool weekPlacedForRental, double originalPurchasePrice, DateTime originalPurchaseDate, DateTime arrivalDate, DateTime departureDate, double sellPrice, double agentCommision, string mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows)
         {
-            ReferedByAgent = week.ReferedByAgent;
-            AgentAsRep = false;
-            ResortCode = week.Resort.ResortCode;
-            ResortName = week.Resort.ResortName;
-            RegionId = week.Region.Id;
-            Bedrooms = week.Bedrooms;
-            MaxSleep = week.MaxSleep;
-            UnitNumber = week.UnitNumber;
+            ReferedByAgent = referedByAgent;
+            AgentId = agentId;
+            AgencyId = agencyId;
+            OwnerId = ownerId;
+            AgentAsRep = agentAsRep;
+            OtherResort = otherResort;
+            OtherResortName = otherResortName;
+            ResortCode = resortCode;
+            ResortName = resortName;
+            RegionId = regionId;
+            Season = season;
+            Module = module;
+            Bedrooms = bedrooms;
+            MaxSleep = maxSleep;
+            UnitNumber = unitNumber;
+            WeekNumber = weekNumber;
+            LevyAmount = levyAmount;
+            CurrentYearBanked = currentYearBanked;
+            BankedWith = bankedWith;
+            LeviesPaidInFull = leviesPaidInFull;
+            WeekPlacedForRental = weekPlacedForRental;
+            OriginalPurchasePrice = originalPurchasePrice;
+            OriginalPurchaseDate = originalPurchaseDate;
+            ArrivalDate = arrivalDate;
+            DepartureDate = departureDate;
+            SellPrice = sellPrice;
+            AgentCommision = agentCommision;
+            Mandate = mandate;
+            StatusId = statusId;
+            Status = status;
+            Region = region;
+            Owner = owner;
+            Agent = agent;
+            Agency = agency;
+            BidItems = bidItems;
+            ProcessFlows = processFlows;
         }
 
         #region Properties

UnivateProperties_API/Repository/Communication/TemplateRepository.cs

@@ -4,7 +4,9 @@ using System.Collections.Generic;
 using System.Linq;
 using UnivateProperties_API.Containers.Communication;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Model;
 using UnivateProperties_API.Model.Communication;
+using UnivateProperties_API.Model.Users;
 
 namespace UnivateProperties_API.Repository.Communication
 {
@@ -84,10 +86,31 @@ namespace UnivateProperties_API.Repository.Communication
 
         public void Update(Template item)
         {
+            var itemList = _dbContext.PlaceHolders.Where(x => x.TemplateId == item.Id).ToList();
+            CheckListChange(itemList, item.PlaceHolders.ToList());
             _dbContext.Entry(item).State = EntityState.Modified;
             Save();
         }
 
+        private void CheckListChange(List<PlaceHolder> holderOld, List<PlaceHolder> holderNew)
+        {
+            foreach(var item in holderOld)
+            {
+                if(!holderNew.Any(x => x.Id== item.Id))
+                {
+                    var i = _dbContext.PlaceHolders.FirstOrDefault(x => x.Id == item.Id);
+                    if(item != null)
+                    {
+                        _dbContext.PlaceHolders.Remove(i);
+                    }
+                }
+            }
+            foreach(var item in holderNew.Where(x => x.Id == 0))
+            {
+                _dbContext.Add(item);
+            }
+        }
+
         public void Save()
         {
             _dbContext.SaveChanges();
@@ -128,6 +151,7 @@ namespace UnivateProperties_API.Repository.Communication
             {
                 list.Add(new PlaceHolderDto()
                 {
+                    Id = item.Id,
                     Name = item.Name,
                     BoundTo = item.BoundTo,
                     BoundToClass = item.BoundToClass,
@@ -136,5 +160,48 @@ namespace UnivateProperties_API.Repository.Communication
             }
             return list;
         }
+
+        public void SendEmailTemplate(int id)
+        {
+            var item = _dbContext.Weeks.FirstOrDefault(x => x.Id == 4);
+            var indiv = _dbContext.Individuals.FirstOrDefault(x => x.Id == 73);
+            List<BaseEntity> list = new List<BaseEntity>
+            {
+                item,
+                indiv
+            };
+            var template = _dbContext.Templates.FirstOrDefault(x => x.Id == id);
+            if (template.SenderId == null)
+            {
+                var acc = _dbContext.Accounts.FirstOrDefault(x => x.Default);
+                if (acc != null)
+                {
+                    template.SenderId = acc.Id;
+                    template.Sender = acc;
+                }
+            }
+            else template.Sender = _dbContext.Accounts.FirstOrDefault(x => x.Id == template.SenderId);
+            template.PlaceHolders = _dbContext.PlaceHolders.Where(x => x.TemplateId == id).ToList();
+            if(template != null)
+            {
+                Person person = _dbContext.Individuals.FirstOrDefault(x => x.Email == "kobusb@provision-sa.com");
+                if(person == null)
+                {
+                    person = _dbContext.Agents.FirstOrDefault(x => x.Email == "kobusb@provision-sa.com");
+                }
+                if(person != null)
+                {
+                    try
+                    {
+                        Email email = new Email(template, person, list);
+                        EmailRepository emailRepo = new EmailRepository(_dbContext);
+                        emailRepo.Insert(email);
+                    }
+                    catch(Exception)
+                    {
+                    }                    
+                }                
+            }
+        }
     }
 }

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -389,5 +389,16 @@ namespace UnivateProperties_API.Repository.Timeshare
             }
             return detList;
         }
+
+        public void VerifyWeek(int id)
+        {
+            var week = _dbContext.Weeks.FirstOrDefault(x => x.Id == id);
+            var newStatus = _dbContext.Status.FirstOrDefault(x => x.Code.ToLower() == "a2" && x.StatusType == StatusType.Timeshare);
+            if(week != null && newStatus != null)
+            {
+                week.Status = newStatus;
+                Update(week);
+            }
+        }
     }
 }