MailService Update

UnivateProperties_API/Controllers/Timeshare/ResortController.cs

         {
             return new OkObjectResult(_Repo.GetResortData(code));
         }
+
+        [HttpGet("GetPublishedResortsWithListings")]
+        public IActionResult GetResortsWithListings()
+        {
+            return new OkObjectResult(_Repo.GetResortsWithListings());
+        }
     }
 }

UnivateProperties_API/Repository/Communication/MailRepository.cs

 using System.Linq.Dynamic.Core;
 using System.Net.Mail;
 using System.Text;
+using UnivateProperties_API.Containers.Timeshare;
 using UnivateProperties_API.Context;
 using UnivateProperties_API.Helpers;
 using UnivateProperties_API.Model.Communication;
             }
         }
 
-        public void WeekLoadedOwner(TimeshareWeek week)
+        public void WeekLoadedOwner(TimeshareWeekDto week)
         {
             string body = _dbContext.Templates.Where(x => x.Name == "WeekLoaded-Owner").Where(y => y.IsDeleted == false).FirstOrDefault().Body;
             var recipients = _dbContext.MailRecipients.Where(x => x.RecipientUsage == "WeekLoaded-Owner").Where(y => y.IsDeleted == false).ToList();
 
-            body = body.Replace("[FULLNAME]", week.DisplayOwner);
-            body = body.Replace("[RESORTNAME]", week.ResortName);
-            body = body.Replace("[UNITNUMBER]", week.UnitNumber);
-            body = body.Replace("[MODULE]", week.Module);
+            #region ResortFields
+            body = body.Replace("[RESORTNAME]", " " + week.ResortName);
+            body = body.Replace("[UNITNUMBER]", " " + week.UnitNumber);
+            body = body.Replace("[MODULE]", " " + week.Module);
+            body = body.Replace("[RESORTPRICE]", " " + week.SellPrice.ToString());
+            body = body.Replace("[RESORTSEASON]", " " + week.Season);
+            body = body.Replace("[RESORTREGION]", " " + week.Region.Display);
+            body = body.Replace("[RESORTLEVY]", " " + week.LevyAmount.ToString());           
+            body = body.Replace("[OWNER]", " " + week.DisplayOwner);
+            body = body.Replace("[SLEEPMAX]", " " + week.MaxSleep.ToString());
+            body = body.Replace("[WEEK]", " " + week.WeekNumber);
+            body = body.Replace("[BEDROOMS]", " " + week.Bedrooms);
+            body = body.Replace("[ASKINGPRICE]", " " + week.AskingPrice.ToString());
+            body = body.Replace("[ARRIVALDATE]", " " + week.ArrivalDate.ToString());
+            body = body.Replace("[DEPARTUREDATE]", " " + week.DepartureDate.ToString());
+            body = body.Replace("[AGENTREFER]", week.ReferedByAgent ? " Yes" : " No");
+            body = body.Replace("[ALLLEVY]", week.LeviesPaidInFull ? " Yes" : " No");
+            body = body.Replace("[WEEKPLACEDFORRENTAL]", week.WeekPlacedForRental ? " Yes" : " No");
+            body = body.Replace("[ORIGINALPURCHASEDATE]", " " + week.OriginalPurchaseDate.ToString());
+            body = body.Replace("[CUROCCUPATIONDATES]", " " + week.ArrivalDate.ToString() + " - " + week.DepartureDate.ToString());
+            body = body.Replace("[ORIGINALPURCHASEPRICE]", " " + week.OriginalPurchasePrice.ToString());
+            body = body.Replace("[AGENTCOMM]", " " + week.AgentCommision.ToString());
+            #endregion
+
+            #region UserFields
+            body = body.Replace("[FULLNAME]", " " + week.DisplayOwner );
+            body = body.Replace("[USEREMAIL]", " " + week.OwnerObject.EmailAddress);
+            body = body.Replace("[USERCELLPHONE]", " " + week.OwnerObject.CellNumber);
+            body = body.Replace("[USERTELEPHONE]", " " + week.OwnerObject.LandlineNumber);
+            #endregion
 
             string toList = "";
             int emailCount = 0;

UnivateProperties_API/Repository/Timeshare/IResortRepository.cs

 using RestSharp;
 using System.Collections.Generic;
 using System.Data;
+using System.Dynamic;
 using System.IO;
 using System.Linq;
 using UnivateProperties_API.Containers.Timeshare;
         string GetResortDescription(string resortCode);
         List<string> GetResortImages(string resortCode);
         ResortData GetResortData(string resortCode);
+        List<dynamic> GetResortsWithListings();
     }
 
     public class ResortRepository : IResortRepository
             return images;
         }
 
+        public List<dynamic> GetResortsWithListings()
+        {
+            var weeks = _dbContext.Weeks.Where(x => x.Publish).ToList();
+            var provinces = _dbContext.Provinces.ToList();
+            List<string> resortNames = new List<string>();
+            List<dynamic> resortObjects = new List<dynamic>();
+            foreach (var week in weeks)
+            {
+                dynamic resortObject = new ExpandoObject();
+                if (!resortNames.Contains(week.ResortName))
+                {
+                    resortNames.Add(week.ResortName);
+                    resortObject.resortName = week.ResortName;
+                    resortObject.resortCode = week.ResortCode;
+                    resortObject.resortRegion = provinces.Where(p => p.Id == week.RegionId);
+                    resortObjects.Add(resortObject);
+                }
+            }            
+            return resortObjects;
+        }
+
         public DataSet CreateDataSet(string data)
         {
             try

UnivateProperties_API/Repository/Timeshare/WeekRepository.cs

             List<WeekDto> list = new List<WeekDto>();
             UserRepository userRepository = new UserRepository(_dbContext);
             var user = userRepository.Get(x => x.Id == userId).FirstOrDefault();
-            if (user.IsUserInRole(Role.SuperAdmin))
+            if (userId == 0)
             {
                 foreach (var item in GetDetailedAll())
                 {
-                    list.Add(new WeekDto(item));
+                    if (item.Publish)
+                    {
+                        list.Add(new WeekDto(item));
+                    }
+
                 }
             }
-            else if (user.IsUserInRole(Role.Agency))
+            else 
             {
-                var agent = _dbContext.Agents.FirstOrDefault(x => x.UserId == userId);
-                if(agent != null)
+                if (user.IsUserInRole(Role.SuperAdmin))
                 {
-                    foreach (var item in GetDetailedAll().Where(x => x.AgencyId == agent.AgencyId))
+                    foreach (var item in GetDetailedAll())
                     {
                         list.Add(new WeekDto(item));
                     }
-                }                
-            }
-            else if (user.IsUserInRole(Role.Agent) || user.IsUserInRole(Role.ManagingAgent))
-            {
-                var agent = _dbContext.Agents.FirstOrDefault(x => x.UserId == userId);
-                if(agent != null)
+                }
+                else if (user.IsUserInRole(Role.Agency))
                 {
-                    foreach (var item in GetDetailedAll().Where(x => x.AgentId == agent.Id))
+                    var agent = _dbContext.Agents.FirstOrDefault(x => x.UserId == userId);
+                    if (agent != null)
                     {
-                        list.Add(new WeekDto(item));
+                        foreach (var item in GetDetailedAll().Where(x => x.AgencyId == agent.AgencyId))
+                        {
+                            list.Add(new WeekDto(item));
+                        }
                     }
                 }
-            }
-            else
-            {
-                var individual = _dbContext.Individuals.FirstOrDefault(x => x.UserId == userId);
-                if(individual != null)
+                else if (user.IsUserInRole(Role.Agent) || user.IsUserInRole(Role.ManagingAgent))
                 {
-                    foreach (var item in GetDetailedAll().Where(x => x.OwnerId == individual.Id))
+                    var agent = _dbContext.Agents.FirstOrDefault(x => x.UserId == userId);
+                    if (agent != null)
                     {
-                        list.Add(new WeekDto(item));
+                        foreach (var item in GetDetailedAll().Where(x => x.AgentId == agent.Id))
+                        {
+                            list.Add(new WeekDto(item));
+                        }
                     }
-                }                
+                }
+                else
+                {
+                    var individual = _dbContext.Individuals.FirstOrDefault(x => x.UserId == userId);
+                    if (individual != null)
+                    {
+                        foreach (var item in GetDetailedAll().Where(x => x.OwnerId == individual.Id))
+                        {
+                            list.Add(new WeekDto(item));
+                        }
+                    }
+                }
             }
+
+            
             return list;
         }
 
             {
                 saved.ResortCode = item.ResortCode;
             }
+            if (saved.ResortName != item.ResortName)
+            {
+                saved.ResortName = item.ResortName;
+            }
             if (saved.UnitNumber != item.UnitNumber)
             {
                 saved.UnitNumber = item.UnitNumber;