X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2Fchat%2Fbackend%2Fimplementation%2FStorageStrategy.java;h=87208dce32132b4815368eddf68c1c864577f85c;hb=465e722c9cd504932bc544c0f66e0b54007bdcdf;hp=94b2bb45f6f29ebfd9bcb1127ba5f10f0682feb6;hpb=15eafdcf744b4d164876510084e4e3c71c286433;p=demos%2Fkafka%2Fchat

diff --git a/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java b/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java
index 94b2bb45..87208dce 100644
--- a/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java
+++ b/src/main/java/de/juplo/kafka/chat/backend/implementation/StorageStrategy.java
@@ -17,22 +17,20 @@ public interface StorageStrategy
 
   default Mono<Void> write(ChatHomeService chatHomeService)
   {
-    return writeChatRoomInfo(
-        chatHomeService
-            .getChatRoomInfo()
-            .flatMap(chatRoomInfo -> writeChatRoomData(
-                chatRoomInfo.getId(),
-                chatHomeService
-                    .getChatRoomData(chatRoomInfo.getId())
-                    .flatMapMany(chatRoomData -> chatRoomData.getMessages())
-                )
-                .then(Mono.just(chatRoomInfo))
-                .doOnSuccess(emittedChatRoomInfo -> log.info("Stored {}", chatRoomInfo))
-                .doOnError(throwable -> log.error("Could not store {}: {}", chatRoomInfo, throwable)))
-        )
-        .then()
-        .doOnSuccess(empty -> log.info("Stored {}", chatHomeService))
-        .doOnError(throwable -> log.error("Could not store {}: {}", chatHomeService, throwable));
+    return writeChatRoomInfo(chatHomeService.getChatRoomInfo())
+        .flatMap(chatRoomInfo -> writeChatRoomData(
+            chatRoomInfo.getId(),
+            chatHomeService
+                .getChatRoomData(chatRoomInfo.getId())
+                .flatMapMany(chatRoomData -> chatRoomData.getMessages())
+            )
+            .count()
+            .doOnSuccess(count -> log.info("Stored {} messages for {}", count, chatRoomInfo))
+            .doOnError(throwable -> log.error("Could not store {}: {}", chatRoomInfo, throwable)))
+        .count()
+        .doOnSuccess(count -> log.info("Stored {} chat-rooms for {}", count, chatHomeService))
+        .doOnError(throwable -> log.error("Could not store {}: {}", chatHomeService, throwable))
+        .then();
   }
 
   Flux<ChatRoomInfo> writeChatRoomInfo(Flux<ChatRoomInfo> chatRoomInfoFlux);