From a88527947579e2cff88b32aef8984d2927619ec8 Mon Sep 17 00:00:00 2001 From: Lobstervova Date: Wed, 15 Apr 2026 14:03:11 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dateplanner/configurations/AppConfig.java | 2 +- .../controllers/web/HomeController.java | 27 ++++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/example/dateplanner/configurations/AppConfig.java b/src/main/java/com/example/dateplanner/configurations/AppConfig.java index 965ea82..b6c132c 100644 --- a/src/main/java/com/example/dateplanner/configurations/AppConfig.java +++ b/src/main/java/com/example/dateplanner/configurations/AppConfig.java @@ -14,7 +14,7 @@ import reactor.core.publisher.Mono; @Configuration public class AppConfig { - private final String username = "morgan"; + private final String username = "mohaned.alhalili@yandex.ru"; private final String password = "Admin_123!"; @Bean diff --git a/src/main/java/com/example/dateplanner/controllers/web/HomeController.java b/src/main/java/com/example/dateplanner/controllers/web/HomeController.java index 5cfed3b..7f2ccfa 100644 --- a/src/main/java/com/example/dateplanner/controllers/web/HomeController.java +++ b/src/main/java/com/example/dateplanner/controllers/web/HomeController.java @@ -41,26 +41,21 @@ public class HomeController extends BaseWebController { return siteSettingsRepository.save(s); })); - Mono latestPostMono = galleryPostRepository.findFirstByIsPublishedTrueOrderByPublishedAtDesc(); + Mono latestPostMono = galleryPostRepository.findFirstByIsPublishedTrueOrderByPublishedAtDesc() + .onErrorResume(e -> { + log.warn("Failed to fetch latest gallery post: {}", e.getMessage()); + return Mono.empty(); + }); - return Mono.zip(settingsMono, latestPostMono) - .map(tuple -> { - SiteSettings settings = tuple.getT1(); - GalleryPost latestPost = tuple.getT2(); + return settingsMono + .flatMap(settings -> { model.put("heroImageUrl", settings.getHeroImageUrl() != null ? settings.getHeroImageUrl() : DEFAULT_HERO_IMAGE); model.put("backgroundImageUrl", settings.getBackgroundImageUrl() != null ? settings.getBackgroundImageUrl() : DEFAULT_HERO_IMAGE); - if (latestPost != null) { - model.put("latestGalleryPost", latestPost); - } - return model; + return latestPostMono + .doOnNext(post -> model.put("latestGalleryPost", post)) + .thenReturn(model) + .switchIfEmpty(Mono.just(model)); }) - .switchIfEmpty(Mono.zip(settingsMono, Mono.just((GalleryPost) null)) - .map(tuple -> { - SiteSettings settings = tuple.getT1(); - model.put("heroImageUrl", settings.getHeroImageUrl() != null ? settings.getHeroImageUrl() : DEFAULT_HERO_IMAGE); - model.put("backgroundImageUrl", settings.getBackgroundImageUrl() != null ? settings.getBackgroundImageUrl() : DEFAULT_HERO_IMAGE); - return model; - })) .flatMap(this::addAuthToModel) .map(m -> Rendering.view("template").model(m).build()); }