fix: IO microservice (#38)

Reviewed-on: #38

modules/core/build.gradle.kts

@@ -48,7 +48,6 @@ dependencies {
     }
 
     implementation(project(":modules:api"))
-    implementation(project(":modules:io"))
     implementation(project(":modules:rule"))
     implementation(project(":modules:bot"))
 
@@ -69,6 +68,8 @@ dependencies {
     implementation("com.fasterxml.jackson.module:jackson-module-scala_3:${versions["JACKSON_SCALA"]!!}")
 
 
+    testImplementation(project(":modules:io"))
+
     testImplementation(platform("org.junit:junit-bom:5.13.4"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.scalatest:scalatest_3:${versions["SCALATEST"]!!}")

modules/core/src/main/docker/Dockerfile.native

@@ -3,7 +3,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.native.enabled=true
+# ./gradlew :modules:core:build -Dquarkus.native.enabled=true
 #
 # Then, build the image with:
 #
@@ -13,7 +13,7 @@
 #
 # docker run -i --rm -p 8080:8080 quarkus/backcore
 #
-# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
+# The `registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based on UBI 9.
 # To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
 ###
 FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
@@ -21,7 +21,7 @@ WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work
-COPY --chown=1001:root --chmod=0755 build/*-runner /work/application
+COPY --chown=1001:root --chmod=0755 modules/core/build/*-runner /work/application
 
 EXPOSE 8080
 USER 1001

modules/core/src/main/scala/de/nowchess/chess/client/IoServiceClient.scala

@@ -1,7 +1,7 @@
 package de.nowchess.chess.client
 
+import de.nowchess.api.dto.{ImportFenRequest, ImportPgnRequest}
 import de.nowchess.api.game.GameContext
-import de.nowchess.io.service.dto.{ImportFenRequest, ImportPgnRequest}
 import jakarta.ws.rs.*
 import jakarta.ws.rs.core.MediaType
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient

modules/core/src/main/scala/de/nowchess/chess/config/JacksonConfig.scala

@@ -5,7 +5,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import de.nowchess.api.board.Square
-import de.nowchess.io.json.{SquareKeyDeserializer, SquareKeySerializer}
 import io.quarkus.jackson.ObjectMapperCustomizer
 import jakarta.inject.Singleton
 

modules/core/src/main/scala/de/nowchess/chess/config/SquareKeyDeserializer.scala

@@ -0,0 +1,8 @@
+package de.nowchess.chess.config
+
+import com.fasterxml.jackson.databind.{DeserializationContext, KeyDeserializer}
+import de.nowchess.api.board.Square
+
+class SquareKeyDeserializer extends KeyDeserializer:
+  override def deserializeKey(key: String, ctx: DeserializationContext): AnyRef =
+    Square.fromAlgebraic(key).orNull

modules/core/src/main/scala/de/nowchess/chess/config/SquareKeySerializer.scala

@@ -0,0 +1,9 @@
+package de.nowchess.chess.config
+
+import com.fasterxml.jackson.core.JsonGenerator
+import com.fasterxml.jackson.databind.{JsonSerializer, SerializerProvider}
+import de.nowchess.api.board.Square
+
+class SquareKeySerializer extends JsonSerializer[Square]:
+  override def serialize(value: Square, gen: JsonGenerator, provider: SerializerProvider): Unit =
+    gen.writeFieldName(value.toString)

modules/core/src/main/scala/de/nowchess/chess/engine/GameEngine.scala

@@ -7,7 +7,7 @@ import de.nowchess.api.player.{PlayerId, PlayerInfo}
 import de.nowchess.chess.controller.Parser
 import de.nowchess.chess.observer.*
 import de.nowchess.chess.command.{CommandInvoker, MoveCommand, MoveResult}
-import de.nowchess.io.{GameContextExport, GameContextImport}
+import de.nowchess.api.io.{GameContextExport, GameContextImport}
 import de.nowchess.rules.RuleSet
 import de.nowchess.rules.sets.DefaultRules
 

modules/core/src/main/scala/de/nowchess/chess/resource/GameResource.scala

@@ -12,9 +12,6 @@ import de.nowchess.chess.engine.GameEngine
 import de.nowchess.chess.exception.{BadRequestException, GameNotFoundException}
 import de.nowchess.chess.observer.*
 import de.nowchess.chess.registry.{GameEntry, GameRegistry}
-import de.nowchess.io.fen.FenExporter
-import de.nowchess.io.pgn.PgnExporter
-import de.nowchess.io.service.dto.{ImportFenRequest, ImportPgnRequest}
 import io.smallrye.mutiny.Multi
 import jakarta.enterprise.context.ApplicationScoped
 import jakarta.inject.Inject
@@ -89,16 +86,8 @@ class GameResource:
   private def toGameStateDto(entry: GameEntry): GameStateDto =
     val ctx = entry.engine.context
     GameStateDto(
-      fen = FenExporter.exportGameContext(ctx),
-      pgn = PgnExporter.exportGame(
-        Map(
-          "Event"  -> "NowChess game",
-          "White"  -> entry.white.displayName,
-          "Black"  -> entry.black.displayName,
-          "Result" -> "*",
-        ),
-        ctx.moves,
-      ),
+      fen = ioClient.exportFen(ctx),
+      pgn = ioClient.exportPgn(ctx),
       turn = ctx.turn.label.toLowerCase,
       status = statusOf(entry),
       winner = ctx.result.collect { case GameResult.Win(c) => c.label.toLowerCase },

modules/core/src/test/scala/de/nowchess/chess/engine/GameEngineIntegrationTest.scala

@@ -4,7 +4,7 @@ import de.nowchess.api.board.{Board, Color, File, PieceType, Rank, Square}
 import de.nowchess.api.game.GameContext
 import de.nowchess.api.move.{Move, MoveType, PromotionPiece}
 import de.nowchess.chess.observer.{GameEvent, InvalidMoveEvent, InvalidMoveReason, MoveRedoneEvent, Observer}
-import de.nowchess.io.GameContextImport
+import de.nowchess.api.io.GameContextImport
 import de.nowchess.rules.RuleSet
 import de.nowchess.rules.sets.DefaultRules
 import org.scalatest.funsuite.AnyFunSuite

modules/core/src/test/scala/de/nowchess/chess/engine/GameEngineLoadGameTest.scala

@@ -1,16 +1,13 @@
 package de.nowchess.chess.engine
 
-import scala.collection.mutable
-import de.nowchess.api.board.{Board, Color}
-import de.nowchess.api.game.GameContext
-import de.nowchess.chess.observer.{GameEvent, Observer, PgnLoadedEvent}
-import de.nowchess.io.pgn.PgnParser
+import de.nowchess.chess.observer.{GameEvent, Observer}
 import de.nowchess.io.fen.FenParser
-import de.nowchess.io.pgn.PgnExporter
-import de.nowchess.io.fen.FenExporter
+import de.nowchess.io.pgn.{PgnExporter, PgnParser}
 import org.scalatest.funsuite.AnyFunSuite
 import org.scalatest.matchers.should.Matchers
 
+import scala.collection.mutable
+
 class GameEngineLoadGameTest extends AnyFunSuite with Matchers:
 
   test("loadGame with PgnParser: loads valid PGN and enables undo/redo"):