#72 Test homework publication

vityaman-edu · Jun 13, 2024 · dec87a7 · dec87a7
1 parent d31b578
commit dec87a7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/...in/kotlin/ru/vityaman/lms/botalka/core/publication/logging/LoggingPublicationCallbacks.kt b/...in/kotlin/ru/vityaman/lms/botalka/core/publication/logging/LoggingPublicationCallbacks.kt
@@ -4,7 +4,7 @@ import ru.vityaman.lms.botalka.core.logging.Log
 import ru.vityaman.lms.botalka.core.publication.task.PublicationTask
 
 fun loggingPublicationCallbacks(log: Log) = PublicationTask.Callbacks(
-    onStart = { log.info("Starting...") },
+    onStart = { log.info("Starting with now as '$it'...") },
     onReceived = { log.info("Received ${it.size} homeworks") },
     onNext = { log.info("Publishing homework with id ${it.id}...") },
     onAccepted = { log.info("Published homework with id ${it.id}") },

diff --git a/botalka/src/main/kotlin/ru/vityaman/lms/botalka/core/publication/task/PublicationTask.kt b/botalka/src/main/kotlin/ru/vityaman/lms/botalka/core/publication/task/PublicationTask.kt
@@ -17,8 +17,9 @@ class PublicationTask(
     private val callbacks: Callbacks = Callbacks(),
 ) : Runnable {
     override suspend fun run() {
-        callbacks.onStart()
-        homeworks.publishableAt(OffsetDateTime.now(clock))
+        val now = OffsetDateTime.now(clock)
+        callbacks.onStart(now)
+        homeworks.publishableAt(now)
             .toCollection(mutableListOf())
             .shuffled()
             .also { callbacks.onReceived(it) }
@@ -38,7 +39,7 @@ class PublicationTask(
     }
 
     data class Callbacks(
-        val onStart: suspend () -> Unit = {},
+        val onStart: suspend (OffsetDateTime) -> Unit = {},
         val onReceived: suspend (List<Homework.Id>) -> Unit = {},
         val onNext: suspend (Homework) -> Unit = {},
         val onAccepted: suspend (Homework) -> Unit = {},

diff --git a/botalka/src/main/resources/application.yml b/botalka/src/main/resources/application.yml
@@ -35,8 +35,10 @@ logging:
     r2dbc: INFO
     sql: INFO
     web: INFO
+    kafka: WARN
   group:
     r2dbc: org.springframework.r2dbc,org.springframework.data.r2dbc
+    kafka: org.apache.kafka
 management:
   endpoints:
     web:

diff --git a/docker-compose.yml → compose.yml b/docker-compose.yml → compose.yml
@@ -43,6 +43,7 @@ services:
   broker:
     container_name: lms-broker
     image: apache/kafka
+    restart: always
     environment:
       KAFKA_NODE_ID: 1
       KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: 'CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT'