Merge remote-tracking branch 'origin/feat/brand-logo' into feat/brand-logo

fix(back-end) base url fix
Merge branch 'dev' into feat/brand-logo
2026-03-20 11:45:15 +01:00 · 2026-03-20 11:45:10 +01:00 · 2026-03-20 11:28:10 +01:00 · 2026-03-17 08:03:30 +00:00 · 2026-03-17 09:01:34 +01:00 · 2026-03-14 19:18:15 +01:00
2 changed files with 7 additions and 4 deletions
--- a/backend/src/main/java/com/printcalculator/service/request/CustomQuoteRequestNotificationService.java
+++ b/backend/src/main/java/com/printcalculator/service/request/CustomQuoteRequestNotificationService.java
@@ -126,6 +126,9 @@ public class CustomQuoteRequestNotificationService {
    }

    private String buildLogoUrl() {
-        return frontendBaseUrl.replaceAll("/+$", "") + "/assets/images/brand-logo-yellow.svg";
+        String baseUrl = frontendBaseUrl == null || frontendBaseUrl.isBlank()
+                ? "http://localhost:4200"
+                : frontendBaseUrl;
+        return baseUrl.replaceAll("/+$", "") + "/assets/images/brand-logo-yellow.svg";
    }
 }
--- a/backend/src/test/java/com/printcalculator/service/shop/ShopSitemapServiceTest.java
+++ b/backend/src/test/java/com/printcalculator/service/shop/ShopSitemapServiceTest.java
@@ -92,15 +92,15 @@ class ShopSitemapServiceTest {
        assertTrue(xml.contains("<loc>https://3d-fab.ch/en/shop/accessori</loc>"));
        assertTrue(xml.contains("<loc>https://3d-fab.ch/de/shop/accessori</loc>"));
        assertTrue(xml.contains("<loc>https://3d-fab.ch/fr/shop/accessori</loc>"));
-        assertTrue(xml.contains("hreflang=\"en\" href=\"https://3d-fab.ch/en/shop/accessori\""));
+        assertTrue(xml.contains("hreflang=\"en-CH\" href=\"https://3d-fab.ch/en/shop/accessori\""));
        assertFalse(xml.contains("https://3d-fab.ch/it/shop/bozza"));

        assertTrue(xml.contains("<loc>https://3d-fab.ch/it/shop/p/123e4567-supporto-bici</loc>"));
        assertTrue(xml.contains("<loc>https://3d-fab.ch/en/shop/p/123e4567-bike-holder</loc>"));
        assertTrue(xml.contains("<loc>https://3d-fab.ch/de/shop/p/123e4567-fahrrad-halter</loc>"));
        assertTrue(xml.contains("<loc>https://3d-fab.ch/fr/shop/p/123e4567-support-velo</loc>"));
-        assertTrue(xml.contains("hreflang=\"en\" href=\"https://3d-fab.ch/en/shop/p/123e4567-bike-holder\""));
-        assertTrue(xml.contains("hreflang=\"de\" href=\"https://3d-fab.ch/de/shop/p/123e4567-fahrrad-halter\""));
+        assertTrue(xml.contains("hreflang=\"en-CH\" href=\"https://3d-fab.ch/en/shop/p/123e4567-bike-holder\""));
+        assertTrue(xml.contains("hreflang=\"de-CH\" href=\"https://3d-fab.ch/de/shop/p/123e4567-fahrrad-halter\""));
        assertTrue(xml.contains("hreflang=\"x-default\" href=\"https://3d-fab.ch/it/shop/p/123e4567-supporto-bici\""));
        assertTrue(xml.contains("<lastmod>2026-03-11T07:30:00Z</lastmod>"));
        assertFalse(xml.contains("33333333-draft"));
Author	SHA1	Message	Date
Joe Küng	997e770256	Merge remote-tracking branch 'origin/feat/brand-logo' into feat/brand-logo All checks were successful PR Checks / prettier-autofix (pull_request) Successful in 11s Details PR Checks / security-sast (pull_request) Successful in 30s Details PR Checks / test-backend (pull_request) Successful in 28s Details PR Checks / test-frontend (pull_request) Successful in 1m3s Details	2026-03-20 11:45:15 +01:00
Joe Küng	fb1a6456e6	fix(back-end) base url fix	2026-03-20 11:45:10 +01:00
Joe Küng	43cd80600e	Merge branch 'dev' into feat/brand-logo Some checks failed PR Checks / prettier-autofix (pull_request) Successful in 11s Details PR Checks / security-sast (pull_request) Successful in 32s Details PR Checks / test-backend (pull_request) Failing after 27s Details PR Checks / test-frontend (pull_request) Successful in 1m2s Details	2026-03-20 11:28:10 +01:00
printcalc-ci	41f36ed18a	style: apply prettier formatting	2026-03-17 08:03:30 +00:00
Joe Küng	e04189bbfe	Merge branch 'main' into dev All checks were successful Build and Deploy / test-backend (push) Successful in 28s Details PR Checks / prettier-autofix (pull_request) Successful in 14s Details Build and Deploy / test-frontend (push) Successful in 1m3s Details PR Checks / security-sast (pull_request) Successful in 29s Details PR Checks / test-backend (pull_request) Successful in 27s Details PR Checks / test-frontend (pull_request) Successful in 1m6s Details Build and Deploy / build-and-push (push) Successful in 1m46s Details Build and Deploy / deploy (push) Successful in 22s Details	2026-03-17 09:01:34 +01:00
Joe Küng	4ba408859d	Merge pull request 'dev' (#48 ) from dev into main All checks were successful Build and Deploy / test-backend (push) Successful in 34s Details Build and Deploy / test-frontend (push) Successful in 1m4s Details Build and Deploy / build-and-push (push) Successful in 16s Details Build and Deploy / deploy (push) Successful in 19s Details Reviewed-on: #48	2026-03-14 19:18:15 +01:00