Refactor ReadModelBase extension methods for improved readability and return-type consistency.

Author: helightdev

krescent-core/src/main/kotlin/dev/helight/krescent/model/ReadModelBase.kt

@@ -1,14 +1,13 @@
 package dev.helight.krescent.model
 
 import dev.helight.krescent.event.EventCatalog
+import dev.helight.krescent.event.SystemStreamRestoredEvent
+import dev.helight.krescent.model.EventModelBase.Extension.withConfiguration
 import dev.helight.krescent.source.EventSourcingStrategy
 import dev.helight.krescent.source.StoredEventSource
 import dev.helight.krescent.source.StreamingEventSource
 import dev.helight.krescent.source.UpgradingStreamingEventSource
 import dev.helight.krescent.source.impl.InMemoryEventStore
-import dev.helight.krescent.source.strategy.CatchupSourcingStrategy
-import dev.helight.krescent.source.strategy.NoSourcingStrategy
-import dev.helight.krescent.source.strategy.StreamingSourcingStrategy
 
 /**
  * Base class for read models that provides common extension functions.
@@ -30,14 +29,30 @@ abstract class ReadModelBase(
             model.strategy(strategy)
         }
 
-        suspend fun <M : ReadModelBase> M.catchup(source: StoredEventSource) =
-            this.strategy(UpgradingStreamingEventSource(source), CatchupSourcingStrategy())
+        suspend fun <M : ReadModelBase> M.catchup(source: StoredEventSource): M {
+            val model = build(UpgradingStreamingEventSource(source))
+            model.catchup()
+            return this
+        }
 
-        suspend fun <M : ReadModelBase> M.stream(source: StreamingEventSource) =
-            this.strategy(source, StreamingSourcingStrategy())
+        suspend fun <M : ReadModelBase> M.stream(source: StreamingEventSource) {
+            val model = build(source)
+            model.stream()
+        }
 
-        suspend fun <M : ReadModelBase> M.restoreOnly() =
-            this.strategy(InMemoryEventStore(), NoSourcingStrategy())
+        suspend fun <M : ReadModelBase> M.restoreOnly(): M? {
+            var hasRestored = false
+            withConfiguration {
+                registerProcessor {
+                    if (it is SystemStreamRestoredEvent) {
+                        hasRestored = true
+                    }
+                }
+            }
+            val model = build(InMemoryEventStore())
+            model.restore()
+            return if (hasRestored) this else null
+        }
 
     }
 }