✨ feat: handle playerId on metadata level (#14)

MateuszNaKodach · web-flow · commit a2975dd05a2f · 2025-02-14T12:50:13.000+01:00
diff --git a/src/main/java/com/dddheroes/heroesofddd/GameConfiguration.java b/src/main/java/com/dddheroes/heroesofddd/GameConfiguration.java
@@ -11,6 +11,6 @@ public class GameConfiguration {
 
     @Bean
     public SequencingPolicy<EventMessage<?>> gameIdSequencingPolicy() {
-        return e -> e.getMetaData().get(GameMetaData.KEY);
+        return e -> e.getMetaData().get(GameMetaData.GAME_ID_KEY);
     }
 }
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
@@ -31,7 +31,11 @@ class WhenWeekStartedThenProclaimWeekSymbolProcessor {
     }
 
     @EventHandler
-    void react(DayStarted event, @MetaDataValue(GameMetaData.KEY) String gameId) {
+    void react(
+            DayStarted event,
+            @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId,
+            @MetaDataValue(GameMetaData.PLAYER_ID_KEY) String playerId
+    ) {
         var isWeekStarted = event.day() == FIRST_DAY_OF_THE_WEEK;
         if (isWeekStarted) {
             var weekSymbol = weekSymbolCalculator.apply(MonthWeek.of(event.month(), event.week()));
@@ -42,7 +46,7 @@ void react(DayStarted event, @MetaDataValue(GameMetaData.KEY) String gameId) {
                     weekSymbol.weekOf().raw(),
                     weekSymbol.growth()
             );
-            commandGateway.sendAndWait(command, GameMetaData.withId(gameId));
+            commandGateway.sendAndWait(command, GameMetaData.with(gameId, playerId));
         }
     }
 }
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
@@ -30,25 +30,29 @@ class WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesProcessor {
     }
 
     @EventHandler
-    void react(WeekSymbolProclaimed event, @MetaDataValue(GameMetaData.KEY) String gameId) {
+    void react(
+            WeekSymbolProclaimed event,
+            @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId,
+            @MetaDataValue(GameMetaData.PLAYER_ID_KEY) String playerId
+    ) {
         var creature = event.weekOf();
         var increaseBy = event.growth();
         repository.findAllByGameId(gameId).stream()
                   .filter(dwelling -> dwelling.getCreatureId().equals(creature))
-                  .forEach(dwelling -> increaseAvailableCreatures(dwelling, increaseBy));
+                  .forEach(dwelling -> increaseAvailableCreatures(dwelling, increaseBy, playerId));
     }
 
-    private void increaseAvailableCreatures(BuiltDwellingReadModel dwelling, Integer increaseBy) {
+    private void increaseAvailableCreatures(BuiltDwellingReadModel dwelling, Integer increaseBy, String playerId) {
         var command = IncreaseAvailableCreatures.command(
                 dwelling.getDwellingId(),
                 dwelling.getCreatureId(),
                 increaseBy
         );
-        commandGateway.sendAndWait(command, GameMetaData.withId(dwelling.getGameId()));
+        commandGateway.sendAndWait(command, GameMetaData.with(dwelling.getGameId(), playerId));
     }
 
     @EventHandler
-    void on(DwellingBuilt event, @MetaDataValue(GameMetaData.KEY) String gameId) {
+    void on(DwellingBuilt event, @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId) {
         var state = new BuiltDwellingReadModel(
                 gameId,
                 event.dwellingId(),
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyProcessor.java
@@ -22,13 +22,17 @@ class WhenCreatureRecruitedThenAddToArmyProcessor {
     }
 
     @EventHandler
-    void react(CreatureRecruited event, @MetaDataValue(GameMetaData.KEY) String gameId) {
+    void react(
+            CreatureRecruited event,
+            @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId,
+            @MetaDataValue(GameMetaData.PLAYER_ID_KEY) String playerId
+    ) {
         var command = AddCreatureToArmy.command(
                 event.toArmy(),
                 event.creatureId(),
                 event.quantity()
         );
 
-        commandGateway.sendAndWait(command, GameMetaData.withId(gameId));
+        commandGateway.sendAndWait(command, GameMetaData.with(gameId, playerId));
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/read/DwellingReadModelProjector.java
@@ -20,7 +20,7 @@ class DwellingReadModelProjector {
     }
 
     @EventHandler
-    void on(DwellingBuilt event, @MetaDataValue(GameMetaData.KEY) String gameId) {
+    void on(DwellingBuilt event, @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId) {
         var state = new DwellingReadModel(
                 gameId,
                 event.dwellingId(),
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
@@ -38,7 +38,7 @@ GetAllDwellings.Result handle(GetAllDwellings query) {
     }
 
     @EventHandler
-    void evolve(DwellingBuilt event, @MetaDataValue(GameMetaData.KEY) String gameId) {
+    void evolve(DwellingBuilt event, @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId) {
         while (cache.size() > 20) {
             cache.pollFirst();
         }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingRestApi.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingRestApi.java
@@ -1,10 +1,12 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling;
 
 import com.dddheroes.heroesofddd.shared.GameMetaData;
+import com.dddheroes.heroesofddd.shared.restapi.Headers;
 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.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -27,6 +29,7 @@ record Body(String creatureId, Map<String, Integer> costPerTroop) {
 
     @PutMapping("/dwellings/{dwellingId}")
     CompletableFuture<Void> putDwellings(
+            @RequestHeader(Headers.PLAYER_ID) String playerId,
             @PathVariable String gameId,
             @PathVariable String dwellingId,
             @RequestBody Body requestBody
@@ -36,6 +39,6 @@ CompletableFuture<Void> putDwellings(
                 requestBody.creatureId(),
                 requestBody.costPerTroop()
         );
-        return commandGateway.send(command, GameMetaData.withId(gameId));
+        return commandGateway.send(command, GameMetaData.with(gameId, playerId));
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesRestApi.java b/src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesRestApi.java
@@ -1,10 +1,12 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures;
 
 import com.dddheroes.heroesofddd.shared.GameMetaData;
+import com.dddheroes.heroesofddd.shared.restapi.Headers;
 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.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,6 +28,7 @@ record Body(String creatureId, Integer increaseBy) {
 
     @PutMapping("/dwellings/{dwellingId}/available-creatures-increases")
     CompletableFuture<Void> putDwellingAvailableCreaturesIncreases(
+            @RequestHeader(Headers.PLAYER_ID) String playerId,
             @PathVariable String gameId,
             @PathVariable String dwellingId,
             @RequestBody Body requestBody
@@ -35,6 +38,6 @@ CompletableFuture<Void> putDwellingAvailableCreaturesIncreases(
                 requestBody.creatureId(),
                 requestBody.increaseBy()
         );
-        return commandGateway.send(command, GameMetaData.withId(gameId));
+        return commandGateway.send(command, GameMetaData.with(gameId, playerId));
     }
 }
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,10 +1,12 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.write.recruitcreature;
 
 import com.dddheroes.heroesofddd.shared.GameMetaData;
+import com.dddheroes.heroesofddd.shared.restapi.Headers;
 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.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,6 +28,7 @@ record Body(String creatureId, String armyId, Integer quantity) {
 
     @PutMapping("/dwellings/{dwellingId}/creature-recruitments")
     CompletableFuture<Void> putDwellingsCreatureRecruitments(
+            @RequestHeader(Headers.PLAYER_ID) String playerId,
             @PathVariable String gameId,
             @PathVariable String dwellingId,
             @RequestBody Body requestBody
@@ -36,6 +39,6 @@ CompletableFuture<Void> putDwellingsCreatureRecruitments(
                 requestBody.armyId(),
                 requestBody.quantity()
         );
-        return commandGateway.send(command, GameMetaData.withId(gameId));
+        return commandGateway.send(command, GameMetaData.with(gameId, playerId));
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/GameMetaData.java b/src/main/java/com/dddheroes/heroesofddd/shared/GameMetaData.java
@@ -4,13 +4,19 @@
 
 public class GameMetaData {
 
-    public static final String KEY = "gameId";
+    public static final String GAME_ID_KEY = "gameId";
+    public static final String PLAYER_ID_KEY = "playerId";
 
-    public static MetaData withId(String gameId) {
-        return MetaData.with(KEY, gameId);
+    public static MetaData with(String gameId) {
+        return with(gameId, PlayerId.unknown().raw());
     }
 
-    public static MetaData withId(GameId gameId) {
-        return withId(gameId.raw());
+    public static MetaData with(String gameId, String playerId) {
+        return MetaData.with(GAME_ID_KEY, gameId)
+                       .and(PLAYER_ID_KEY, playerId);
+    }
+
+    public static MetaData with(GameId gameId, PlayerId playerId) {
+        return with(gameId.raw(), playerId.raw());
     }
 }
diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/PlayerId.java b/src/main/java/com/dddheroes/heroesofddd/shared/PlayerId.java
@@ -0,0 +1,29 @@
+package com.dddheroes.heroesofddd.shared;
+
+import java.util.UUID;
+
+public record PlayerId(String raw) {
+
+    public PlayerId {
+        if (raw == null || raw.isBlank()) {
+            throw new IllegalArgumentException("Player id cannot be null or empty");
+        }
+    }
+
+    public static PlayerId of(String raw) {
+        return new PlayerId(raw);
+    }
+
+    public static PlayerId random() {
+        return new PlayerId(UUID.randomUUID().toString());
+    }
+
+    public static PlayerId unknown() {
+        return new PlayerId("unknown");
+    }
+
+    @Override
+    public String toString() {
+        return raw;
+    }
+}
diff --git a/src/main/java/com/dddheroes/heroesofddd/shared/restapi/Headers.java b/src/main/java/com/dddheroes/heroesofddd/shared/restapi/Headers.java
@@ -0,0 +1,5 @@
+package com.dddheroes.heroesofddd.shared.restapi;
+
+public class Headers {
+    public static final String PLAYER_ID = "x-player-id";
+}
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
@@ -7,10 +7,12 @@
 import com.dddheroes.heroesofddd.calendar.write.startday.DayStarted;
 import com.dddheroes.heroesofddd.shared.GameId;
 import com.dddheroes.heroesofddd.shared.GameMetaData;
+import com.dddheroes.heroesofddd.shared.PlayerId;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.axonframework.eventhandling.DomainEventMessage;
 import org.axonframework.eventhandling.GenericDomainEventMessage;
 import org.axonframework.eventhandling.gateway.EventGateway;
+import org.axonframework.messaging.MetaData;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -27,6 +29,7 @@
 class WhenWeekStartedThenProclaimWeekSymbolTest {
 
     private static final String GAME_ID = GameId.random().raw();
+    private static final String PLAYER_ID = PlayerId.random().raw();
 
     @Autowired
     private EventGateway eventGateway;
@@ -49,7 +52,7 @@ void whenDayStartedForFirstDayOfTheWeek_ThenProclaimWeekSymbol() {
 
         // then
         awaitUntilAsserted(() -> verify(commandGateway, times(1))
-                .sendAndWait(ProclaimWeekSymbol.command(gameId, 1, 1, "angel", any()), eq(GameMetaData.withId(GAME_ID)))
+                .sendAndWait(ProclaimWeekSymbol.command(gameId, 1, 1, "angel", any()), eq(gameMetaData()))
         );
     }
 
@@ -66,6 +69,10 @@ private static DomainEventMessage<?> calendarDomainEvent(String identifier, int
                 identifier,
                 sequenceNumber,
                 payload
-        ).andMetaData(GameMetaData.withId(GAME_ID));
+        ).andMetaData(gameMetaData());
+    }
+
+    private static MetaData gameMetaData() {
+        return GameMetaData.with(GAME_ID, PLAYER_ID);
     }
 }
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
@@ -9,6 +9,7 @@
 import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.DwellingBuilt;
 import com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures.IncreaseAvailableCreatures;
 import com.dddheroes.heroesofddd.shared.Amount;
+import com.dddheroes.heroesofddd.shared.PlayerId;
 import com.dddheroes.heroesofddd.shared.Resources;
 import com.dddheroes.heroesofddd.shared.CreatureId;
 import com.dddheroes.heroesofddd.shared.GameId;
@@ -18,6 +19,7 @@
 import org.axonframework.eventhandling.DomainEventMessage;
 import org.axonframework.eventhandling.GenericDomainEventMessage;
 import org.axonframework.eventhandling.gateway.EventGateway;
+import org.axonframework.messaging.MetaData;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -32,6 +34,7 @@
 class WhenWeekSymbolProclaimedThenIncreaseDwellingAvailableCreaturesTest {
 
     private static final String GAME_ID = GameId.random().raw();
+    private static final String PLAYER_ID = PlayerId.random().raw();
 
     @Autowired
     private EventGateway eventGateway;
@@ -145,15 +148,19 @@ private static DomainEventMessage<?> givenDomainEvent(
                 identifier,
                 sequenceNumber,
                 payload
-        ).andMetaData(GameMetaData.withId(GAME_ID));
+        ).andMetaData(gameMetaData());
     }
 
     private void assertCommandExecuted(IncreaseAvailableCreatures expectedCommand1) {
         awaitUntilAsserted(() -> verify(commandGateway, times(1))
-                .sendAndWait(expectedCommand1, GameMetaData.withId(GAME_ID)));
+                .sendAndWait(expectedCommand1, gameMetaData()));
     }
 
     private void assertCommandNotExecuted(IncreaseAvailableCreatures notExpectedCommand) {
-        verify(commandGateway, never()).sendAndWait(notExpectedCommand, GameMetaData.withId(GAME_ID));
+        verify(commandGateway, never()).sendAndWait(notExpectedCommand, gameMetaData());
+    }
+
+    private static MetaData gameMetaData() {
+        return GameMetaData.with(GAME_ID, PLAYER_ID);
     }
 }
diff --git a/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java b/src/test/java/com/dddheroes/heroesofddd/creaturerecruitment/automation/WhenCreatureRecruitedThenAddToArmyTest.java
@@ -11,11 +11,13 @@
 import com.dddheroes.heroesofddd.shared.CreatureIds;
 import com.dddheroes.heroesofddd.shared.GameId;
 import com.dddheroes.heroesofddd.shared.GameMetaData;
+import com.dddheroes.heroesofddd.shared.PlayerId;
 import com.dddheroes.heroesofddd.shared.ResourceType;
 import org.axonframework.commandhandling.gateway.CommandGateway;
 import org.axonframework.eventhandling.DomainEventMessage;
 import org.axonframework.eventhandling.GenericDomainEventMessage;
 import org.axonframework.eventhandling.gateway.EventGateway;
+import org.axonframework.messaging.MetaData;
 import org.junit.jupiter.api.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -32,6 +34,7 @@
 class WhenCreatureRecruitedThenAddToArmyTest {
 
     private static final String GAME_ID = GameId.random().raw();
+    private static final String PLAYER_ID = PlayerId.random().raw();
     private static final Map<String, Integer> PHOENIX_COST = Map.of(
             ResourceType.GOLD.name(), 2000,
             ResourceType.MERCURY.name(), 1
@@ -61,7 +64,7 @@ void whenCreatureRecruited_ThenAddCreatureToArmy() {
 
         // then
         awaitUntilAsserted(() -> verify(commandGateway, times(1))
-                .sendAndWait(AddCreatureToArmy.command(armyId, creatureId, 1), GameMetaData.withId(GAME_ID))
+                .sendAndWait(AddCreatureToArmy.command(armyId, creatureId, 1), gameMetaData())
         );
     }
 
@@ -77,6 +80,10 @@ private DomainEventMessage<?> dwellingDomainEvent(String dwellingId, int sequenc
                 dwellingId,
                 sequenceNumber,
                 payload
-        ).andMetaData(GameMetaData.withId(GAME_ID));
+        ).andMetaData(gameMetaData());
+    }
+
+    private static MetaData gameMetaData() {
+        return GameMetaData.with(GAME_ID, PLAYER_ID);
     }
 }
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
`@@ -11,6 +11,6 @@ public class GameConfiguration {`
`11`	`11`
`12`	`12`	`@Bean`
`13`	`13`	`public SequencingPolicy<EventMessage<?>> gameIdSequencingPolicy() {`
`14`		`- return e -> e.getMetaData().get(GameMetaData.KEY);`
	`14`	`+ return e -> e.getMetaData().get(GameMetaData.GAME_ID_KEY);`
`15`	`15`	`}`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,11 @@ class WhenWeekStartedThenProclaimWeekSymbolProcessor {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@EventHandler`
`34`		`- void react(DayStarted event, @MetaDataValue(GameMetaData.KEY) String gameId) {`
	`34`	`+ void react(`
	`35`	`+ DayStarted event,`
	`36`	`+ @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId,`
	`37`	`+ @MetaDataValue(GameMetaData.PLAYER_ID_KEY) String playerId`
	`38`	`+ ) {`
`35`	`39`	`var isWeekStarted = event.day() == FIRST_DAY_OF_THE_WEEK;`
`36`	`40`	`if (isWeekStarted) {`
`37`	`41`	`var weekSymbol = weekSymbolCalculator.apply(MonthWeek.of(event.month(), event.week()));`
`@@ -42,7 +46,7 @@ void react(DayStarted event, @MetaDataValue(GameMetaData.KEY) String gameId) {`
`42`	`46`	`weekSymbol.weekOf().raw(),`
`43`	`47`	`weekSymbol.growth()`
`44`	`48`	`);`
`45`		`- commandGateway.sendAndWait(command, GameMetaData.withId(gameId));`
	`49`	`+ commandGateway.sendAndWait(command, GameMetaData.with(gameId, playerId));`
`46`	`50`	`}`
`47`	`51`	`}`
`48`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,17 @@ class WhenCreatureRecruitedThenAddToArmyProcessor {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@EventHandler`
`25`		`- void react(CreatureRecruited event, @MetaDataValue(GameMetaData.KEY) String gameId) {`
	`25`	`+ void react(`
	`26`	`+ CreatureRecruited event,`
	`27`	`+ @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId,`
	`28`	`+ @MetaDataValue(GameMetaData.PLAYER_ID_KEY) String playerId`
	`29`	`+ ) {`
`26`	`30`	`var command = AddCreatureToArmy.command(`
`27`	`31`	`event.toArmy(),`
`28`	`32`	`event.creatureId(),`
`29`	`33`	`event.quantity()`
`30`	`34`	`);`
`31`	`35`
`32`		`- commandGateway.sendAndWait(command, GameMetaData.withId(gameId));`
	`36`	`+ commandGateway.sendAndWait(command, GameMetaData.with(gameId, playerId));`
`33`	`37`	`}`
`34`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class DwellingReadModelProjector {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`@EventHandler`
`23`		`- void on(DwellingBuilt event, @MetaDataValue(GameMetaData.KEY) String gameId) {`
	`23`	`+ void on(DwellingBuilt event, @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId) {`
`24`	`24`	`var state = new DwellingReadModel(`
`25`	`25`	`gameId,`
`26`	`26`	`event.dwellingId(),`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ GetAllDwellings.Result handle(GetAllDwellings query) {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@EventHandler`
`41`		`- void evolve(DwellingBuilt event, @MetaDataValue(GameMetaData.KEY) String gameId) {`
	`41`	`+ void evolve(DwellingBuilt event, @MetaDataValue(GameMetaData.GAME_ID_KEY) String gameId) {`
`42`	`42`	`while (cache.size() > 20) {`
`43`	`43`	`cache.pollFirst();`
`44`	`44`	`}`