Merge pull request #70 from fortedigital/feature/68-fix-nullish-conte…

…nt-usage-urls Fix returning null as content usage url
fortedigital · Aug 14, 2023 · c9f2cdf · c9f2cdf
2 parents ac80dd4 + 53e1906
commit c9f2cdf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/src/Forte.Optimizely.ContentUsage/Api/Features/ContentType/ContentTypeUsagesRepository.cs b/src/Forte.Optimizely.ContentUsage/Api/Features/ContentType/ContentTypeUsagesRepository.cs
@@ -9,17 +9,17 @@ namespace Forte.Optimizely.ContentUsage.Api.Features.ContentType;
 
 public class ContentTypeUsagesRepository 
 {
-	private readonly ServiceAccessor<IAsyncDatabaseExecutor> dataExecutorAccessor;
+	private readonly ServiceAccessor<IAsyncDatabaseExecutor> _dataExecutorAccessor;
 
     public ContentTypeUsagesRepository(ServiceAccessor<IAsyncDatabaseExecutor> dataExecutorAccessor)
     {
-	    this.dataExecutorAccessor = dataExecutorAccessor;
+	    _dataExecutorAccessor = dataExecutorAccessor;
     }
 
     public async Task<IEnumerable<ContentTypeUsageCounter>> ListContentTypesUsagesCounters(
 	    CancellationToken cancellationToken)
     {
-        var executor = this.dataExecutorAccessor();
+        var executor = _dataExecutorAccessor();
         return await executor.ExecuteAsync((Func<Task<IEnumerable<ContentTypeUsageCounter>>>)(async () =>
         {
             var command1 = executor.CreateCommand();

diff --git a/src/Forte.Optimizely.ContentUsage/Api/Services/ContentTypeService.cs b/src/Forte.Optimizely.ContentUsage/Api/Services/ContentTypeService.cs
@@ -11,13 +11,13 @@ namespace Forte.Optimizely.ContentUsage.Api.Services;
 public class ContentTypeService
 {
     private readonly IContentTypeRepository _contentTypeRepository;
-    private readonly ContentTypeUsagesRepository contentTypeUsagesRepository;
+    private readonly ContentTypeUsagesRepository _contentTypeUsagesRepository;
 
 
     public ContentTypeService(IContentTypeRepository contentTypeRepository, ContentTypeUsagesRepository contentTypeUsagesRepository)
     {
         _contentTypeRepository = contentTypeRepository;
-        this.contentTypeUsagesRepository = contentTypeUsagesRepository;
+        _contentTypeUsagesRepository = contentTypeUsagesRepository;
     }
 
     public IEnumerable<ContentType> GetAll(ContentTypesFilterCriteria? filterCriteria)
@@ -34,7 +34,7 @@ public IEnumerable<ContentType> GetAll(ContentTypesFilterCriteria? filterCriteri
 
     public async Task<IEnumerable<ContentTypeUsageCounter>> GetAllCounters(CancellationToken cancellationToken)
     {
-        return await contentTypeUsagesRepository.ListContentTypesUsagesCounters(cancellationToken);
+        return await _contentTypeUsagesRepository.ListContentTypesUsagesCounters(cancellationToken);
     }
 
     public ContentType? Get(Guid guid)

diff --git a/src/Forte.Optimizely.ContentUsage/Api/Services/ContentUsageService.cs b/src/Forte.Optimizely.ContentUsage/Api/Services/ContentUsageService.cs
@@ -32,17 +32,28 @@ public ContentUsageService(IUrlResolver urlResolver, IContentSoftLinkRepository
     public IEnumerable<string> GetPageUrls(EPiServerContentUsage contentUsage)
     {
         var contentLink = contentUsage.ContentLink;
-        var url = _urlResolver.GetUrl(contentLink, contentUsage.LanguageBranch);
+
+        var pageUrls = SearchForPageUrls(contentLink, contentUsage.LanguageBranch);
+
+        return pageUrls;
+    }
+
+    private IEnumerable<string> SearchForPageUrls(ContentReference contentLink, string languageBranch)
+    {
+        var url = _urlResolver.GetUrl(contentLink, languageBranch);
 
         if (!string.IsNullOrEmpty(url)) 
             return CheckIsPublished(contentLink) ? new[] { url } : new string[] { };
 
-        var pageLinks = _contentSoftLinkRepository.Load(contentLink, true)
+        var softLinks = _contentSoftLinkRepository.Load(contentLink, true);
+        var pageLinks = softLinks
             .Where(softLink => softLink.SoftLinkType == ReferenceType.PageLinkReference)
             .Select(softLink => softLink.OwnerContentLink)
             .Where(ownerContentLink => ownerContentLink != null && CheckIsPublished(ownerContentLink));
 
-        return pageLinks.Select(pageLink => _urlResolver.GetUrl(pageLink, contentUsage.LanguageBranch));
+        var pageUrls = pageLinks.SelectMany(pageLink => SearchForPageUrls(pageLink, languageBranch));
+
+        return pageUrls;
     }
 
     public string GetEditUrl(EPiServerContentUsage contentUsage)