Updated Communication and added logs for enquire

UnivateProperties_API/Context/DataContext.cs

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

UnivateProperties_API/Controllers/Campaigns/CampaignController.cs

@@ -1,15 +1,12 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using System.Transactions;
-using UnivateProperties_API.Containers.Campaigns;
 using UnivateProperties_API.Model.Campaigns;
-using UnivateProperties_API.Repository;
 using UnivateProperties_API.Repository.Campaigns;
 
 namespace UnivateProperties_API.Controllers.Campaigns

UnivateProperties_API/Controllers/Communication/MailController.cs

@@ -59,6 +59,20 @@ namespace UnivateProperties_API.Controllers.Communication
             return new OkObjectResult(recipients);
         }
 
+        [HttpGet("getContactLog")]
+        public IActionResult GetContactUsLog()
+        {
+            var recipients = _repo.GetContactUsLog();
+            return new OkObjectResult(recipients);
+        }
+
+        [HttpGet("getEnquireLog")]
+        public IActionResult GetEnquireNowLog()
+        {
+            var recipients = _repo.GetEnquireNowLog();
+            return new OkObjectResult(recipients);
+        }
+
         [HttpGet("mailrecipient/{id}")]
         public IActionResult GetRecipientById(int id)
         {

UnivateProperties_API/Migrations/20210420082156_CommunicationSystem.cs

@@ -0,0 +1,43 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class CommunicationSystem : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "MailModel",
+                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),
+                    ToAddress = table.Column<string>(nullable: true),
+                    FromAddress = table.Column<string>(nullable: true),
+                    Name = table.Column<string>(nullable: true),
+                    Email = table.Column<string>(nullable: true),
+                    Phone = table.Column<string>(nullable: true),
+                    Property = table.Column<string>(nullable: true),
+                    Message = table.Column<string>(nullable: true),
+                    HeardFrom = table.Column<string>(nullable: true),
+                    Error = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_MailModel", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "MailModel");
+        }
+    }
+}

UnivateProperties_API/Migrations/20210420082718_CommunicationSystem1.cs

@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class CommunicationSystem1 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_MailModel",
+                table: "MailModel");
+
+            migrationBuilder.RenameTable(
+                name: "MailModel",
+                newName: "CommunicationLog");
+
+            migrationBuilder.AddColumn<string>(
+                name: "ComType",
+                table: "CommunicationLog",
+                nullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_CommunicationLog",
+                table: "CommunicationLog",
+                column: "Id");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_CommunicationLog",
+                table: "CommunicationLog");
+
+            migrationBuilder.DropColumn(
+                name: "ComType",
+                table: "CommunicationLog");
+
+            migrationBuilder.RenameTable(
+                name: "CommunicationLog",
+                newName: "MailModel");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_MailModel",
+                table: "MailModel",
+                column: "Id");
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -296,6 +296,45 @@ namespace UnivateProperties_API.Migrations
                     b.ToTable("Emails");
                 });
 
+            modelBuilder.Entity("UnivateProperties_API.Model.Communication.MailModel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
+
+                    b.Property<string>("ComType");
+
+                    b.Property<DateTime>("Created");
+
+                    b.Property<string>("Email");
+
+                    b.Property<string>("Error");
+
+                    b.Property<string>("FromAddress");
+
+                    b.Property<string>("HeardFrom");
+
+                    b.Property<bool>("IsDeleted");
+
+                    b.Property<string>("Message");
+
+                    b.Property<DateTime>("Modified");
+
+                    b.Property<string>("ModifiedBy");
+
+                    b.Property<string>("Name");
+
+                    b.Property<string>("Phone");
+
+                    b.Property<string>("Property");
+
+                    b.Property<string>("ToAddress");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("CommunicationLog");
+                });
+
             modelBuilder.Entity("UnivateProperties_API.Model.Communication.MailRecipient", b =>
                 {
                     b.Property<int>("Id")

UnivateProperties_API/Model/Communication/MailModel.cs

@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace UnivateProperties_API.Model.Communication
+namespace UnivateProperties_API.Model.Communication
 {
-    public class MailModel
+    public class MailModel : BaseEntity
     {
+        public string ComType { get; set; }
         public string ToAddress { get; set; }
 
         public string FromAddress { get; set; }
@@ -21,5 +16,9 @@ namespace UnivateProperties_API.Model.Communication
         public string Property { get; set; }
 
         public string Message { get; set; }
+
+        public string HeardFrom { get; set; }
+
+        public string Error { get; set; }
     }
 }

UnivateProperties_API/Repository/Communication/MailRepository.cs

@@ -25,6 +25,9 @@ namespace UnivateProperties_API.Repository.Communication
         MailRecipient GetMailRecipientById(int id);
         void UpdateMailRecipient(MailRecipient rec);
         void DeleteMailRecipient(int id);
+
+        List<MailModel> GetEnquireNowLog();
+        List<MailModel> GetContactUsLog();
     }
 
     public class MailRepository : IMailRepository
@@ -41,9 +44,10 @@ namespace UnivateProperties_API.Repository.Communication
         }        
 
         public void ContactUs(MailModel mm)
-        {
+        {            
             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 body = _dbContext.Templates.Where(x => x.Name == "ContactUs").Where(y => y.IsDeleted == false).FirstOrDefault().Body;
+            string error = "";
 
             body = body.Replace("[FULLNAME]", mm.Name);
             body = body.Replace("[USEREMAIL]", mm.Email);
@@ -67,40 +71,54 @@ namespace UnivateProperties_API.Repository.Communication
                     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 = new MailAddress(mm.Email, mm.Name);
-
-                smtp.UseDefaultCredentials = host.NeedsAuthorize;
-                smtp.Credentials = host.GetNetworkCredential();
-                smtp.EnableSsl = host.UseSSL;
-                smtp.Send(mail);
-            }            
+                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 = new MailAddress(mm.Email, mm.Name);
+
+                    smtp.UseDefaultCredentials = host.NeedsAuthorize;
+                    smtp.Credentials = host.GetNetworkCredential();
+                    smtp.EnableSsl = host.UseSSL;
+                    smtp.Send(mail);
+                }
+                error = "None";
+            }
+            catch (Exception ex)
+            {
+                error = ex.ToString();
+            }
+            mm.ComType = "Contact Us";
+            mm.Error = error;
+            _dbContext.CommunicationLog.Add(mm);
+            _dbContext.SaveChanges();
         }
 
         public void EnquireNow(MailModel mm)
-        {
+        {            
             var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "EnquireNow").Where(y => y.IsDeleted == false).ToList();
             string body = _dbContext.Templates.Where(x => x.Name == "EnquireNow").Where(y => y.IsDeleted == false).FirstOrDefault().Body;
             var property = _dbContext.Properties.Where(x => x.Id == Convert.ToInt32(mm.Property)).FirstOrDefault();
+            string error = "";
 
-            body = body.Replace("[FULLNAME]", mm.Name);
-            body = body.Replace("[USEREMAIL]", mm.Email);
-            body = body.Replace("[USERCELLPHONE]", mm.Phone);
-            body = body.Replace("[PROPERTYID]", mm.Property);
+            body = body.Replace("[FULLNAME]", " " + mm.Name);
+            body = body.Replace("[USEREMAIL]", " " + mm.Email);
+            body = body.Replace("[USERCELLPHONE]", " " + mm.Phone);
+            body = body.Replace("[PROPERTYID]", " " + mm.Property);
             body = body.Replace("[PROPERTYNAME]", property.PropertyName);
             body = body.Replace("[PROPERTYREF]", property.PropertyRef);
             body = body.Replace("[PROPERTYPRICE]", property.Price.ToString());
-            body = body.Replace("[USERMESSAGE]", mm.Message);
+            body = body.Replace("[USERMESSAGE]", " " + mm.Message);
+            body = body.Replace("[USERHEARDFROM]", " " + mm.HeardFrom);
 
             string toList = "";
             int emailCount = 0;
@@ -118,24 +136,36 @@ namespace UnivateProperties_API.Repository.Communication
                     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 - Enquiry to view property";
-                mail.Body = body;
-                mail.IsBodyHtml = true;
-                mail.BodyEncoding = Encoding.ASCII;
-                mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
-                mail.Sender = new MailAddress(host.User, "UniVate Properties");
-                mail.From = new MailAddress(mm.Email, mm.Name);
-
-                smtp.UseDefaultCredentials = host.NeedsAuthorize;
-                smtp.Credentials = host.GetNetworkCredential();
-                smtp.EnableSsl = host.UseSSL;
-                smtp.Send(mail);
-            }            
+                var host = _dbContext.Hosts.FirstOrDefault();
+                using (SmtpClient smtp = new SmtpClient(host.Host))
+                {
+                    MailMessage mail = new MailMessage();
+                    mail.To.Add(toList);
+                    mail.Subject = "Uni-Vate - Enquiry to view property";
+                    mail.Body = body;
+                    mail.IsBodyHtml = true;
+                    mail.BodyEncoding = Encoding.ASCII;
+                    mail.DeliveryNotificationOptions = DeliveryNotificationOptions.OnFailure;
+                    mail.Sender = new MailAddress(host.User, "UniVate Properties");
+                    mail.From = new MailAddress(mm.Email, mm.Name);
+
+                    smtp.UseDefaultCredentials = host.NeedsAuthorize;
+                    smtp.Credentials = host.GetNetworkCredential();
+                    smtp.EnableSsl = host.UseSSL;
+                    smtp.Send(mail);
+                }
+                error = "None";
+            }
+            catch (Exception ex)
+            {
+                error = ex.ToString();
+            }
+            mm.ComType = "Enquire Now";
+            mm.Error = error;
+            _dbContext.CommunicationLog.Add(mm);
+            _dbContext.SaveChanges();
         }
 
         public void ForgotPassword(Individual toPerson, string link)
@@ -467,5 +497,16 @@ namespace UnivateProperties_API.Repository.Communication
             _dbContext.MailRecipients.Remove(rec);
             _dbContext.SaveChanges();
         }
+
+        public List<MailModel> GetContactUsLog()
+        {
+            return _dbContext.CommunicationLog.Where(x => x.ComType == "Contact Us").ToList();            
+        }
+
+        public List<MailModel> GetEnquireNowLog()
+        {
+            return _dbContext.CommunicationLog.Where(x => x.ComType == "Enquire Now").ToList();
+            
+        }
     }
 }

UnivateProperties_API/Repository/Properties/PropertyRepository.cs

@@ -640,7 +640,7 @@ namespace UnivateProperties_API.Repository.Properties
                     case "FOR SALE":
                         if (item.PriceRedused)
                         {
-                            display.DisplayText = "Price Redused";
+                            display.DisplayText = "Price Reduced";
                             display.DisplayColor = "green";
                         }
                         else