mirror of
https://github.com/LOBSTERVOVA/Tennis-Site.git
synced 2026-04-17 17:40:49 +03:00
правки
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -41,26 +41,21 @@ public class HomeController extends BaseWebController {
|
||||
return siteSettingsRepository.save(s);
|
||||
}));
|
||||
|
||||
Mono<GalleryPost> latestPostMono = galleryPostRepository.findFirstByIsPublishedTrueOrderByPublishedAtDesc();
|
||||
Mono<GalleryPost> 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());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user