Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Fix store logo not appearing in PDF invoice when using absolute store URL (#673)
Copilotd6f1014cb712
diff --git a/src/Business/Grand.Business.Storage/Services/PictureService.cs b/src/Business/Grand.Business.Storage/Services/PictureService.csindex 57253c867..e3594919c 100644--- a/src/Business/Grand.Business.Storage/Services/PictureService.cs+++ b/src/Business/Grand.Business.Storage/Services/PictureService.cs@@ -158,8 +158,11 @@ public class PictureService : IPictureService/// <returns>Local picture thumb path</returns>protected virtual string GetThumbUrl(string thumbFileName, string storeLocation = null){- storeLocation = !string.IsNullOrEmpty(storeLocation) ? storeLocation : "";- return _mediaFileStore.Combine(storeLocation, ImageThumbPath, thumbFileName);+ var thumbPath = _mediaFileStore.Combine(ImageThumbPath, thumbFileName);+ if (string.IsNullOrEmpty(storeLocation))+ return thumbPath;++ return new Uri(new Uri(storeLocation), thumbPath).ToString();}/// <summary>diff --git a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.csindex 86c1a7206..75575bbff 100644--- a/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs+++ b/src/Tests/Grand.Business.Storage.Tests/Services/PictureServiceTests.cs@@ -13,6 +13,23 @@ using Moq;namespace Grand.Business.Storage.Tests.Services;+/// <summary>+/// Exposes the protected GetThumbUrl method for testing.+/// </summary>+public class TestablePictureService(+ IRepository<Picture> pictureRepository,+ ILogger<PictureService> logger,+ IMediator mediator,+ ICacheBase cacheBase,+ IMediaFileStore mediaFileStore,+ MediaSettings mediaSettings,+ StorageSettings storageSettings)+ : PictureService(pictureRepository, logger, mediator, cacheBase, mediaFileStore, mediaSettings, storageSettings)+{+ public string GetThumbUrlPublic(string thumbFileName, string storeLocation = null)+ => GetThumbUrl(thumbFileName, storeLocation);+}+[TestClass]public class PictureServiceTests{@@ -22,6 +39,7 @@ public class PictureServiceTestsprivate Mock<IMediator> _mediatorMock;private Mock<IRepository<Picture>> _repoMock;private PictureService _service;+ private TestablePictureService _testablePictureService;private MediaSettings _settings;private StorageSettings _storagesettings;@@ -42,6 +60,8 @@ public class PictureServiceTests_storagesettings = new StorageSettings();_service = new PictureService(_repoMock.Object, _logerMock.Object, _mediatorMock.Object, _cacheMock.Object,_mediaFileStoreMock.Object, _settings, _storagesettings);+ _testablePictureService = new TestablePictureService(_repoMock.Object, _logerMock.Object,+ _mediatorMock.Object, _cacheMock.Object, _mediaFileStoreMock.Object, _settings, _storagesettings);}[TestMethod]@@ -139,4 +159,28 @@ public class PictureServiceTests_repoMock.Verify(c => c.DeleteAsync(It.IsAny<Picture>()), Times.Once);_mediatorMock.Verify(c => c.Publish(It.IsAny<EntityDeleted<Picture>>(), default), Times.Once);}++ [TestMethod]+ public void GetThumbUrl_WithAbsoluteStoreLocation_ReturnsValidAbsoluteUrl()+ {+ const string storeLocation = "https://example.com/";+ const string thumbFileName = "sample_123.jpeg";++ var result = _testablePictureService.GetThumbUrlPublic(thumbFileName, storeLocation);++ Assert.IsTrue(result.StartsWith("https://"), $"Expected URL to start with 'https://' but got: {result}");+ Assert.IsTrue(result.Contains(thumbFileName), $"Expected URL to contain thumb filename but got: {result}");+ Assert.IsFalse(result.StartsWith("/https://"), $"URL must not have a leading slash before the scheme: {result}");+ }++ [TestMethod]+ public void GetThumbUrl_WithNoStoreLocation_ReturnsRelativePath()+ {+ const string thumbFileName = "sample_123.jpeg";++ var result = _testablePictureService.GetThumbUrlPublic(thumbFileName);++ Assert.IsTrue(result.StartsWith("/"), $"Expected relative path to start with '/' but got: {result}");+ Assert.IsTrue(result.Contains(thumbFileName), $"Expected path to contain thumb filename but got: {result}");+ }}\ No newline at end of file