Merge pull request #1890 from johnhenley/dev98/features/performance-topposts-1889

ENH: Refactor WhatsNew data retrieval and caching logic

Author: johnhenley

Dnn.CommunityForums/CustomControls/ServerControls/WhatsNewControl.cs

@@ -202,7 +202,7 @@ protected override void OnLoad(EventArgs e)
             }
             else
             {
-                dr = DataProvider.Instance().GetPosts(this.PortalId, this.ForumIds, this.TopicsOnly, this.RandomOrder, this.Rows, this.Tags, this.FilterByUserId);
+                dr = DataProvider.Instance().GetPosts(this.ForumIds, this.TopicsOnly, this.RandomOrder, this.Rows, this.Tags, this.FilterByUserId);
             }
 
             try

Dnn.CommunityForums/CustomControls/UserControls/WhatsNewRSS.cs

@@ -22,13 +22,17 @@ namespace DotNetNuke.Modules.ActiveForums.Controls
 {
     using System;
     using System.Collections;
+    using System.Collections.Generic;
     using System.ComponentModel;
     using System.Text;
     using System.Text.RegularExpressions;
     using System.Web;
     using System.Web.UI;
 
     using DotNetNuke.Entities.Portals;
+    using DotNetNuke.Modules.ActiveForums.Data;
+
+    using Newtonsoft.Json.Bson;
 
     [DefaultProperty("Text"), ToolboxData("<{0}:WhatsNewRSS runat=server></{0}:WhatsNewRSS>")]
     public class WhatsNewRSS : Control
@@ -250,8 +254,8 @@ private string BuildRSS()
             // build items
             var forumids = this.Settings.RSSIgnoreSecurity ? this.Settings.Forums : this.AuthorizedForums;
 
-            var dr = DataProvider.Instance().GetPosts(this.PortalId, forumids, true, false, this.Settings.Rows, this.Settings.Tags);
             var sHost = Utilities.GetHost();
+            var dr = DataProvider.Instance().GetPosts(forums: forumids, topicsOnly: true, randomOrder: false, rows: this.Settings.Rows, tags: this.Settings.Tags);
 
             try
             {
@@ -287,16 +291,14 @@ private string BuildRSS()
                         lastBuildDate = dateCreated;
                     }
 
-                    var ts = SettingsBase.GetModuleSettings(topicModuleId);
-
                     string url;
                     if (string.IsNullOrEmpty(sTopicUrl) || !Utilities.UseFriendlyURLs(topicModuleId))
                     {
                         string[] @params = { ParamKeys.ViewType + "=" + Views.Topic, ParamKeys.ForumId + "=" + forumId, ParamKeys.TopicId + "=" + topicId };
                         url = Utilities.NavigateURL(topicTabId, string.Empty, @params);
                         if (url.IndexOf(HttpContext.Current.Request.Url.Host, StringComparison.CurrentCulture) == -1)
                         {
-                            url = Common.Globals.AddHTTP(HttpContext.Current.Request.Url.Host) + url;
+                            url = DotNetNuke.Common.Globals.AddHTTP(HttpContext.Current.Request.Url.Host) + url;
                         }
                     }
                     else
@@ -324,7 +326,7 @@ private string BuildRSS()
                         // Legacy Attachment functionality uses "attachid"
                         if (bodyHtml.Contains("&#91;IMAGE:"))
                         {
-                            var strHost = Common.Globals.AddHTTP(Common.Globals.GetDomainName(HttpContext.Current.Request)) + "/";
+                            var strHost = DotNetNuke.Common.Globals.AddHTTP(DotNetNuke.Common.Globals.GetDomainName(HttpContext.Current.Request)) + "/";
                             const string pattern = "(&#91;IMAGE:(.+?)&#93;)";
                             foreach (Match match in DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Matches(bodyHtml))
                             {
@@ -336,7 +338,7 @@ private string BuildRSS()
                         // Legacy Attachment functionality uses "attachid"
                         if (bodyHtml.Contains("&#91;THUMBNAIL:"))
                         {
-                            var strHost = Common.Globals.AddHTTP(Common.Globals.GetDomainName(HttpContext.Current.Request)) + "/";
+                            var strHost = DotNetNuke.Common.Globals.AddHTTP(DotNetNuke.Common.Globals.GetDomainName(HttpContext.Current.Request)) + "/";
                             const string pattern = "(&#91;THUMBNAIL:(.+?)&#93;)";
                             foreach (Match match in DotNetNuke.Common.Utilities.RegexUtils.GetCachedRegex(pattern).Matches(bodyHtml))
                             {
@@ -347,8 +349,8 @@ private string BuildRSS()
                             }
                         }
 
-                        bodyHtml = bodyHtml.Replace("src=\"/Portals", "src=\"" + Common.Globals.AddHTTP(HttpContext.Current.Request.Url.Host) + "/Portals");
-                        bodyHtml = Utilities.ManageImagePath(bodyHtml, new Uri(Common.Globals.AddHTTP(HttpContext.Current.Request.Url.Host)));
+                        bodyHtml = bodyHtml.Replace("src=\"/Portals", "src=\"" + DotNetNuke.Common.Globals.AddHTTP(HttpContext.Current.Request.Url.Host) + "/Portals");
+                        bodyHtml = Utilities.ManageImagePath(bodyHtml, new Uri(DotNetNuke.Common.Globals.AddHTTP(HttpContext.Current.Request.Url.Host)));
 
                         sb.Append(WriteElement("description", bodyHtml, indent + 1));
                     }

Dnn.CommunityForums/Providers/DataProviders/SqlDataProvider/SqlDataProvider.cs

@@ -813,10 +813,12 @@ public override IDataReader PortalForums(int PortalId)
             return (IDataReader)SqlHelper.ExecuteReader(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_TP_PortalForums", PortalId);
         }
 
-        public override IDataReader GetPosts(int PortalId, string Forums, bool TopicsOnly, bool RandomOrder, int Rows, string Tags, int FilterByUserId = -1)
+        [Obsolete("Deprecated in Community Forums. Removed in 10.00.00. Not Used.")]
+        public override IDataReader GetPosts(int PortalId, string Forums, bool TopicsOnly, bool RandomOrder, int Rows, string Tags, int FilterByUserId = -1) => throw new NotImplementedException();
+
+        public override IDataReader GetPosts(string Forums, bool TopicsOnly, bool RandomOrder, int Rows, string Tags, int FilterByUserId = -1)
         {
-            const bool IgnoreSecurity = false; // Required by proc but not currently used
-            return (IDataReader)SqlHelper.ExecuteReader(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_TP_GetPosts", PortalId, Forums, TopicsOnly, RandomOrder, Rows, IgnoreSecurity, Tags, FilterByUserId);
+            return (IDataReader)SqlHelper.ExecuteReader(this.ConnectionString, this.DatabaseOwner + this.ObjectQualifier + "activeforums_TP_GetPosts", Forums, TopicsOnly, RandomOrder, Rows, Tags, FilterByUserId);
         }
 
         public override IDataReader GetPostsByUser(int PortalId, int Rows, bool IsSuperUser, int currentUserId, int FilteredUserid, bool TopicsOnly, string ForumIds)