Merge pull request #39 from episerver/bugfix/MAR-1517-Conversion-is-n…

…ot-counted-properly-for-start-page fix conversion test not count for start page url without language segment
episerver · Jul 25, 2023 · 3cb2427 · 3cb2427
2 parents 1eae972 + 8dff97d
commit 3cb2427
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/EPiServer.Marketing.KPI/Common/ContentComparatorKPI.cs b/src/EPiServer.Marketing.KPI/Common/ContentComparatorKPI.cs
@@ -35,7 +35,7 @@ public class ContentComparatorKPI : Kpi
         public List<string>  _startpagepaths = new List<string>();
         private ObjectCache _cache;
         private readonly Injected<IKpiHelper> _kpiHelper;
-        private readonly Injected<IUrlResolver> _IUrlResolver;
+        private readonly Injected<IUrlResolver> _urlResolver;
         private readonly Injected<IContentRepository> _contentRepository;
         private readonly Injected<IContentVersionRepository> _contentVersionRepository;
         private readonly Injected<IContentEvents> _contentEvents;
@@ -74,7 +74,7 @@ public override string UiReadOnlyMarkup
                      var conversionDescription = LocalizationService.Current.GetString("/kpi/content_comparator_kpi/readonly_markup/conversion_selector_description");
 
                     var conversionContent = _contentRepository.Service.Get<IContent>(ContentGuid);
-                    var conversionLink = _IUrlResolver.Service.GetUrl(conversionContent.ContentLink);
+                    var conversionLink = _urlResolver.Service.GetUrl(conversionContent.ContentLink);
                     markup = string.Format(markup, conversionDescription, conversionLink,
                         conversionContent.Name);
                 }
@@ -137,9 +137,15 @@ public override IKpiResult Evaluate(object sender, EventArgs e)
                     retval = _startpagepaths.Any(path => path.Trim('/')
                         .Equals(_kpiHelper.Service.GetRequestPath().Trim('/'), StringComparison.OrdinalIgnoreCase))
                         && ContentGuid.Equals(ea.Content.ContentGuid);
+
+                    // Special case: Start page contain url that has no language segment in multilingual site
+                    if (_kpiHelper.Service.GetRequestPath().Equals("/") && ContentGuid.Equals(ea.Content.ContentGuid))
+                    {
+                        retval = true;
+                    }
                 }
                 else
-                {   
+                {
                     //We need to make sure the content being evaluated is the actual content being requested
                     //Addresses MAR-1226
                     retval = (_kpiHelper.Service.GetUrl(_content.ContentLink).ToLower().Trim('/') == _kpiHelper.Service.GetRequestPath().ToLower().Trim('/')