Email Recipients

UnivateProperties_API/Context/DataContext.cs

@@ -45,6 +45,7 @@ namespace UnivateProperties_API.Context
         public virtual DbSet<SMTPHost> Hosts { get; set; }
         public virtual DbSet<Template> Templates { get; set; }
         public virtual DbSet<PlaceHolder> PlaceHolders { get; set; }
+        public virtual DbSet<MailRecipient> MailRecipients { get; set; }
         #endregion Communication
 
         #region Property

UnivateProperties_API/Controllers/Communication/MailController.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
+using RestSharp;
 using UnivateProperties_API.Model.Communication;
 using UnivateProperties_API.Repository.Communication;
 
@@ -40,5 +36,48 @@ namespace UnivateProperties_API.Controllers.Communication
                 return new BadRequestResult();
             }
         }
+
+        [HttpPost("mailrecipient")]
+        public IActionResult AddMailRecipient([FromBody] MailRecipient rec)
+        {
+            try
+            {
+                _repo.AddRecipient(rec);
+                return new OkResult();
+            }
+            catch
+            {
+                return new BadRequestResult();
+            }
+
+        }
+
+        [HttpGet("mailrecipients")]
+        public IActionResult GetMailRecipients()
+        {
+            var recipients = _repo.GetMailRecipients();
+            return new OkObjectResult(recipients);
+        }
+
+        [HttpGet("mailrecipient/{id}")]
+        public IActionResult GetRecipientById(int id)
+        {
+            var recipient = _repo.GetMailRecipientById(id);
+            return new OkObjectResult(recipient);
+        }
+
+        [HttpPut("mailrecipients")]
+        public IActionResult UpdateRecipient([FromBody] MailRecipient rec)
+        {
+            _repo.UpdateMailRecipient(rec);
+            return new OkResult();
+        }
+
+        [HttpDelete("mailrecipient/{id}")]
+        public IActionResult DeleteRecipient(int id)
+        {
+            _repo.DeleteMailRecipient(id);
+            return new OkResult();
+        }
     }
 }

UnivateProperties_API/Migrations/20201026073628_EmailRecipient.cs

@@ -0,0 +1,37 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class EmailRecipient : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "MailRecipients",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn),
+                    Created = table.Column<DateTime>(nullable: false),
+                    Modified = table.Column<DateTime>(nullable: false),
+                    ModifiedBy = table.Column<string>(nullable: true),
+                    IsDeleted = table.Column<bool>(nullable: false),
+                    RecipientName = table.Column<string>(nullable: true),
+                    RecipientMail = table.Column<string>(nullable: true),
+                    RecipientUsage = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MailRecipients", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "MailRecipients");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -234,6 +234,31 @@ namespace UnivateProperties_API.Migrations
                     b.ToTable("Emails");
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.MailRecipient", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("RecipientMail");
+
+                    b.Property<string>("RecipientName");
+
+                    b.Property<string>("RecipientUsage");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("MailRecipients");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.PlaceHolder", b =>
                 {
                     b.Property<int>("Id")

UnivateProperties_API/Model/Communication/MailRecipient.cs

@@ -0,0 +1,9 @@
+namespace UnivateProperties_API.Model.Communication
+{
+    public class MailRecipient : BaseEntity
+    {
+        public string RecipientName { get; set; }
+        public string RecipientMail { get; set; }
+        public string RecipientUsage { get; set; }
+    }
+}

UnivateProperties_API/Repository/Communication/MailRepository.cs

@@ -1,9 +1,11 @@
 using MailKit.Net.Smtp;
 using MimeKit;
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using UnivateProperties_API.Context;
+using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Communication;
 
 namespace UnivateProperties_API.Repository.Communication
@@ -12,6 +14,11 @@ namespace UnivateProperties_API.Repository.Communication
     {
         void ContactUs(MailModel mm);
         void EnquireNow(MailModel mm);
+        void AddRecipient(MailRecipient rec);
+        List<MailRecipient> GetMailRecipients();
+        MailRecipient GetMailRecipientById(int id);
+        void UpdateMailRecipient(MailRecipient rec);
+        void DeleteMailRecipient(int id);
     }
 
     public class MailRepository : IMailRepository
@@ -40,13 +47,19 @@ namespace UnivateProperties_API.Repository.Communication
             string name = mm.Name;
             string email = mm.Email;
             string message = mm.Message;
+            var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "ContactUs").ToList();
 
             from = new MailboxAddress("Admin", mm.FromAddress);
 
-            to = new MailboxAddress("User", mm.ToAddress);
+            InternetAddressList list = new InternetAddressList();
+            foreach (var recipient in recipients)
+            {
+                list.Add(new MailboxAddress(recipient.RecipientName, recipient.RecipientMail));
+            }
+            //to = new MailboxAddress("User", mm.ToAddress);
 
             messageObj.From.Add(from);
-            messageObj.To.Add(to);
+            messageObj.To.AddRange(list);
 
             messageObj.Subject = "Uni-Vate - New Contact Request";
 
@@ -80,13 +93,20 @@ namespace UnivateProperties_API.Repository.Communication
             string message = mm.Message;
             var props = _dbContext.Properties.ToList();
             var prop = props.Where(x => x.Id == Convert.ToInt32(mm.Property)).FirstOrDefault();
+            var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "EnquireNow").ToList();
+
             
             from = new MailboxAddress("Admin", mm.FromAddress);
 
-            to = new MailboxAddress("User", mm.ToAddress);
+            InternetAddressList list = new InternetAddressList();
+            foreach (var recipient in recipients)
+            {
+                list.Add(new MailboxAddress(recipient.RecipientName, recipient.RecipientMail));
+            }
+            //to = new MailboxAddress("User", mm.ToAddress);
 
             messageObj.From.Add(from);
-            messageObj.To.Add(to);
+            messageObj.To.AddRange(list);
 
             messageObj.Subject = "Uni-Vate - Enquiry to view property";
 
@@ -130,10 +150,14 @@ namespace UnivateProperties_API.Repository.Communication
 
             bodyBuilder.HtmlBody = "<div style=\"margin: 5px\">" +
                 "<h4>Request to reset password</h4>" +
-                "<h4>Dear " + name + " there has been a request  to reset your password. If this is incorrect please send an email to info@univateproperties.co.za</h4>" +
+                "<h4>Dear " + name + ", </h4>" +
+                "<h4>There has been a request to reset your password. If this is incorrect please send an email to info@univateproperties.co.za</h4>" +
                 "<div>" +
+                "<h5>Please follow the link below to reset your password:</h5>" +
                 "<h3>"+ link + "</h3>" +
-
+                "<br />"+
+                "<h4>Thank You</h4>" +
+                "<h4>Team Uni-Vate</h4>" +
                 "</div>" +
                 "</div>" +
                 "</div>";
@@ -147,5 +171,60 @@ namespace UnivateProperties_API.Repository.Communication
             client.Disconnect(true);
             client.Dispose();
         }
+
+        public void AddRecipient(MailRecipient rec)
+        {
+            if (MyCommon.IsValidEmail(rec.RecipientMail))
+            {
+                _dbContext.MailRecipients.Add(rec);
+                _dbContext.SaveChanges();
+            }
+            else
+            {
+                throw new Exception();
+            }
+            
+        }
+
+        public List<MailRecipient> GetMailRecipients()
+        {
+            return _dbContext.MailRecipients.Where(x => x.IsDeleted == false).ToList();
+        }
+
+        public MailRecipient GetMailRecipientById(int id)
+        {
+            return _dbContext.MailRecipients.Where(x => x.Id == id).FirstOrDefault(); 
+        }
+
+        public void UpdateMailRecipient(MailRecipient rec)
+        {
+            var recipient = _dbContext.MailRecipients.Where(x => x.Id == rec.Id).FirstOrDefault();
+
+            if (recipient.RecipientMail != rec.RecipientMail)
+            {
+                recipient.RecipientMail = rec.RecipientMail;
+            }
+
+            if (recipient.RecipientName != rec.RecipientName)
+            {
+                recipient.RecipientName = rec.RecipientName;
+            }
+
+            if (recipient.RecipientUsage != rec.RecipientUsage)
+            {
+                recipient.RecipientUsage = rec.RecipientUsage;
+            }
+
+
+            _dbContext.MailRecipients.Update(recipient);
+            _dbContext.SaveChanges();
+        }
+
+        public void DeleteMailRecipient(int id)
+        {
+            var rec = _dbContext.MailRecipients.Where(x => x.Id == id).FirstOrDefault();        
+            _dbContext.MailRecipients.Remove(rec);
+            _dbContext.SaveChanges();
+        }
     }
 }

UnivateProperties_API/Startup.cs

@@ -156,6 +156,7 @@ namespace UnivateProperties_API
             services.AddTransient<IRepository<SMTPAccount>, SMTPAccountRepository>();
             services.AddTransient<IRepository<SMTPHost>, SMTPHostRepository>();
             services.AddTransient<IMailRepository, MailRepository>();
+
             #endregion Communication
             #region Logs 
             services.AddTransient<ISearchLogRepository, SearchLogRepository>();

UnivateProperties_API/appsettings.json

@@ -11,7 +11,7 @@
   "ConnectionStrings": {
     "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
     "TenderConnection": "http://www.unipoint-consoft.co.za/nph-srep.exe?cluvavail.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N",
-    "ReservationsURL": "http://training.provision-sa.com:84/ReservationsWebService.asmx", //Please note that ReservationsWebService must be in this case. 
+    "ReservationsURL": "https://www.pvsl.co.za:85/ReservationsWebService.asmx", //Please note that ReservationsWebService must be in this case. 
     "ReservationsUserCode": "UniInt",
     "ReservationsPassword": "Un11nt"
   }