Miscellaneous refactors

Author: kentico-matthews

src/TrainingGuides.Admin/Pages/ProjectSettings/WebChannelSettings/WebChannelSnippetListingPage.cs

@@ -14,6 +14,7 @@
     order: 10)]
 
 namespace TrainingGuides.Admin.ProjectSettings.WebChannelSettings;
+
 public class WebChannelSnippetListingPage : ListingPage
 {
     private readonly IStringLocalizer<SharedResources> stringLocalizer;

src/TrainingGuides.Web/Features/ContactIimport/ScheduledTasks/ContactishContactDeletescheduledTask.cs

@@ -2,7 +2,6 @@
 using CMS.DataEngine;
 using CMS.EmailMarketing;
 using CMS.Scheduler;
-using Kentico.PageBuilder.Web.Mvc;
 using TrainingGuides.Web.Features.ContactImport;
 
 [assembly: RegisterScheduledTask(identifier: ContactishContactDeleteScheduledTask.IDENTIFIER, typeof(ContactishContactDeleteScheduledTask))]

src/TrainingGuides.Web/Features/EmailNotifications/EmailNotificationHandlerModule.cs

@@ -7,6 +7,7 @@
 [assembly: RegisterModule(typeof(EmailNotificationHandlerModule))]
 
 namespace TrainingGuides.Web.Features.EmailNotifications;
+
 public class EmailNotificationHandlerModule : Module
 {
 

src/TrainingGuides.Web/Features/LandingPages/Widgets/HeroBanner/HeroBannerWidgetViewComponent.cs

@@ -1,5 +1,4 @@
-using CMS.DataEngine;
-using Kentico.PageBuilder.Web.Mvc;
+using Kentico.PageBuilder.Web.Mvc;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ViewComponents;

src/TrainingGuides.Web/Features/Membership/Controllers/RegistrationController.cs

@@ -76,7 +76,13 @@ public async Task<IActionResult> Register(RegistrationWidgetViewModel model)
         }
         catch (Exception ex)
         {
-            logger.LogError(EventIds.MemberRegistration, ex, "An error occurred while registering a new member with username {UserName} in {Controller}.{Action}", model.UserName, nameof(RegistrationController), nameof(Register));
+            logger.LogError(EventIds.MemberRegistration,
+                ex,
+                "An error occurred while registering a new member with username {UserName} in {Controller}.{Action}",
+                model.UserName,
+                nameof(RegistrationController),
+                nameof(Register));
+
             result = IdentityResult.Failed([new() { Code = "Failure", Description = stringLocalizer["Registration failed."] }]);
         }
 

src/TrainingGuides.Web/Features/Membership/Services/MembershipService.cs

@@ -165,7 +165,12 @@ public async Task<SignInResult> SignIn(string userNameOrEmail, string password,
         }
         catch (Exception ex)
         {
-            logger.LogError(EventIds.MemberSignIn, ex, "An error occurred while signing in member with username or email {UserNameOrEmail} in {Service}.{Method}.", userNameOrEmail, nameof(MembershipService), nameof(SignIn));
+            logger.LogError(EventIds.MemberSignIn,
+                ex,
+                "An error occurred while signing in member with username or email {UserNameOrEmail} in {Service}.{Method}.",
+                userNameOrEmail,
+                nameof(MembershipService),
+                nameof(SignIn));
             return SignInResult.Failed;
         }
     }

src/TrainingGuides.Web/Features/Products/Widgets/Product/ProductWidgetViewComponent.cs

@@ -1,4 +1,3 @@
-using CMS.DataEngine;
 using CMS.Helpers;
 using Kentico.PageBuilder.Web.Mvc;
 using Microsoft.AspNetCore.Mvc;

src/TrainingGuides.Web/Features/Shared/Services/TrainingGuidesWebPageUrlRetriever.cs

@@ -43,7 +43,12 @@ public async Task<WebPageUrl> Retrieve(IWebPageFieldsSource webPageFieldsSource,
         }
         catch (InvalidOperationException ex)
         {
-            logger.LogError(EventIds.RetrieveUrl, ex, "An error occurred while retrieving URL for web page with GUID {WebPageItemGuid} and ID {WebPageItemId} at path {TreePath}.", webPageFieldsSource?.SystemFields.WebPageItemGUID, webPageFieldsSource?.SystemFields.WebPageItemID, webPageFieldsSource?.SystemFields.WebPageItemTreePath);
+            logger.LogError(EventIds.RetrieveUrl,
+                ex,
+                "An error occurred while retrieving URL for web page with GUID {WebPageItemGuid} and ID {WebPageItemId} at path {TreePath}.",
+                webPageFieldsSource?.SystemFields.WebPageItemGUID,
+                webPageFieldsSource?.SystemFields.WebPageItemID,
+                webPageFieldsSource?.SystemFields.WebPageItemTreePath);
             return EmptyUrl;
         }
     }
@@ -78,7 +83,13 @@ public async Task<WebPageUrl> Retrieve(IWebPageFieldsSource webPageFieldsSource,
         }
         catch (InvalidOperationException ex)
         {
-            logger.LogError(EventIds.RetrieveUrl, ex, "An error occurred while retrieving URL for web page with GUID {WebPageItemGuid} and ID {WebPageItemId} at path {TreePath} in language {LanguageName}.", webPageFieldsSource?.SystemFields.WebPageItemGUID, webPageFieldsSource?.SystemFields.WebPageItemID, webPageFieldsSource?.SystemFields.WebPageItemTreePath, languageName);
+            logger.LogError(EventIds.RetrieveUrl,
+                ex,
+                "An error occurred while retrieving URL for web page with GUID {WebPageItemGuid} and ID {WebPageItemId} at path {TreePath} in language {LanguageName}.",
+                webPageFieldsSource?.SystemFields.WebPageItemGUID,
+                webPageFieldsSource?.SystemFields.WebPageItemID,
+                webPageFieldsSource?.SystemFields.WebPageItemTreePath,
+                languageName);
             return EmptyUrl;
         }
     }
@@ -112,7 +123,13 @@ public async Task<WebPageUrl> Retrieve(string webPageUrlPath, string webPageTree
         }
         catch (InvalidOperationException ex)
         {
-            logger.LogError(EventIds.RetrieveUrl, ex, "An error occurred retrieving URL for web page with URL path {WebPageUrlPath} and tree path {WebPageTreePath} in website channel with ID {WebsiteChannelId} in language {languageName}.", webPageUrlPath, webPageTreePath, websiteChannelId, languageName);
+            logger.LogError(EventIds.RetrieveUrl,
+                ex,
+                "An error occurred retrieving URL for web page with URL path {WebPageUrlPath} and tree path {WebPageTreePath} in website channel with ID {WebsiteChannelId} in language {languageName}.",
+                webPageUrlPath,
+                webPageTreePath,
+                websiteChannelId,
+                languageName);
             return EmptyUrl;
         }
     }
@@ -137,7 +154,12 @@ public async Task<WebPageUrl> Retrieve(int webPageItemId, string languageName, b
         }
         catch (InvalidOperationException ex)
         {
-            logger.LogError(EventIds.RetrieveUrl, ex, "An error occurred retrieving URL for web page with ID {WebPageItemId} in language {LanguageName} (for preview: {ForPreview}).", webPageItemId, languageName, forPreview);
+            logger.LogError(EventIds.RetrieveUrl,
+                ex,
+                "An error occurred retrieving URL for web page with ID {WebPageItemId} in language {LanguageName} (for preview: {ForPreview}).",
+                webPageItemId,
+                languageName,
+                forPreview);
             return EmptyUrl;
         }
     }
@@ -162,7 +184,12 @@ public async Task<WebPageUrl> Retrieve(Guid webPageItemGuid, string languageName
         }
         catch (InvalidOperationException ex)
         {
-            logger.LogError(EventIds.RetrieveUrl, ex, "An error occurred retrieving URL for web page with GUID {WebPageItemGuid} in language {LanguageName} (for preview: {ForPreview}).", webPageItemGuid, languageName, forPreview);
+            logger.LogError(EventIds.RetrieveUrl,
+                ex,
+                "An error occurred retrieving URL for web page with GUID {WebPageItemGuid} in language {LanguageName} (for preview: {ForPreview}).",
+                webPageItemGuid,
+                languageName,
+                forPreview);
             return EmptyUrl;
         }
     }
@@ -188,7 +215,13 @@ public async Task<IDictionary<Guid, WebPageUrl>> Retrieve(IReadOnlyCollection<Gu
         }
         catch (InvalidOperationException ex)
         {
-            logger.LogError(EventIds.RetrieveUrl, ex, "An error occurred retrieving URLs for web pages with GUIDs {WebPageItemGuids} in website channel {WebsiteChannelName} in language {LanguageName} (for preview: {ForPreview}).", string.Join(", ", webPageItemGuids), websiteChannelName, languageName, forPreview);
+            logger.LogError(EventIds.RetrieveUrl,
+                ex,
+                "An error occurred retrieving URLs for web pages with GUIDs {WebPageItemGuids} in website channel {WebsiteChannelName} in language {LanguageName} (for preview: {ForPreview}).",
+                string.Join(", ", webPageItemGuids),
+                websiteChannelName,
+                languageName,
+                forPreview);
             return webPageItemGuids.ToDictionary(guid => guid, _ => EmptyUrl);
         }
     }
@@ -215,7 +248,13 @@ public async Task<WebPageUrl> Retrieve(string webPageTreePath, string websiteCha
         }
         catch (InvalidOperationException ex)
         {
-            logger.LogError(EventIds.RetrieveUrl, ex, "An error occurred retrieving URL for web page with tree path {WebPageTreePath} in website channel {WebsiteChannelName} in language {LanguageName} (for preview: {ForPreview}).", webPageTreePath, websiteChannelName, languageName, forPreview);
+            logger.LogError(EventIds.RetrieveUrl,
+                ex,
+                "An error occurred retrieving URL for web page with tree path {WebPageTreePath} in website channel {WebsiteChannelName} in language {LanguageName} (for preview: {ForPreview}).",
+                webPageTreePath,
+                websiteChannelName,
+                languageName,
+                forPreview);
             return EmptyUrl;
         }
     }

src/TrainingGuides.Web/OneTimeCode/ArticleConverter.cs

@@ -141,7 +141,7 @@ private async Task<string> GetArticleDisplayName(Article oldArticle, string lang
     }
 
     // Assemble content item data for a new GeneralArticle item based on the provided Article item
-    private async Task<ContentItemData> GetContentItemData(Article oldArticle) =>
+    private ContentItemData GetContentItemData(Article oldArticle) =>
         new(new Dictionary<string, object> {
             { nameof(GeneralArticle.ArticleSchemaTitle), oldArticle.ArticleTitle },
             { nameof(GeneralArticle.ArticleSchemaSummary), oldArticle.ArticleSummary },
@@ -171,7 +171,7 @@ private async Task<int> CreateNewReusableArticle(Article oldArticle, string lang
                 );
 
         // Assemble the field values for a new GeneralArticle item
-        var contentItemData = await GetContentItemData(oldArticle);
+        var contentItemData = GetContentItemData(oldArticle);
 
         int newId;
 
@@ -213,7 +213,7 @@ private async Task AddLanguageVersionOfReusableArticle(Article oldArticle, int p
             languageName);
 
         // Assemble the field values for a new language version
-        var contentItemData = await GetContentItemData(oldArticle);
+        var contentItemData = GetContentItemData(oldArticle);
 
         try
         {