Add Consent to Timeshare Buy and Sell and ContactUs

UnivateProperties_API/Containers/ProcessFlow/BidItemDisplay.cs

         public string MadeBy { get; set; }
         public DateTime Date { get; set; }
         public string Comment { get; set; }
+        public bool Consent { get; set; }
         public string DeclineReason { get; set; }
         public decimal SellPrice { get; set; }
         #endregion 

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

             Publish = week.Publish;
             PulbishedDate = week.PulbishedDate;
             CustomOwner = week.CustomOwner;
+            Consent = week.Consent;
         }
 
         public int Id { get; set; }
         public bool Publish { get; set; }
         public DateTime PulbishedDate { get; set; }
         public bool CustomOwner {get; set;}
+        public bool Consent { get; set; }
     }
 }

UnivateProperties_API/Context/DataContext.cs

     public class DataContext : DbContext
     {
         private string connectionString = "";
+        internal object BidItem;
+
         public DataContext(DbContextOptions<DataContext> options) : base(options)
         {
             foreach (var extention in options.Extensions)
         public virtual DbSet<PlaceHolder> PlaceHolders { get; set; }
         public virtual DbSet<MailRecipient> MailRecipients { get; set; }
         public virtual DbSet<MailModel> CommunicationLog { get; set; }
-        public virtual DbSet<MailSource> MailSource { get; set; }
+        public virtual DbSet<MailSource> MailSources { get; set; }
         #endregion Communication
 
         #region Property
             modelBuilder.Entity<CampaignItemPlaceHolder>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<CampaignPlaceHolder>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
             modelBuilder.Entity<PlaceHolderFormat>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
+            modelBuilder.Entity<MailSource>().HasQueryFilter(m => EF.Property<bool>(m, "IsDeleted") == false);
         }
 
 

UnivateProperties_API/Controllers/Communication/MailSourceController.cs

+using System.Transactions;
+using Microsoft.AspNetCore.Mvc;
+using UnivateProperties_API.Model.Communication;
+using UnivateProperties_API.Repository;
+
+namespace UnivateProperties_API.Controllers.Communication
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class MailSourceController : ControllerBase
+    {
+        private readonly IRepository<MailSource> _Repo;
+
+        public MailSourceController(IRepository<MailSource> repo)
+        {
+            _Repo = repo;
+        }
+
+        [HttpGet]
+        public IActionResult Get()
+        {
+            return new OkObjectResult(_Repo.GetAll());
+        }
+
+        [HttpGet("{id}")]
+        public IActionResult Get(int id)
+        {
+            return new OkObjectResult(_Repo.GetDetailed(x => x.Id == id));
+        }
+
+        [HttpPost]
+        public IActionResult Post([FromBody] MailSource mailSource)
+        {
+            using (var scope = new TransactionScope())
+            {
+                _Repo.Insert(mailSource);
+                scope.Complete();
+                return CreatedAtAction(nameof(Get), new { id = mailSource.Id }, mailSource);
+            }
+        }
+
+        [HttpPut]
+        public IActionResult Put([FromBody] MailSource mailSource)
+        {
+            if (mailSource != null)
+            {
+                using (var scope = new TransactionScope())
+                {
+                    _Repo.Update(mailSource);
+                    scope.Complete();
+                    return new OkResult();
+                }
+            }
+            return new NoContentResult();
+        }
+
+        [HttpDelete("{id}")]
+        public IActionResult Delete(int id)
+        {
+            _Repo.RemoveAtId(id);
+            return new OkResult();
+        }
+    }
+}

UnivateProperties_API/Migrations/20220714125536_MailSource-MailModel.Designer.cs → UnivateProperties_API/Migrations/20220720084941_MailModel.Designer.cs

 namespace UnivateProperties_API.Migrations
 {
     [DbContext(typeof(DataContext))]
-    [Migration("20220714125536_MailSource-MailModel")]
-    partial class MailSourceMailModel
+    [Migration("20220720084941_MailModel")]
+    partial class MailModel
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
 
                     b.Property<bool>("IsDeleted");
 
-                    b.Property<int>("MailSourceId");
+                    b.Property<int?>("MailSourceId");
 
                     b.Property<string>("Message");
 
                 {
                     b.HasOne("UnivateProperties_API.Model.Communication.MailSource", "MailSource")
                         .WithMany("MailModels")
-                        .HasForeignKey("MailSourceId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .HasForeignKey("MailSourceId");
                 });
 
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.PlaceHolder", b =>

UnivateProperties_API/Migrations/20220714125536_MailSource-MailModel.cs → UnivateProperties_API/Migrations/20220720084941_MailModel.cs

 
 namespace UnivateProperties_API.Migrations
 {
-    public partial class MailSourceMailModel : Migration
+    public partial class MailModel : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
             migrationBuilder.AddColumn<int>(
                 name: "MailSourceId",
                 table: "CommunicationLog",
-                nullable: false,
-                defaultValue: 0);
+                nullable: true);
 
             migrationBuilder.CreateIndex(
                 name: "IX_CommunicationLog_MailSourceId",
                 column: "MailSourceId",
                 principalTable: "MailSource",
                 principalColumn: "Id",
-                onDelete: ReferentialAction.Cascade);
+                onDelete: ReferentialAction.Restrict);
         }
 
         protected override void Down(MigrationBuilder migrationBuilder)

UnivateProperties_API/Migrations/20220721092254_MailSources.cs

+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class MailSources : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_CommunicationLog_MailSource_MailSourceId",
+                table: "CommunicationLog");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_MailSource",
+                table: "MailSource");
+
+            migrationBuilder.RenameTable(
+                name: "MailSource",
+                newName: "MailSources");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_MailSources",
+                table: "MailSources",
+                column: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommunicationLog_MailSources_MailSourceId",
+                table: "CommunicationLog",
+                column: "MailSourceId",
+                principalTable: "MailSources",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_CommunicationLog_MailSources_MailSourceId",
+                table: "CommunicationLog");
+
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_MailSources",
+                table: "MailSources");
+
+            migrationBuilder.RenameTable(
+                name: "MailSources",
+                newName: "MailSource");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_MailSource",
+                table: "MailSource",
+                column: "Id");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_CommunicationLog_MailSource_MailSourceId",
+                table: "CommunicationLog",
+                column: "MailSourceId",
+                principalTable: "MailSource",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+    }
+}

UnivateProperties_API/Migrations/20220804103536_ContactUsMailSourceDescription.cs

+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class ContactUsMailSourceDescription : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+
+        }
+    }
+}

UnivateProperties_API/Migrations/20220829091410_addConsentCommunicationAndWeeks.cs

+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class addConsentCommunicationAndWeeks : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Consent",
+                table: "CommunicationLog",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Consent",
+                table: "CommunicationLog");
+        }
+    }
+}

UnivateProperties_API/Migrations/20220829091928_AddConsentTimeshareWeek.cs

+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class AddConsentTimeshareWeek : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Consent",
+                table: "Weeks",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Consent",
+                table: "Weeks");
+        }
+    }
+}

UnivateProperties_API/Migrations/20220830051240_BidItemAddConsent.cs

+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class BidItemAddConsent : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<bool>(
+                name: "Consent",
+                table: "BidItems",
+                nullable: false,
+                defaultValue: false);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Consent",
+                table: "BidItems");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

 
                     b.Property<string>("ComType");
 
+                    b.Property<bool>("Consent");
+
                     b.Property<DateTime>("Created");
 
                     b.Property<string>("Email");
 
                     b.Property<bool>("IsDeleted");
 
-                    b.Property<int>("MailSourceId");
+                    b.Property<int?>("MailSourceId");
 
                     b.Property<string>("Message");
 
 
                     b.HasKey("Id");
 
-                    b.ToTable("MailSource");
+                    b.ToTable("MailSources");
                 });
 
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.PlaceHolder", b =>
 
                     b.Property<string>("Comment");
 
+                    b.Property<bool>("Consent");
+
                     b.Property<DateTime>("Created");
 
                     b.Property<string>("DeclinedReason");
 
                     b.Property<string>("Bedrooms");
 
+                    b.Property<bool>("Consent");
+
                     b.Property<DateTime>("Created");
 
                     b.Property<bool>("CurrentYearBanked");
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.MailModel", b =>
                 {
                     b.HasOne("UnivateProperties_API.Model.Communication.MailSource", "MailSource")
-                        .WithMany("MailModels")
-                        .HasForeignKey("MailSourceId")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .WithMany()
+                        .HasForeignKey("MailSourceId");
                 });
 
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.PlaceHolder", b =>

UnivateProperties_API/Model/Communication/MailModel.cs

         public string Message { get; set; }
         public string HeardFrom { get; set; }
         [ForeignKey("MailSource")]
-        public int MailSourceId { get; set; }
+        public int? MailSourceId { get; set; }
         public virtual MailSource MailSource { get; set; }
         public string Error { get; set; }
+        public bool Consent { get; set; }
     }
 }

UnivateProperties_API/Model/Communication/MailSource.cs

     public class MailSource : BaseEntity
     {
         public string Description { get; set; }
-        public ICollection<MailModel> MailModels { get; set; }
+        public override string Display => Description;
     }
 }

UnivateProperties_API/Model/ProcessFlow/BidItem.cs

         public int? PropertyId { get; set; }
         public string Comment { get; set; }
         public string DeclinedReason { get; set; }
+        public bool Consent { get; set; }
 
         public virtual Status Status { get; set; }
         public virtual Individual BidMaker { get; set; }
         public virtual TimeshareWeek TimeshareWeek {get;set;}
         public virtual Property Property { get; set; }
+
         #endregion
     }
 }

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

         public string WeekStatus { get; set; }
         public bool Publish { get; set; }
         public DateTime PulbishedDate { get; set; }
+        public bool Consent { get; set; }
         #endregion
 
         #region Navigation

UnivateProperties_API/Repository/Communication/MailRepository.cs

 using Abp.Specifications;
+using Microsoft.EntityFrameworkCore;
 using MimeKit;
 using System;
 using System.Collections.Generic;
+using System.Dynamic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Net.Mail;
     public class MailRepository : IMailRepository
     {
         private readonly DataContext _dbContext;
-
+        string error;
         public MailRepository(DataContext db)
         {
             _dbContext = db;              
         {            
             var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "ContactUs").Where(y => y.IsDeleted == false).ToList();            
             string body = _dbContext.Templates.Where(x => x.Name == "ContactUs").Where(y => y.IsDeleted == false).FirstOrDefault().Body;
-            string error = "";
+            var source = _dbContext.MailSources.Where(x => x.Id == Convert.ToInt32(mm.MailSourceId)).FirstOrDefault();
+
 
             body = body.Replace("[FULLNAME]", mm.Name);
             body = body.Replace("[USEREMAIL]", mm.Email);
             body = body.Replace("[USERCELLPHONE]", mm.Phone);
             body = body.Replace("[PROPERTYREF]", mm.Property);
+            body = body.Replace("[SOURCE]", source.Description);
             body = body.Replace("[USERMESSAGE]", mm.Message);
+            body = body.Replace("[USERCONSENT]", mm.Consent.ToString());
+
 
             string toList = "";
             int emailCount = 0;
             body = body.Replace("[USERCELLPHONE]", bid.BidMaker.CellNumber);
             body = body.Replace("[USERTELEPHONE]", bid.BidMaker.Telephone);
             body = body.Replace("[USERCOMMENT]", bid.Comment);
+            body = body.Replace("[USERCONSENT]", bid.Consent.ToString());
 
             string toList = "";
             int emailCount = 0;
                     toList = toList.Substring(0, toList.Length - 2);
             }
 
-            var host = _dbContext.Hosts.FirstOrDefault();
-            using (SmtpClient smtp = new SmtpClient(host.Host))
+            try
             {
-                MailMessage mail = new MailMessage();
-                mail.To.Add(toList);
-                mail.Subject = "Uni-Vate - New Contact Request";
-                mail.Body = body;
-                mail.IsBodyHtml = true;
-                mail.BodyEncoding = Encoding.ASCII;
-                mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
-                mail.Sender = new MailAddress(host.User, "UniVate Properties");
-                mail.From = mail.Sender;
+                var host = _dbContext.Hosts.FirstOrDefault();
+                using (SmtpClient smtp = new SmtpClient(host.Host))
+                {
+                    MailMessage mail = new MailMessage();
+                    mail.To.Add(toList);
+                    mail.Subject = "Uni-Vate - New Contact Request";
+                    mail.Body = body;
+                    mail.IsBodyHtml = true;
+                    mail.BodyEncoding = Encoding.ASCII;
+                    mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
+                    mail.Sender = new MailAddress(host.User, "UniVate Properties");
+                    mail.From = mail.Sender;
 
-                smtp.UseDefaultCredentials = host.NeedsAuthorize;
-                smtp.Credentials = host.GetNetworkCredential();
-                smtp.EnableSsl = host.UseSSL;
-                smtp.Send(mail);
+                    smtp.UseDefaultCredentials = host.NeedsAuthorize;
+                    smtp.Credentials = host.GetNetworkCredential();
+                    smtp.EnableSsl = host.UseSSL;
+                    smtp.Send(mail);
+                }
+            }
+            catch (Exception ex)
+            {
+                error = ex.ToString();
             }
         }
 
             body = body.Replace("[USERCELLPHONE]", bid.BidMaker.CellNumber);
             body = body.Replace("[USERTELEPHONE]", bid.BidMaker.Telephone);
             body = body.Replace("[USERCOMMENT]", bid.Comment);
+            body = body.Replace("[USERCONSENT]", bid.Consent.ToString());
 
-
-
-            var host = _dbContext.Hosts.FirstOrDefault();
-            using (SmtpClient smtp = new SmtpClient(host.Host))
+            try
             {
-                MailMessage mail = new MailMessage();
-                mail.To.Add(bid.BidMaker.Email);
-                mail.Subject = "Uni-Vate - New Contact Request";
-                mail.Body = body;
-                mail.IsBodyHtml = true;
-                mail.BodyEncoding = Encoding.ASCII;
-                mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
-                mail.Sender = new MailAddress(host.User, "UniVate Properties");
-                mail.From = mail.Sender;
+                var host = _dbContext.Hosts.FirstOrDefault();
+                using (SmtpClient smtp = new SmtpClient(host.Host))
+                {
+                    MailMessage mail = new MailMessage();
+                    mail.To.Add(bid.BidMaker.Email);
+                    mail.Subject = "Uni-Vate - New Contact Request";
+                    mail.Body = body;
+                    mail.IsBodyHtml = true;
+                    mail.BodyEncoding = Encoding.ASCII;
+                    mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
+                    mail.Sender = new MailAddress(host.User, "UniVate Properties");
+                    mail.From = mail.Sender;
 
-                smtp.UseDefaultCredentials = host.NeedsAuthorize;
-                smtp.Credentials = host.GetNetworkCredential();
-                smtp.EnableSsl = host.UseSSL;
-                smtp.Send(mail);
+                    smtp.UseDefaultCredentials = host.NeedsAuthorize;
+                    smtp.Credentials = host.GetNetworkCredential();
+                    smtp.EnableSsl = host.UseSSL;
+                    smtp.Send(mail);
+                }
+                error = "None";
+            }
+            catch (Exception ex)
+            {
+                error = ex.ToString();
             }
         }
 
 
         public List<MailModel> GetContactUsLog()
         {
-            return _dbContext.CommunicationLog.Where(x => x.ComType == "Contact Us").ToList();            
+            return _dbContext.CommunicationLog.Include("MailSource").Where(x => x.ComType == "Contact Us").ToList();
         }
 
         public List<MailModel> GetEnquireNowLog()

UnivateProperties_API/Repository/Communication/MailSourceRepository.cs

+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using UnivateProperties_API.Context;
+using UnivateProperties_API.Model.Communication;
+
+namespace UnivateProperties_API.Repository.Communication
+{
+    public class MailSourceRepository : IRepository<MailSource>
+    {
+        private readonly DataContext dBContext;
+
+        public MailSourceRepository(DataContext _dBContext)
+        {
+            dBContext = _dBContext;
+        }
+
+        public List<MailSource> Get(Func<MailSource, bool> where)
+        {
+            return dBContext.MailSources.Where(where).ToList();
+        }
+
+        public List<MailSource> GetAll()
+        {
+            return dBContext.MailSources.OrderBy(p => p.Description).ToList();
+        }
+
+        public MailSource GetDetailed(Func<MailSource, bool> first)
+        {
+            return dBContext.MailSources.FirstOrDefault(first);
+        }
+
+        public List<MailSource> GetDetailedAll()
+        {
+            return dBContext.MailSources.ToList();
+        }
+
+        public void Insert(MailSource item)
+        {
+            dBContext.MailSources.Add(item);
+            Save();
+        }
+
+        public void Insert(IEnumerable<MailSource> items)
+        {
+            foreach (var item in items)
+            {
+                dBContext.MailSources.Add(item);
+                Save();
+            }
+        }
+
+        public void Remove(MailSource item)
+        {
+            dBContext.MailSources.Remove(item);
+            Save();
+        }
+
+        public void Remove(IEnumerable<MailSource> items)
+        {
+            foreach (var item in items)
+            {
+                dBContext.MailSources.Remove(item);
+            }
+            Save();
+        }
+
+        public void RemoveAtId(int item)
+        {
+            var mailSource = Get(x => x.Id == item).FirstOrDefault();
+            if (mailSource != null)
+            {
+                dBContext.MailSources.Remove(mailSource);
+                Save();
+            }
+        }
+
+        public void Save()
+        {
+            dBContext.SaveChanges();
+        }
+
+        public void Update(MailSource item)
+        {
+            dBContext.Entry(item).State = EntityState.Modified;
+            Save();
+        }
+
+        public int NewId()
+        {
+            return 0;
+        }
+    }
+}

UnivateProperties_API/Startup.cs

             services.AddTransient<IRepository<SMTPAccount>, SMTPAccountRepository>();
             services.AddTransient<IRepository<SMTPHost>, SMTPHostRepository>();
             services.AddTransient<IMailRepository, MailRepository>();
-
+            services.AddTransient<IRepository<MailSource>, MailSourceRepository>();
             #endregion Communication
             #region Logs 
             services.AddTransient<ISearchLogRepository, SearchLogRepository>();

UnivateProperties_API/appsettings.json

   "ConnectionStrings": {
     "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Integrated Security=true;Pooling=false;",
     //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=sa;Password=What123!;Pooling=false;",
+    //"DefaultConnection": "Data Source=192.168.0.219;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=sa;Password=What123!;Pooling=false;",
     //"DefaultConnection": "Data Source=localhost;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
     //"DefaultConnection": "Data Source=192.168.0.101;Initial Catalog=UniVate;Persist Security Info=True;User Id=Provision;Password=J%Xvk8xGeT;Pooling=false;",
     "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N",