Skip to content

Commit 110d79c

Browse files
dominikag2dominikag2
committed
GH-125 :: removing forgotten unused code, comments and old URL retrieval, adjusting the code to match the guides better
1 parent 9002b79 commit 110d79c

File tree

11 files changed

+46
-587
lines changed

11 files changed

+46
-587
lines changed

‎src/TrainingGuides.Web.Tests/Features/Articles/Services/ArticlePageServiceTests.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,76 +82,76 @@ public ArticlePageServiceTests()
8282
};
8383

8484
[Fact]
85-
public async Task GetArticlePageViewModel_IfArticlePageNull_ReturnsEmptyModel()
85+
public void GetArticlePageViewModel_IfArticlePageNull_ReturnsEmptyModel()
8686
{
87-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(null);
87+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(null);
8888
Assert.Equivalent(new ArticlePageViewModel(), articlePageViewModel);
8989
}
9090

9191
// old Article type, not using Reusable Field Schema
9292
[Fact]
93-
public async Task GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleTitleSet()
93+
public void GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleTitleSet()
9494
{
9595
var articlePage = BuildSampleArticlePageWithOldArticle();
96-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
96+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
9797
Assert.Equal(referenceArticleViewModel.Title, articlePageViewModel.Title);
9898
}
9999

100100
[Fact]
101-
public async Task GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleSummarySet()
101+
public void GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleSummarySet()
102102
{
103103
var articlePage = BuildSampleArticlePageWithOldArticle();
104-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
104+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
105105
Assert.Equal(referenceArticleViewModel.SummaryHtml.Value, articlePageViewModel.SummaryHtml.Value);
106106
}
107107

108108
[Fact]
109-
public async Task GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleTextSet()
109+
public void GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleTextSet()
110110
{
111111
var articlePage = BuildSampleArticlePageWithOldArticle();
112-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
112+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
113113
Assert.Equal(referenceArticleViewModel.TextHtml.Value, articlePageViewModel.TextHtml.Value);
114114
}
115115

116116
[Fact]
117-
public async Task GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleUrlSet()
117+
public void GetArticlePageViewModel_ForOldArticle_ReturnsModel_WithArticleUrlSet()
118118
{
119119
var articlePage = BuildSampleArticlePageWithOldArticle();
120-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
120+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
121121
Assert.Equal(referenceArticleViewModel.Url, articlePageViewModel.Url);
122122
}
123123

124124
// new General article type implementing the reusable field schema
125125

126126
[Fact]
127-
public async Task GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleTitleSet()
127+
public void GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleTitleSet()
128128
{
129129
var articlePage = BuildSampleArticlePageWithNewRFSArticle();
130-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
130+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
131131
Assert.Equal(referenceArticleViewModel.Title, articlePageViewModel.Title);
132132
}
133133

134134
[Fact]
135-
public async Task GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleSummarySet()
135+
public void GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleSummarySet()
136136
{
137137
var articlePage = BuildSampleArticlePageWithNewRFSArticle();
138-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
138+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
139139
Assert.Equal(referenceArticleViewModel.SummaryHtml.Value, articlePageViewModel.SummaryHtml.Value);
140140
}
141141

142142
[Fact]
143-
public async Task GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleTextSet()
143+
public void GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleTextSet()
144144
{
145145
var articlePage = BuildSampleArticlePageWithNewRFSArticle();
146-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
146+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
147147
Assert.Equal(referenceArticleViewModel.TextHtml.Value, articlePageViewModel.TextHtml.Value);
148148
}
149149

150150
[Fact]
151-
public async Task GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleUrlSet()
151+
public void GetArticlePageViewModel_ForNewRFSArticle_ReturnsModel_WithArticleUrlSet()
152152
{
153153
var articlePage = BuildSampleArticlePageWithNewRFSArticle();
154-
var articlePageViewModel = await articlePageService.GetArticlePageViewModel(articlePage);
154+
var articlePageViewModel = articlePageService.GetArticlePageViewModel(articlePage);
155155
Assert.Equal(referenceArticleViewModel.Url, articlePageViewModel.Url);
156156
}
157157
}

‎src/TrainingGuides.Web/Features/Articles/ArticlePageController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public async Task<IActionResult> Index()
4040
return Forbid();
4141
}
4242

43-
var model = await articlePageService.GetArticlePageViewModel(articlePage);
43+
var model = articlePageService.GetArticlePageViewModel(articlePage);
4444
return new TemplateResult(model);
4545
}
4646
}

‎src/TrainingGuides.Web/Features/Articles/Services/ArticlePageService.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,14 @@ public ArticlePageService(IWebPageUrlRetriever webPageUrlRetriever,
2626
}
2727

2828
/// <inheritdoc/>
29-
public async Task<ArticlePageViewModel> GetArticlePageViewModel(ArticlePage? articlePage)
29+
public ArticlePageViewModel GetArticlePageViewModel(ArticlePage? articlePage)
3030
{
3131
if (articlePage == null)
3232
{
3333
return new ArticlePageViewModel();
3434
}
3535

36-
string language = preferredLanguageRetriever.Get();
37-
38-
string articleUrl = (await webPageUrlRetriever.Retrieve(articlePage, language)).RelativePath;
36+
string articleUrl = articlePage.GetUrl().RelativePath;
3937
var articleSchema = articlePage.ArticlePageArticleContent.FirstOrDefault();
4038

4139
if (articleSchema != null)
@@ -70,9 +68,9 @@ public async Task<ArticlePageViewModel> GetArticlePageViewModel(ArticlePage? art
7068
}
7169

7270
/// <inheritdoc/>
73-
public async Task<ArticlePageViewModel> GetArticlePageViewModelWithSecurity(ArticlePage? articlePage, string signInUrl, bool isAuthenticated)
71+
public ArticlePageViewModel GetArticlePageViewModelWithSecurity(ArticlePage? articlePage, string signInUrl, bool isAuthenticated)
7472
{
75-
var originalViewModel = await GetArticlePageViewModel(articlePage);
73+
var originalViewModel = GetArticlePageViewModel(articlePage);
7674

7775
if (articlePage is null)
7876
{

‎src/TrainingGuides.Web/Features/Articles/Services/IArticlePageService.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public interface IArticlePageService
77
/// </summary>
88
/// <param name="articlePage">Corresponding Article page object.</param>
99
/// <returns>New instance of ArticlePageViewModel.</returns>
10-
Task<ArticlePageViewModel> GetArticlePageViewModel(ArticlePage? articlePage);
10+
ArticlePageViewModel GetArticlePageViewModel(ArticlePage? articlePage);
1111

1212
/// <summary>
1313
/// Creates a new instance of <see cref="ArticlePageViewModel"/>, setting the properties using ArticlePage given as a parameter.
@@ -16,7 +16,8 @@ public interface IArticlePageService
1616
/// <returns>New instance of ArticlePageViewModel.</returns>
1717
/// <remarks>
1818
/// If the articlePage is secured and the current visitor is not authenticated, the view model will prompt them to sign in.
19-
Task<ArticlePageViewModel> GetArticlePageViewModelWithSecurity(ArticlePage? articlePage, string signInUrl, bool isAuthenticated);
19+
/// </remarks>
20+
ArticlePageViewModel GetArticlePageViewModelWithSecurity(ArticlePage? articlePage, string signInUrl, bool isAuthenticated);
2021

2122
/// <summary>
2223
/// Determines whether the reusable article item referenced by the article page is secured.

‎src/TrainingGuides.Web/Features/Articles/Widgets/ArticleList/ArticleListWidgetViewComponent.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ private async Task<List<ArticlePageViewModel>> GetArticlePageViewModels(IEnumera
143143
string signInUrl = await membershipService.GetSignInUrl(language);
144144

145145
var model = securedItemsDisplayMode.Equals(SecuredOption.PromptForLogin.ToString())
146-
? await articlePageService.GetArticlePageViewModelWithSecurity(articlePage, signInUrl, await membershipService.IsMemberAuthenticated())
147-
: await articlePageService.GetArticlePageViewModel(articlePage);
146+
? articlePageService.GetArticlePageViewModelWithSecurity(articlePage, signInUrl, await membershipService.IsMemberAuthenticated())
147+
: articlePageService.GetArticlePageViewModel(articlePage);
148148

149149
models.Add(model);
150150
}

‎src/TrainingGuides.Web/Features/Articles/Widgets/FeaturedArticle/FeaturedArticleWidgetViewComponent.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public async Task<ViewViewComponentResult> InvokeAsync(FeaturedArticleWidgetProp
3838
var model = articlePage != null
3939
? new FeaturedArticleWidgetViewModel()
4040
{
41-
Article = await articlePageService.GetArticlePageViewModel(articlePage)
41+
Article = articlePageService.GetArticlePageViewModel(articlePage)
4242
}
4343
: null;
4444

‎src/TrainingGuides.Web/Features/Products/ProductPageController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public ProductPageController(
2424
this.contentItemRetriever = contentItemRetriever;
2525
this.productPageService = productPageService;
2626
}
27-
27+
2828
public async Task<IActionResult> Index()
2929
{
3030
var productPage = await contentItemRetriever.RetrieveCurrentPage<ProductPage>(3);

‎src/TrainingGuides.Web/Features/Shared/Services/ContentItemRetrieverService.cs‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ public ContentItemRetrieverService(
6868
return pages.FirstOrDefault();
6969
}
7070

71-
/// <inheritdoc />
72-
public async Task<IEnumerable<T>> RetrieveWebPageChildrenByPath<T>(
71+
private async Task<IEnumerable<T>> RetrieveWebPageChildrenByPath<T>(
7372
string path,
7473
int depth = 1,
7574
bool includeSecuredItems = true,
@@ -92,6 +91,20 @@ public async Task<IEnumerable<T>> RetrieveWebPageChildrenByPath<T>(
9291
cacheSettings: RetrievalCacheSettings.CacheDisabled);
9392
}
9493

94+
/// <inheritdoc />
95+
public async Task<IEnumerable<T>> RetrieveWebPageChildrenByPath<T>(
96+
string path,
97+
int depth = 1,
98+
bool includeSecuredItems = true,
99+
string? languageName = null)
100+
where T : IWebPageFieldsSource, new()
101+
=> await RetrieveWebPageChildrenByPath<T>(
102+
path,
103+
depth,
104+
includeSecuredItems,
105+
null,
106+
languageName);
107+
95108
public async Task<IEnumerable<T>> RetrieveWebPageChildrenByPathAndReference<T>(
96109
string parentPageContentTypeName,
97110
string parentPagePath,
@@ -144,19 +157,6 @@ public async Task<IEnumerable<T>> RetrieveReusableContentItemsFromSmartFolder<T>
144157
{
145158
const string LAST_PUBLISHED_COLUMN_NAME = "ContentItemCommonDataLastPublishedWhen";
146159

147-
Action<ContentTypesQueryParameters> contentTypesQueryParameters = parameters => parameters
148-
.InSmartFolder(smartFolderGuid)
149-
.OfContentType(contentTypeName)
150-
.WithLinkedItems(depth)
151-
.WithContentTypeFields();
152-
153-
Action<ContentQueryParameters> contentQueryParameters = parameters
154-
=> parameters
155-
.OrderBy(new OrderByColumn(
156-
LAST_PUBLISHED_COLUMN_NAME,
157-
orderBy.Equals(OrderByOption.NewestFirst) ? OrderDirection.Descending : OrderDirection.Ascending))
158-
.TopN(topN);
159-
160160
var parameters = new RetrieveContentParameters
161161
{
162162
LinkedItemsMaxLevel = depth,
@@ -165,7 +165,7 @@ public async Task<IEnumerable<T>> RetrieveReusableContentItemsFromSmartFolder<T>
165165
IncludeSecuredItems = includeSecuredItems
166166
};
167167

168-
var a = await contentRetriever.RetrieveContent<T>(
168+
return await contentRetriever.RetrieveContent<T>(
169169
parameters,
170170
query => query
171171
.InSmartFolder(smartFolderGuid)
@@ -174,8 +174,6 @@ public async Task<IEnumerable<T>> RetrieveReusableContentItemsFromSmartFolder<T>
174174
orderBy.Equals(OrderByOption.NewestFirst) ? OrderDirection.Descending : OrderDirection.Ascending))
175175
.TopN(topN),
176176
RetrievalCacheSettings.CacheDisabled);
177-
178-
return a;
179177
}
180178

181179
/// <inheritdoc />

0 commit comments

Comments
 (0)