Updated paygate functions

UnivateProperties_API/Containers/Timeshare/WeekDto.cs

@@ -103,7 +103,9 @@ namespace UnivateProperties_API.Containers.Timeshare
             OtherResort = week.OtherResort;
             Agency = week.Agency?.AgencyName;
             Agent = $"{week.Agent?.Name} {week.Agent?.Surname}";
-            Owner = $"{week.Owner?.Name} {week.Owner?.Surname}";
+            Owner = week.DisplayOwner;
+            OwnerId = week.Owner.Id;
+            UserId = week.Owner.UserId;
             Resort = new ResortDto(week.ResortCode, week.ResortName);
             Region = new RegionDto(week.Region != null ? week.Region.Id : 0, week.Region?.Code, week.Region?.Description);
             Season = week.Season;
@@ -138,6 +140,8 @@ namespace UnivateProperties_API.Containers.Timeshare
         public string Agency { get; set; }
         public string Agent { get; set; }
         public string Owner { get; set; }
+        public int OwnerId { get; set; }
+        public int? UserId { get; set; }
         public bool AgentAsRep { get; set; }
         public bool OtherResort { get; set; }
         public int Bedrooms { get; set; }

UnivateProperties_API/Controllers/Financial/PaymentController.cs

@@ -26,11 +26,11 @@ namespace UnivateProperties_API.Controllers.Financial
         }
 
         [HttpGet("{id}")]
-        public IActionResult Get(int id)
+        public IActionResult Get(string id)
         {
-            return new OkObjectResult(_Repo.Get(x => x.Id == id));
+            return new OkObjectResult(_Repo.Get(x => x.PayRequestId == id));
         }
-        
+
         [HttpPost]
         public IActionResult Post([FromBody] Payment payment)
         {

UnivateProperties_API/Controllers/Financial/RedirectController.cs

@@ -1,5 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Linq;
 using UnivateProperties_API.Model.Financial;
+using UnivateProperties_API.Model.Timeshare;
+using UnivateProperties_API.Repository;
+using UnivateProperties_API.Repository.Financial;
 
 namespace UnivateProperties_API.Controllers.Financial
 {
@@ -7,19 +12,46 @@ namespace UnivateProperties_API.Controllers.Financial
     [ApiController]
     public class RedirectController : ControllerBase
     {
+        private readonly IRepository<Payment> _repo;
+        private readonly IPaygateRepository _paygateRepo;
+        private readonly IRepository<TimeshareWeek> _timeshareRepo;
+
+        public RedirectController(IRepository<Payment> rp, IPaygateRepository pgr, IRepository<TimeshareWeek> timeshare)
+        {
+            _repo = rp;
+            _paygateRepo = pgr;
+            _timeshareRepo = timeshare;
+        }
 
         // POST: api/Redirect
         [HttpPost]
         [Consumes("application/x-www-form-urlencoded")]
         public RedirectResult PostRedirect([FromForm] ReturnToMerchant context)
         {
+            string paygateId = "10011072130";
+            var payment = _repo.Get(x => x.PayRequestId == context.PAY_REQUEST_ID).FirstOrDefault();
+            var timeshareWeek = _timeshareRepo.Get(x => x.Id == Convert.ToInt32(payment.PaymentToken)).FirstOrDefault();
+            if (context.TRANSACTION_STATUS == 0)
+            {
+                string queryResult = _paygateRepo.PaymentQuery(paygateId, payment);
+                
+                timeshareWeek.StatusId = 32;
+                _timeshareRepo.Update(timeshareWeek);
+                return Redirect("http://training.provision-sa.com:122/#/payments/error/" + context.PAY_REQUEST_ID);
+            }
             if (context.TRANSACTION_STATUS == 1)
             {
+                string queryResult = _paygateRepo.PaymentQuery(paygateId, payment);
+                timeshareWeek.StatusId = 22;
+                _timeshareRepo.Update(timeshareWeek);
                 return Redirect("http://training.provision-sa.com:122/#/payments/success");
             }
             else if (context.TRANSACTION_STATUS == 2)
             {
-                return Redirect("http://training.provision-sa.com:122/#/paymentError");
+                string queryResult = _paygateRepo.PaymentQuery(paygateId, payment);
+                timeshareWeek.StatusId = 32;
+                _timeshareRepo.Update(timeshareWeek);
+                return Redirect("http://training.provision-sa.com:122/#/payments/error/" + context.PAY_REQUEST_ID);
             }
             else
             {

UnivateProperties_API/Controllers/Timeshare/StatusController.cs

@@ -41,7 +41,7 @@ namespace UnivateProperties_API.Controllers.Timeshare
             }
         }
 
-        [HttpPut("{id}")]
+        [HttpPut]
         public IActionResult Put([FromBody] Status item)
         {
             if (item != null)

UnivateProperties_API/Controllers/Timeshare/TimeshareWeekController.cs

@@ -117,6 +117,21 @@ namespace UnivateProperties_API.Controllers.Timeshare
             return new NoContentResult();
         }
 
+        [HttpPut("publishOnly")]
+        public IActionResult PublishOnly([FromBody] WeekDto item)
+        {
+            if (item != null)
+            {
+                using (var scope = new TransactionScope())
+                {
+                    _Repo.PublishOnly(item);
+                    scope.Complete();
+                    return new OkResult();
+                }
+            }
+            return new NoContentResult();
+        }
+
         [HttpDelete("{id}")]
         public IActionResult Delete(int id)
         {

UnivateProperties_API/Migrations/20201027111708_TimeshareWeekDisplayOwner.cs

@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class TimeshareWeekDisplayOwner : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "DisplayOwner",
+                table: "Weeks",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DisplayOwner",
+                table: "Weeks");
+        }
+    }
+}

UnivateProperties_API/Migrations/20201030063947_addFieldsToPayments.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class addFieldsToPayments : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Checksum",
+                table: "Payments",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PayRequestId",
+                table: "Payments",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Checksum",
+                table: "Payments");
+
+            migrationBuilder.DropColumn(
+                name: "PayRequestId",
+                table: "Payments");
+        }
+    }
+}

UnivateProperties_API/Migrations/20201030070202_addFieldsToPayments1.cs

@@ -0,0 +1,50 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace UnivateProperties_API.Migrations
+{
+    public partial class addFieldsToPayments1 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Payments_Users_CreatedById",
+                table: "Payments");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "CreatedById",
+                table: "Payments",
+                nullable: true,
+                oldClrType: typeof(int));
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Payments_Users_CreatedById",
+                table: "Payments",
+                column: "CreatedById",
+                principalTable: "Users",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Payments_Users_CreatedById",
+                table: "Payments");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "CreatedById",
+                table: "Payments",
+                nullable: false,
+                oldClrType: typeof(int),
+                oldNullable: true);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Payments_Users_CreatedById",
+                table: "Payments",
+                column: "CreatedById",
+                principalTable: "Users",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+    }
+}

UnivateProperties_API/Migrations/DataContextModelSnapshot.cs

@@ -408,9 +408,11 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<decimal>("Amount");
 
+                    b.Property<string>("Checksum");
+
                     b.Property<DateTime>("Created");
 
-                    b.Property<int>("CreatedById");
+                    b.Property<int?>("CreatedById");
 
                     b.Property<bool>("IsDeleted");
 
@@ -418,6 +420,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<string>("ModifiedBy");
 
+                    b.Property<string>("PayRequestId");
+
                     b.Property<string>("PaymentStatus");
 
                     b.Property<string>("PaymentToken");
@@ -1056,6 +1060,8 @@ namespace UnivateProperties_API.Migrations
 
                     b.Property<DateTime>("DepartureDate");
 
+                    b.Property<string>("DisplayOwner");
+
                     b.Property<bool>("IsDeleted");
 
                     b.Property<bool>("LeviesPaidInFull");
@@ -1486,8 +1492,7 @@ namespace UnivateProperties_API.Migrations
                 {
                     b.HasOne("UnivateProperties_API.Model.Users.User", "CreatedBy")
                         .WithMany()
-                        .HasForeignKey("CreatedById")
-                        .OnDelete(DeleteBehavior.Cascade);
+                        .HasForeignKey("CreatedById");
 
                     b.HasOne("UnivateProperties_API.Model.Properties.Property", "Property")
                         .WithMany()

UnivateProperties_API/Model/Financial/Payment.cs

@@ -12,12 +12,11 @@ namespace UnivateProperties_API.Model.Financial
         public int? TimeshareWeekId { get; set; }
         [ForeignKey("Property")]
         public int? PropertyId { get; set; }
-        [ForeignKey("CreatedBy")]
-        public int CreatedById { get; set; }
         public decimal Amount { get; set; }
         public string PaymentStatus { get; set; }
         public string PaymentToken { get; set; }
-
+        public string Checksum { get; set; }
+        public string PayRequestId { get; set; }
 
         public virtual TimeshareWeek TimeshareWeek { get; set; }
         public virtual Property Property { get; set; }

UnivateProperties_API/Model/Financial/ReturnToMerchant.cs

@@ -7,7 +7,5 @@
         public int TRANSACTION_STATUS { get; set; }
 
         public string RESULT_CODE { get; set; }
-
-        public string CHECKSUM { get; set; }
     }
 }

UnivateProperties_API/Model/Timeshare/TimeshareWeek.cs

@@ -14,7 +14,7 @@ namespace UnivateProperties_API.Model.Timeshare
         {
         }
 
-        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 askingPrice, double agentCommision, bool mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows, string weekStatus, DateTime datePublished, bool published)
+        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 askingPrice, double agentCommision, bool mandate, int statusId, Status status, Province region, Individual owner, Agent agent, Agency agency, ICollection<BidItem> bidItems, ICollection<ProcessFlow.ProcessFlow> processFlows, string weekStatus, DateTime datePublished, bool published, string displayOwner)
         {
             ReferedByAgent = referedByAgent;
             AgentId = agentId;
@@ -56,6 +56,7 @@ namespace UnivateProperties_API.Model.Timeshare
             WeekStatus = weekStatus;
             Publish = published;
             PulbishedDate = datePublished;
+            DisplayOwner = displayOwner;
         }
 
         #region Properties
@@ -81,7 +82,7 @@ namespace UnivateProperties_API.Model.Timeshare
         public string UnitNumber { get; set; }
         public string WeekNumber { get; set; }
         public double LevyAmount { get; set; }
-
+        public string DisplayOwner { get; set; }
         public bool CurrentYearBanked { get; set; }
         public string BankedWith { get; set; }
 

UnivateProperties_API/Repository/Financial/PaygateRepository.cs

@@ -5,6 +5,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
+using UnivateProperties_API.Context;
 using UnivateProperties_API.Model.Financial;
 
 namespace UnivateProperties_API.Repository.Financial
@@ -12,10 +13,18 @@ namespace UnivateProperties_API.Repository.Financial
     public interface IPaygateRepository
     {
         string GoToPaymentGateway(Payment payment);
+        string PaymentQuery(string id, Payment payment);
     }
 
     public class PaygateRepository: IPaygateRepository
     {
+        private readonly DataContext _dbContext;
+
+        public PaygateRepository(DataContext db)
+        {
+            _dbContext = db;
+        }
+
         public string GoToPaymentGateway(Payment payment)
         {
             string utcDate = DateTime.UtcNow.ToString("yyyy-MM-dd H:mm:ss");
@@ -25,13 +34,16 @@ namespace UnivateProperties_API.Repository.Financial
             var total = payment.Amount;
             string paygateId = "10011072130";
             string reff = "";
+            Payment paymentObj = new Payment();
             if (payment.TimeshareWeekId != 0)
             {
                 reff = payment.TimeshareWeekId.ToString();
+                paymentObj.TimeshareWeekId = payment.TimeshareWeekId;
             }
             else
             {
                 reff = payment.PropertyId.ToString();
+                paymentObj.PropertyId = payment.PropertyId;
             }
 
             string amm = Math.Round((total * 100)).ToString();
@@ -66,11 +78,147 @@ namespace UnivateProperties_API.Repository.Financial
             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();
+            string resultString = client.Execute(request).Content.ToString();
+            var resultArr = resultString.Split('&');
+            List<string> valueArr = new List<string>();
+            foreach (var item in resultArr)
+            {
+                valueArr.Add(item.Split('=')[1]);
+            }
+
+            paymentObj.Amount = total;
+            paymentObj.PayRequestId = valueArr[1];
+            paymentObj.PaymentToken = valueArr[2];
+            paymentObj.Checksum = valueArr[3];
+
+            //PaymentQuery(paygateId, paymentObj);
+           
+
+            _dbContext.Payments.Add(paymentObj);
+            _dbContext.SaveChanges();
+
+            return resultString;
+        }
+
+        public string PaymentQuery(string paygateId, Payment payment)
+        {
+            var client = new RestClient("https://secure.paygate.co.za/payweb3/query.trans");
+            client.Timeout = -1;
+            var request = new RestRequest(Method.POST);
+            request.AddParameter("PAYGATE_ID", paygateId);
+            request.AddParameter("PAY_REQUEST_ID", payment.PayRequestId);
+            request.AddParameter("REFERENCE", payment.PaymentToken);
+            string checksum = Checksum(
+                paygateId +
+                payment.PayRequestId +
+                payment.PaymentToken +
+                "secret");
+            request.AddParameter("CHECKSUM", checksum);
+            string resultString = client.Execute(request).Content.ToString();
+            var resultArr = resultString.Split('&');
+            List<string> valueArr = new List<string>();
+            string transactionResult = "";
+            foreach (var item in resultArr)
+            {
+                valueArr.Add(item.Split('=')[1]);
+            }
+
+            switch (valueArr[4])
+            {
+                case "900001":
+                    transactionResult = "Call for Approval";
+                    break;
+                case "900002":
+                    transactionResult = "Card Expired";
+                    break;
+                case "900003":
+                    transactionResult = "Insufficient Funds";
+                    break;
+                case "900004":
+                    transactionResult = "Invalid Card Number";
+                    break;
+                case "900005": //Indicates a communications failure between the banks systems.
+                    transactionResult = "Bank Interface Timeout";
+                    break;
+                case "900006":
+                    transactionResult = "Invalid Card";
+                    break;
+                case "900007":
+                    transactionResult = "Declined";
+                    break;
+                case "900009":
+                    transactionResult = "Lost Card";
+                    break;
+                case "900010":
+                    transactionResult = "Invalid Card Length";
+                    break;
+                case "900011":
+                    transactionResult = "Suspected Fraud";
+                    break;
+                case "900012":
+                    transactionResult = "Card Reported as Stolen";
+                    break;
+                case "900013":
+                    transactionResult = "Restricted Card";
+                    break;
+                case "900014":
+                    transactionResult = "Excessive Card Usage";
+                    break;
+                case "900015":
+                    transactionResult = "Card Blacklisted";
+                    break;
+                case "990017":
+                    transactionResult = "Auth Done";
+                    break;
+                case "900207": //Indicates the cardholder did not enter their MasterCard SecureCode / Verified by Visa password correctly.
+                    transactionResult = "Declined; authentication failed";
+                    break;
+                case "990020":
+                    transactionResult = "Auth Declined";
+                    break;
+                case "900210": //Indicates that the MasterCard SecureCode / Verified-by-Visa transaction has already been completed. Most likely caused by a customer clicking the refresh button.
+                    transactionResult = "3D Secure Lookup Timeout";
+                    break;
+                case "991001":
+                    transactionResult = "Invalid expiry date";
+                    break;
+                case "991002":
+                    transactionResult = "Invalid Amount";
+                    break;
+                case "900205":
+                    transactionResult = "Unexpected authentication result (phase 1)";
+                    break;
+                case "900206":
+                    transactionResult = "Unexpected authentication result (phase 2)";
+                    break;
+                case "990001":
+                    transactionResult = "Could not insert into Database";
+                    break;
+                case "990022":
+                    transactionResult = "Bank not available";
+                    break;
+                case "990053":
+                    transactionResult = "Error processing transaction";
+                    break;
+                case "900209": //Indicates the verification data returned from MasterCard SecureCode / Verified-by-Visa has been altered.
+                    transactionResult = "Transaction verification failed (phase 2)";
+                    break;
+                case "900019":
+                    transactionResult = "Invalid PayVault Scope";
+                    break;
+                case "990024":
+                    transactionResult = "Duplicate Transaction Detected. Please check before submitting";
+                    break;
+                case "990028": //Customer clicks the ‘Cancel’ button on the payment page.
+                    transactionResult = "Transaction cancelled";
+                    break;
+            }
+
+            payment.PaymentStatus = transactionResult;
+            _dbContext.Payments.Update(payment);
+            _dbContext.SaveChanges();
+
+            return resultString;
         }
 
         private string Checksum(string data)

UnivateProperties_API/Repository/Timeshare/StatusRepository.cs

@@ -39,8 +39,8 @@ namespace UnivateProperties_API.Repository.Timeshare
 
         public void Insert(Status item)
         {
-            item.Id = NewId();
-            _dbContext.Add(item);
+            
+            _dbContext.Status.Add(item);
             Save();
         }
 

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

@@ -27,6 +27,7 @@ namespace UnivateProperties_API.Repository.Timeshare
     public interface IWeekRepository : IRepository<TimeshareWeek>
     {
         int SaveNewWeek(TimeshareWeekDto sellItem);
+        void PublishOnly(WeekDto week);
         List<WeekDto> GetAllByResortCode(string resortCode);
     }
 
@@ -46,7 +47,7 @@ namespace UnivateProperties_API.Repository.Timeshare
 
         public List<TimeshareWeek> GetAll()
         {
-            return _dbContext.Weeks.ToList();
+            return _dbContext.Weeks.Include("Owner").ToList();
         }
 
         public TimeshareWeek GetDetailed(Func<TimeshareWeek, bool> first)
@@ -238,6 +239,8 @@ namespace UnivateProperties_API.Repository.Timeshare
             {
                 IndividualRepository individual = new IndividualRepository(_dbContext);
                 week.Owner = individual.Get(x => x.Id == week.OwnerId).FirstOrDefault();
+                //week.DisplayOwner = week.Owner.Name + " " + week.Owner.Surname;
+                
             }
             return week;
         }
@@ -324,6 +327,24 @@ namespace UnivateProperties_API.Repository.Timeshare
             _dbContext.SaveChanges();
         }
 
+        public void PublishOnly(WeekDto week)
+        {
+            var saved = _dbContext.Weeks.Where(w => w.Id == week.Id).FirstOrDefault();
+
+            if(saved.StatusId != week.Status.Id)
+            {
+                saved.StatusId = week.Status.Id;
+            }
+
+            if (saved.Publish != week.Publish)
+            {
+                saved.Publish = week.Publish;
+            }
+
+            _dbContext.Update(saved);
+            Save();
+        }
+
         public void Update(TimeshareWeek item)
         {
             var saved = _dbContext.Weeks.Where(w => w.Id == item.Id).FirstOrDefault();
@@ -389,7 +410,13 @@ namespace UnivateProperties_API.Repository.Timeshare
                 saved.BankedWith = item.BankedWith;
             }
 
-            var owner = _dbContext.Individuals.Where(x => x.Id == item.Owner.Id).FirstOrDefault();
+
+            if (saved.DisplayOwner != item.DisplayOwner)
+            {
+                saved.DisplayOwner = item.Owner.Name + " " + item.Owner.Surname;
+            }
+
+            /*var owner = _dbContext.Individuals.Where(x => x.Id == item.OwnerId).FirstOrDefault();
 
             if (owner.Name != item.Owner.Name)
             {
@@ -418,7 +445,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             if (owner.Telephone != item.Owner.Telephone)
             {
                 owner.Telephone = item.Owner.Telephone;
-            }
+            }*/
 
 
             if (saved.Mandate != item.Mandate)
@@ -426,10 +453,22 @@ namespace UnivateProperties_API.Repository.Timeshare
                 if (item.Mandate)
                     saved.DateMandated = DateTime.Now;
             }
-            if (saved.WeekStatus != item.WeekStatus)
+
+            if (item.Status != null)
+            {
+                if (saved.StatusId != item.Status.Id)
+                {
+                    saved.StatusId = item.Status.Id;
+                }
+            }
+            else
             {
-                saved.WeekStatus = item.WeekStatus;
+                var status = _dbContext.Status.Where(x => x.Id == item.StatusId).FirstOrDefault();
+                saved.Status = status;
+                saved.StatusId = item.StatusId;
             }
+            
+
             if (saved.Publish != item.Publish)
             {
                 saved.Publish = item.Publish;
@@ -709,6 +748,7 @@ namespace UnivateProperties_API.Repository.Timeshare
             owner.Email = sellItem.OwnerObject.EmailAddress;
             owner.CellNumber = sellItem.OwnerObject.CellNumber;
             owner.Telephone = sellItem.OwnerObject.LandlineNumber;
+            sellItem.DisplayOwner = owner.Name + " " +  owner.Surname;
 
             switch (sellItem.OwnerObject.MaritalStatus.ToUpper())
             {