Merge branch 'master' of http://provision-sa.co.za:3000/Provision/UnivatePropertiesAPI

UnivateProperties_API/Controllers/Communication/MailController.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using UnivateProperties_API.Model.Communication;
+using UnivateProperties_API.Repository.Communication;
+
+namespace UnivateProperties_API.Controllers.Communication
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class MailController : ControllerBase
+    {
+        private readonly IMailRepository _repo;
+        public MailController(IMailRepository repo)
+        {
+            _repo = repo;
+        }
+
+        [HttpPost("{id}")]
+        public IActionResult Post(int id, [FromBody] MailModel mm)
+        {
+            try
+            {
+                switch (id)
+                {
+                    case 0:
+                        _repo.ContactUs(mm);
+                        break;
+                }
+                return new OkResult();
+            }
+            catch
+            {
+                return new BadRequestResult();
+            }
+
+        }
+    }
+}

UnivateProperties_API/Controllers/Financial/PaymentController.cs

@@ -2,6 +2,7 @@
 using System.Transactions;
 using UnivateProperties_API.Model.Financial;
 using UnivateProperties_API.Repository;
+using UnivateProperties_API.Repository.Financial;
 
 namespace UnivateProperties_API.Controllers.Financial
 {
@@ -10,10 +11,12 @@ namespace UnivateProperties_API.Controllers.Financial
     public class PaymentController : ControllerBase
     {
         private readonly IRepository<Payment> _Repo;
+        private readonly IPaygateRepository _paygateRepo;
 
-        public PaymentController(IRepository<Payment> _repo)
+        public PaymentController(IRepository<Payment> _repo, IPaygateRepository paygateRepo)
         {
             _Repo = _repo;
+            _paygateRepo = paygateRepo;
         }
         
         [HttpGet]
@@ -33,9 +36,10 @@ namespace UnivateProperties_API.Controllers.Financial
         {
             using (var scope = new TransactionScope())
             {
-                _Repo.Insert(payment);
+                var paymentResult = _paygateRepo.GoToPaymentGateway(payment);
+                //_Repo.Insert(payment);
                 scope.Complete();
-                return CreatedAtAction(nameof(Get), new { id = payment.Id }, payment);
+                return new OkObjectResult(paymentResult);
             }
         }
         

UnivateProperties_API/Model/Communication/MailModel.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace UnivateProperties_API.Model.Communication
+{
+    public class MailModel
+    {
+        public string ToAddress { get; set; }
+
+        public string FromAddress { get; set; }
+
+        public string Name { get; set; }
+
+        public string Email { get; set; }
+
+        public string Phone { get; set; }
+
+        public string Property { get; set; }
+
+        public string Message { get; set; }
+    }
+}

UnivateProperties_API/Repository/Communication/MailRepository.cs

@@ -0,0 +1,59 @@
+using MailKit.Net.Smtp;
+using MimeKit;
+using UnivateProperties_API.Model.Communication;
+
+namespace UnivateProperties_API.Repository.Communication
+{
+    public interface IMailRepository
+    {
+        void ContactUs(MailModel mm);
+    }
+
+    public class MailRepository : IMailRepository
+    {
+        MimeMessage messageObj = new MimeMessage();
+        MailboxAddress from;
+        MailboxAddress to;
+        BodyBuilder bodyBuilder = new BodyBuilder();
+        SmtpClient client = new SmtpClient();
+
+        public void ContactUs(MailModel mm)
+        {
+            string property = mm.Property;
+            string phone = mm.Phone;
+            string name = mm.Name;
+            string email = mm.Email;
+            string message = mm.Message;
+
+            from = new MailboxAddress("Admin", mm.FromAddress);
+
+            to = new MailboxAddress("User", mm.ToAddress);
+
+            messageObj.From.Add(from);
+            messageObj.To.Add(to);
+
+            messageObj.Subject = "Uni-Vate - New Contact Request";
+
+            bodyBuilder.HtmlBody = "<div style=\"margin: 5px\">" +
+                "<h4>Contact from: "+  name +"!</h4>" +
+                "<h4>Email: "+ email +"</h4>" +
+                "<h4>Phone: " + phone + "</h4>" +
+                "<h4>Property: " + property + "</h4>" +
+                "<div>" +
+                "<h4>Message: </h4>" +
+                "<p>" + message + "</p>" +
+                "</div>" +
+                "</div>" +
+                "</div>";
+
+            messageObj.Body = bodyBuilder.ToMessageBody();
+
+            client.Connect("smtp.gmail.com", 465, true);
+            client.Authenticate("jlouw365@gmail.com", "setskohatxpsceqo");
+
+            client.Send(messageObj);
+            client.Disconnect(true);
+            client.Dispose();
+        }
+    }
+}

UnivateProperties_API/Repository/Financial/PaygateRepository.cs

@@ -0,0 +1,85 @@
+using RestSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using System.Threading.Tasks;
+using UnivateProperties_API.Model.Financial;
+
+namespace UnivateProperties_API.Repository.Financial
+{
+    public interface IPaygateRepository
+    {
+        string GoToPaymentGateway(Payment payment);
+    }
+
+    public class PaygateRepository: IPaygateRepository
+    {
+        public string GoToPaymentGateway(Payment payment)
+        {
+            string utcDate = DateTime.UtcNow.ToString("yyyy-MM-dd H:mm:ss");
+            var client = new RestClient("https://secure.paygate.co.za/payweb3/initiate.trans");
+            client.Timeout = -1;
+            var request = new RestRequest(Method.POST);
+            var total = payment.Amount;
+            string paygateId = "10011072130";
+            string reff = "";
+            if (payment.TimeshareWeekId != 0)
+            {
+                reff = payment.TimeshareWeekId.ToString();
+            }
+            else
+            {
+                reff = payment.PropertyId.ToString();
+            }
+
+            string amm = Math.Round((total * 100)).ToString();
+            string currenc = "ZAR";
+            string retUrl = "http://localhost:57260/api/values";
+            string transDate = utcDate;
+            string loc = "en-za";
+            string count = "ZAF";
+            string mail = "jlouw365@gmail.com";
+            request.AlwaysMultipartFormData = true;
+            request.AddParameter("PAYGATE_ID", paygateId);
+            request.AddParameter("REFERENCE", reff);
+            request.AddParameter("AMOUNT", amm);
+            request.AddParameter("CURRENCY", currenc);
+            request.AddParameter("RETURN_URL", retUrl);
+            request.AddParameter("TRANSACTION_DATE", transDate);
+            request.AddParameter("LOCALE", loc);
+            request.AddParameter("COUNTRY", count);
+            request.AddParameter("EMAIL", mail);
+            string checksum = Checksum(
+                paygateId +
+                reff +
+                amm +
+                currenc +
+                retUrl +
+                transDate +
+                loc +
+                count +
+                mail +
+                "secret");
+            request.AddParameter("CHECKSUM", checksum);
+            string gatewayReturn = client.Execute(request).Content.ToString();
+            List<string> vs = gatewayReturn.Split('&').ToList();
+            string payReqId = vs[1].Split('=')[1].ToString();
+            //var updatedOrder = _dbContext.Payments.OrderByDescending(x => x.Id).FirstOrDefault();
+            //updatedOrder.PaymentToken = payReqId;
+            //_dbContext.Payments.Update(updatedOrder);
+            //_dbContext.SaveChanges();
+            return client.Execute(request).Content.ToString();
+        }
+
+        private string Checksum(string data)
+        {
+            using (var md5 = MD5.Create())
+            {
+                return BitConverter.ToString(md5.ComputeHash(Encoding.UTF8.GetBytes(data)))
+                    .Replace("-", string.Empty).ToLower();
+            }
+        }
+    }
+}

UnivateProperties_API/Repository/Financial/PaymentRepository.cs

@@ -1,7 +1,10 @@
 using Microsoft.EntityFrameworkCore;
+using RestSharp;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.Financial;
 

UnivateProperties_API/Repository/IRepository.cs

@@ -16,7 +16,7 @@ namespace UnivateProperties_API.Repository
         void Remove(IEnumerable<TEntity> items);
         void RemoveAtId(int item);
         void Update(TEntity item);
-        int NewId();
+        //int NewId();
         void Save();
     }
 }

UnivateProperties_API/Repository/Users/RegisterRepository.cs

@@ -52,7 +52,7 @@ namespace UnivateProperties_API.Repository.Users
 
             user.PasswordHash = passwordHash;
             user.PasswordSalt = passwordSalt;
-            user.Id = NewUserId();
+            //user.Id = NewUserId();
             _dbContext.Users.Add(user);
             if (save)
             {
@@ -77,7 +77,7 @@ namespace UnivateProperties_API.Repository.Users
                 EAABEFFCNumber = agency.EaabeffcNumber,
                 CompanyRegNumber = agency.RegNo
             };
-            a.Id = NewAgencyId();
+            //a.Id = NewAgencyId();
             _dbContext.Agencies.Add(a);
             CreatePerson(agency.User, PersonType.Agent, false, a);
 
@@ -115,7 +115,7 @@ namespace UnivateProperties_API.Repository.Users
                     Telephone = individual.Telephone,
                     Agency = agency
                 };
-                agent.Id = NewAgentId();
+                //agent.Id = NewAgentId();
                 agent.User.Role = Role.Agency;
                 p = agent;
                 _dbContext.Agents.Add(agent);
@@ -131,7 +131,7 @@ namespace UnivateProperties_API.Repository.Users
                     CellNumber = individual.CellNumber,
                     Telephone = individual.Telephone
                 };
-                i.Id = NewIndividualId();
+                //i.Id = NewIndividualId();
                 i.User.Role = Role.PrivateUser;
                 p = i;
                 _dbContext.Individuals.Add(i);
@@ -262,49 +262,49 @@ namespace UnivateProperties_API.Repository.Users
             _dbContext.SaveChanges();
         }
 
-        public int NewAgencyId()
-        {
-            int id = 0;
-            if (_dbContext.Agencies.Count() > 0)
-            {
-                id = _dbContext.Agencies.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
-
-        public int NewAgentId()
-        {
-            int id = 0;
-            if (_dbContext.Agents.Count() > 0)
-            {
-                id = _dbContext.Agents.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
-
-        public int NewIndividualId()
-        {
-            int id = 0;
-            if (_dbContext.Individuals.Count() > 0)
-            {
-                id = _dbContext.Individuals.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
-
-        public int NewUserId()
-        {
-            int id = 0;
-            if (_dbContext.Users.Count() > 0)
-            {
-                id = _dbContext.Users.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
+        //public int NewAgencyId()
+        //{
+        //    int id = 0;
+        //    if (_dbContext.Agencies.Count() > 0)
+        //    {
+        //        id = _dbContext.Agencies.Max(x => x.Id);
+        //    }
+        //    id += 1;
+        //    return id;
+        //}
+
+        //public int NewAgentId()
+        //{
+        //    int id = 0;
+        //    if (_dbContext.Agents.Count() > 0)
+        //    {
+        //        id = _dbContext.Agents.Max(x => x.Id);
+        //    }
+        //    id += 1;
+        //    return id;
+        //}
+
+        //public int NewIndividualId()
+        //{
+        //    int id = 0;
+        //    if (_dbContext.Individuals.Count() > 0)
+        //    {
+        //        id = _dbContext.Individuals.Max(x => x.Id);
+        //    }
+        //    id += 1;
+        //    return id;
+        //}
+
+        //public int NewUserId()
+        //{
+        //    int id = 0;
+        //    if (_dbContext.Users.Count() > 0)
+        //    {
+        //        id = _dbContext.Users.Max(x => x.Id);
+        //    }
+        //    id += 1;
+        //    return id;
+        //}
 
         public SimplePersonDto UserDetails(int userId)
         {

UnivateProperties_API/Repository/Users/UserRepository.cs

@@ -42,20 +42,20 @@ namespace UnivateProperties_API.Repository.Users
 
         public void Insert(User item)
         {
-            item.Id = NewId();
+            //item.Id = NewId();
             _dbContext.Add(item);
             Save();
         }
 
         public void Insert(IEnumerable<User> item)
         {
-            int id = NewId();
-            foreach (var i in item)
-            {
-                i.Id = id;
-                _dbContext.Add(i);
-                id += 1;
-            }
+            //int id = NewId();
+            //foreach (var i in item)
+            //{
+            //    i.Id = id;
+                _dbContext.Add(item);
+            //    id += 1;
+            //}
             Save();
         }
 
@@ -135,15 +135,15 @@ namespace UnivateProperties_API.Repository.Users
             throw new NotImplementedException();
         }
 
-        public int NewId()
-        {
-            int id = 0;
-            if (_dbContext.Users.Count() > 0)
-            {
-                id = _dbContext.Users.Max(x => x.Id);
-            }
-            id += 1;
-            return id;
-        }
+        //public int NewId()
+        //{
+        //    int id = 0;
+        //    if (_dbContext.Users.Count() > 0)
+        //    {
+        //        id = _dbContext.Users.Max(x => x.Id);
+        //    }
+        //    id += 1;
+        //    return id;
+        //}
     }
 }

UnivateProperties_API/Startup.cs

@@ -152,10 +152,14 @@ namespace UnivateProperties_API
             services.AddTransient<IRepository<Email>, EmailRepository>();
             services.AddTransient<IRepository<SMTPAccount>, SMTPAccountRepository>();
             services.AddTransient<IRepository<SMTPHost>, SMTPHostRepository>();
+            services.AddTransient<IMailRepository, MailRepository>();
             #endregion Communication
             #region Logs 
             services.AddTransient<ISearchLogRepository, SearchLogRepository>();
             #endregion
+            #region Financial 
+            services.AddTransient<IPaygateRepository, PaygateRepository>();
+            #endregion
             #region Misc
             services.AddTransient<ICarouselRepository, CarouselRepository>();
             services.AddTransient<IRepository<PlaceHolderFormat>, PlaceHolderFormatRepository>();            

UnivateProperties_API/UnivateProperties_API.csproj

@@ -14,12 +14,15 @@
     <PackageReference Include="Abp.AutoMapper" Version="4.8.1" />
     <PackageReference Include="AutoMapper" Version="9.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="MailKit" Version="2.8.0" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Cors" Version="5.2.7" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.4" />
+    <PackageReference Include="MimeKit" Version="2.9.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
+    <PackageReference Include="RestSharp" Version="106.11.4" />
     <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
   </ItemGroup>
 

UnivateProperties_API/appsettings.json

@@ -9,7 +9,7 @@
   },
   "AllowedHosts": "*",
   "ConnectionStrings": {
-    "DefaultConnection": "Data Source=localhost;Initial Catalog=UniVateDemo;Persist Security Info=True;User Id=Provision;Password=What123!;Pooling=false;",
+    "DefaultConnection": "Data Source=192.168.0.219;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_test.sch&CLUB=LPA&RESORT=ALL&SUMMARY=N&HEAD=N"
   }
 }