✨ feat: handle gameId on metadata level (#11)

MateuszNaKodach · web-flow · commit f0bd796c214b · 2025-02-11T20:55:07.000+01:00
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -9,11 +9,17 @@ on:
   pull_request:
     branches: [ "master" ]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
+    timeout-minutes: 10
+
     steps:
       - name: 🛎️ Checkout repository
         uses: actions/checkout@v4
@@ -31,8 +37,8 @@ jobs:
       - name: 🧪 Run tests
         run: mvn -B test --file pom.xml
 
-      - name: 📦 Package application
-        run: mvn -B package --file pom.xml
+#      - name: 📦 Package application
+#        run: mvn -B package --file pom.xml
 
       # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 #      - name: 📈 Update dependency graph
diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolProcessor.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolProcessor.java
@@ -4,17 +4,21 @@
 import com.dddheroes.heroesofddd.astrologers.write.MonthWeek;
 import com.dddheroes.heroesofddd.astrologers.write.proclaimweeksymbol.ProclaimWeekSymbol;
 import com.dddheroes.heroesofddd.calendar.write.startday.DayStarted;
+import com.dddheroes.heroesofddd.shared.GameMetaData;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.DisallowReplay;
 import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.messaging.annotation.MetaDataValue;
 import org.springframework.stereotype.Component;
 
 @ProcessingGroup("Automation_WhenWeekStartedThenProclaimWeekSymbol_Processor")
 @DisallowReplay
 @Component
 class WhenWeekStartedThenProclaimWeekSymbolProcessor {
 
+    public static final int FIRST_DAY_OF_THE_WEEK = 1;
+
     private final CommandGateway commandGateway;
     private final WeekSymbolCalculator weekSymbolCalculator;
 
@@ -27,8 +31,8 @@ class WhenWeekStartedThenProclaimWeekSymbolProcessor {
     }
 
     @EventHandler
-    void react(DayStarted event) {
-        var isWeekStarted = event.day() == 1;
+    void react(DayStarted event, @MetaDataValue(GameMetaData.KEY) String gameId) {
+        var isWeekStarted = event.day() == FIRST_DAY_OF_THE_WEEK;
         if (isWeekStarted) {
             var weekSymbol = weekSymbolCalculator.apply(MonthWeek.of(event.month(), event.week()));
             var command = ProclaimWeekSymbol.command(
@@ -38,7 +42,7 @@ void react(DayStarted event) {
                     weekSymbol.weekOf().raw(),
                     weekSymbol.growth()
             );
-            commandGateway.sendAndWait(command);
+            commandGateway.sendAndWait(command, GameMetaData.withId(gameId));
         }
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor.java b/src/main/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor.java
@@ -4,10 +4,12 @@
 import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModel;
 import com.dddheroes.heroesofddd.creaturerecruitment.read.getalldwellings.GetAllDwellings;
 import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures;
+import com.dddheroes.heroesofddd.shared.GameMetaData;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.DisallowReplay;
 import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.messaging.annotation.MetaDataValue;
 import org.axonframework.queryhandling.QueryGateway;
 import org.springframework.stereotype.Component;
 
@@ -28,14 +30,14 @@ class WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor {
     }
 
     @EventHandler
-    void react(WeekSymbolProclaimed event) {
+    void react(WeekSymbolProclaimed event, @MetaDataValue(GameMetaData.KEY) String gameId) {
         // todo: separate dwelling per game. Now we read all of them
         // I want be consistent here. With DBC it'd be nice to query all types and by tags like game.
         // use EventStore, @SequenceNumber long sequenceNumber
 
         var creature = event.weekOf();
         var increaseBy = event.growth();
-        var toProcess = queryGateway.query(GetAllDwellings.query(), GetAllDwellings.Result.class);
+        var toProcess = queryGateway.query(GetAllDwellings.query(gameId), GetAllDwellings.Result.class);
         toProcess.thenAccept(r -> r.dwellings()
                                    .stream().filter(dwelling -> dwelling.getCreatureId().equals(creature))
                                    .forEach(dwelling -> increaseAvailableCreatures(dwelling, increaseBy)));
@@ -47,6 +49,6 @@ private void increaseAvailableCreatures(DwellingReadModel dwelling, Integer incr
                 dwelling.getCreatureId(),
                 increaseBy
         );
-        commandGateway.sendAndWait(command);
+        commandGateway.sendAndWait(command, GameMetaData.withId(dwelling.getGameId()));
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java
@@ -2,10 +2,12 @@
 
 import com.dddheroes.heroesofddd.armies.write.addcreature.AddCreatureToArmy;
 import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.CreatureRecruited;
+import com.dddheroes.heroesofddd.shared.GameMetaData;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.DisallowReplay;
 import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.messaging.annotation.MetaDataValue;
 import org.springframework.stereotype.Component;
 
 @ProcessingGroup("Automation_WhenCreatureRecruitedThenAddToArmy_Processor")
@@ -20,13 +22,13 @@ class WhenCreatureRecruitedThenAddToArmyProcessor {
     }
 
     @EventHandler
-    void react(CreatureRecruited event) {
+    void react(CreatureRecruited event, @MetaDataValue(GameMetaData.KEY) String gameId) {
         var command = AddCreatureToArmy.command(
                 event.toArmy(),
                 event.creatureId(),
                 event.quantity()
         );
 
-        commandGateway.sendAndWait(command);
+        commandGateway.sendAndWait(command, GameMetaData.withId(gameId));
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModel.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModel.java
@@ -3,6 +3,7 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import jakarta.persistence.Index;
 import jakarta.persistence.Table;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
@@ -11,9 +12,11 @@
 import java.util.Objects;
 
 @Entity
-@Table(name = "read_model_dwelling")
+@Table(name = "read_model_dwelling", indexes = @Index(name = "idx_game_id", columnList = "gameId"))
 public class DwellingReadModel {
 
+    private String gameId;
+
     @Id
     private String dwellingId;
 
@@ -25,11 +28,14 @@ public class DwellingReadModel {
 
     private Integer availableCreatures;
 
-    public DwellingReadModel(String dwellingId,
-                      String creatureId,
-                      Map<String, Integer> costPerTroop,
-                      Integer availableCreatures
+    public DwellingReadModel(
+            String gameId,
+            String dwellingId,
+            String creatureId,
+            Map<String, Integer> costPerTroop,
+            Integer availableCreatures
     ) {
+        this.gameId = gameId;
         this.dwellingId = dwellingId;
         this.creatureId = creatureId;
         this.costPerTroop = costPerTroop;
@@ -46,6 +52,10 @@ DwellingReadModel withAvailableCreaturesDecreasedBy(Integer decreasedBy) {
         return this;
     }
 
+    public String getGameId() {
+        return gameId;
+    }
+
     public String getDwellingId() {
         return dwellingId;
     }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java
@@ -3,8 +3,10 @@
 import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt;
 import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.AvailableCreaturesChanged;
 import com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature.CreatureRecruited;
+import com.dddheroes.heroesofddd.shared.GameMetaData;
 import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.messaging.annotation.MetaDataValue;
 import org.springframework.stereotype.Component;
 
 @ProcessingGroup("ReadModel_Dwelling")
@@ -18,8 +20,9 @@ class DwellingReadModelProjector {
     }
 
     @EventHandler
-    void on(DwellingBuilt event) {
+    void on(DwellingBuilt event, @MetaDataValue(GameMetaData.KEY) String gameId) {
         var state = new DwellingReadModel(
+                gameId,
                 event.dwellingId(),
                 event.creatureId(),
                 event.costPerTroop(),
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelRepository.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelRepository.java
@@ -3,7 +3,11 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface DwellingReadModelRepository extends JpaRepository<DwellingReadModel, String> {
 
+    List<DwellingReadModel> findAllByGameId(String gameId);
+
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellings.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellings.java
@@ -1,13 +1,14 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.read.getalldwellings;
 
 import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModel;
+import com.dddheroes.heroesofddd.shared.GameId;
 
 import java.util.List;
 
-public record GetAllDwellings() {
+public record GetAllDwellings(GameId gameId) {
 
-    public static GetAllDwellings query() {
-        return new GetAllDwellings();
+    public static GetAllDwellings query(String gameId) {
+        return new GetAllDwellings(GameId.of(gameId));
     }
 
     public record Result(List<DwellingReadModel> dwellings) {
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsQueryHandler.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getalldwellings/GetAllDwellingsQueryHandler.java
@@ -3,9 +3,11 @@
 import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModel;
 import com.dddheroes.heroesofddd.creaturerecruitment.read.DwellingReadModelRepository;
 import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt;
+import com.dddheroes.heroesofddd.shared.GameMetaData;
 import com.google.common.collect.Streams;
 import org.axonframework.config.ProcessingGroup;
 import org.axonframework.eventhandling.EventHandler;
+import org.axonframework.messaging.annotation.MetaDataValue;
 import org.axonframework.queryhandling.QueryHandler;
 import org.springframework.stereotype.Component;
 
@@ -24,20 +26,30 @@ class GetAllDwellingsQueryHandler {
 
     @QueryHandler
     GetAllDwellings.Result handle(GetAllDwellings query) {
-        var dwellings = dwellingReadModelRepository.findAll();
-        var result = Streams.concat(dwellings.stream(), cache.stream()) // todo: check ordering
+        var gameId = query.gameId().raw();
+        var dwellings = dwellingReadModelRepository.findAllByGameId(gameId);
+        var result = Streams.concat(
+                                    dwellings.stream(),
+                                    cache.stream().filter(it -> it.getGameId().equals(gameId))
+                            ) // todo: check ordering
                             .distinct()
                             .toList();
         return new GetAllDwellings.Result(result);
     }
 
     @EventHandler
-    void evolve(DwellingBuilt event) {
+    void evolve(DwellingBuilt event, @MetaDataValue(GameMetaData.KEY) String gameId) {
         while (cache.size() > 20) {
             cache.pollFirst();
         }
-        var item = new DwellingReadModel(event.dwellingId(), event.creatureId(), event.costPerTroop(), 0);
-        if (!cache.contains(item)) { // todo: check concurrency issues
+        var item = new DwellingReadModel(
+                gameId,
+                event.dwellingId(),
+                event.creatureId(),
+                event.costPerTroop(),
+                0
+        );
+        if (!cache.contains(item)) { // todo: check if there are any concurrency issues
             cache.push(item);
         }
     }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingById.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingById.java
@@ -1,11 +1,12 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.read.getdwellingbyid;
 
 import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId;
+import com.dddheroes.heroesofddd.shared.GameId;
 
-public record GetDwellingById(DwellingId dwellingId) {
+public record GetDwellingById(GameId gameId, DwellingId dwellingId) {
 
-    public static GetDwellingById query(String dwellingId) {
-        return new GetDwellingById(DwellingId.of(dwellingId));
+    public static GetDwellingById query(String gameId, String dwellingId) {
+        return new GetDwellingById(GameId.of(gameId), DwellingId.of(dwellingId));
     }
 
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdRestApi.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdRestApi.java
@@ -4,11 +4,13 @@
 import org.axonframework.queryhandling.QueryGateway;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.concurrent.CompletableFuture;
 
 @RestController
+@RequestMapping("games/{gameId}")
 class GetDwellingByIdRestApi {
 
     private final QueryGateway queryGateway;
@@ -19,9 +21,10 @@ class GetDwellingByIdRestApi {
 
     @GetMapping("/dwellings/{dwellingId}")
     CompletableFuture<DwellingReadModel> getDwellings(
+            @PathVariable String gameId,
             @PathVariable String dwellingId
     ) {
-        var query = GetDwellingById.query(dwellingId);
+        var query = GetDwellingById.query(dwellingId, gameId);
 
         return queryGateway.query(
                 query,
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureRestApi.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/recruitcreature/RecruitCreatureRestApi.java
@@ -1,14 +1,17 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature;
 
+import com.dddheroes.heroesofddd.shared.GameMetaData;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.concurrent.CompletableFuture;
 
 @RestController
+@RequestMapping("/games/{gameId}")
 class RecruitCreatureRestApi {
 
     record Body(String creatureId, String armyId, Integer quantity) {
@@ -23,6 +26,7 @@ record Body(String creatureId, String armyId, Integer quantity) {
 
     @PutMapping("/dwellings/{dwellingId}/creature-recruitments")
     CompletableFuture<Void> putDwellingsCreatureRecruitments(
+            @PathVariable String gameId,
             @PathVariable String dwellingId,
             @RequestBody Body requestBody
     ) {
@@ -32,6 +36,6 @@ CompletableFuture<Void> putDwellingsCreatureRecruitments(
                 requestBody.armyId(),
                 requestBody.quantity()
         );
-        return commandGateway.send(command);
+        return commandGateway.send(command, GameMetaData.withId(gameId));
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/GameId.java b/src/main/java/com/dddheroes/heroesofddd/shared/GameId.java
@@ -0,0 +1,25 @@
+package com.dddheroes.heroesofddd.shared;
+
+import java.util.UUID;
+
+public record GameId(String raw) {
+
+    public GameId {
+        if (raw == null || raw.isBlank()) {
+            throw new IllegalArgumentException("Game id cannot be null or empty");
+        }
+    }
+
+    public static GameId of(String raw) {
+        return new GameId(raw);
+    }
+
+    public static GameId random() {
+        return new GameId(UUID.randomUUID().toString());
+    }
+
+    @Override
+    public String toString() {
+        return raw;
+    }
+}
diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/GameMetaData.java b/src/main/java/com/dddheroes/heroesofddd/shared/GameMetaData.java
diff --git a/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolTest.java b/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweekstartedthenproclaimweeksymbol/WhenWeekStartedThenProclaimWeekSymbolTest.java
diff --git a/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesTest.java b/src/test/java/com/dddheroes/heroesofddd/astrologers/automation/whenweeksymbolproclaimedthenincreasedwellingavailablecreatures/WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesTest.java
diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java
diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/read/getdwellingbyid/GetDwellingByIdTest.java
diff --git a/src/test/java/com/dddheroes/heroesofddd/utils/AxonUtils.java b/src/test/java/com/dddheroes/heroesofddd/utils/AxonUtils.java

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`package com.dddheroes.heroesofddd.creaturerecruitment.read.getdwellingbyid;`
`2`	`2`
`3`	`3`	`import com.dddheroes.heroesofddd.creaturerecruitment.write.DwellingId;`
	`4`	`+import com.dddheroes.heroesofddd.shared.GameId;`
`4`	`5`
`5`		`-public record GetDwellingById(DwellingId dwellingId) {`
	`6`	`+public record GetDwellingById(GameId gameId, DwellingId dwellingId) {`
`6`	`7`
`7`		`- public static GetDwellingById query(String dwellingId) {`
`8`		`- return new GetDwellingById(DwellingId.of(dwellingId));`
	`8`	`+ public static GetDwellingById query(String gameId, String dwellingId) {`
	`9`	`+ return new GetDwellingById(GameId.of(gameId), DwellingId.of(dwellingId));`
`9`	`10`	`}`
`10`	`11`
`11`	`12`	`}`