🐛 fix: pass gameId from path variables to commands` metadata

Author: MateuszNaKodach

generated-requests.http

@@ -1,6 +1,7 @@
 ### BuildDwelling
+@gameId = scenario-1
 @dwellingId = dwelling-1
-PUT http://localhost:8080/dwellings/{{dwellingId}}
+PUT http://localhost:8080/games/{{gameId}}/dwellings/{{dwellingId}}
 Content-Type: application/json
 
 {
@@ -12,7 +13,7 @@ Content-Type: application/json
 }
 
 ### IncreaseAvailableCreatures
-PUT http://localhost:8080/dwellings/{{dwellingId}}/available-creatures-increases
+PUT http://localhost:8080/games/{{gameId}}/dwellings/{{dwellingId}}/available-creatures-increases
 Content-Type: application/json
 
 {
@@ -21,7 +22,7 @@ Content-Type: application/json
 }
 
 ### RecruitCreature
-PUT http://localhost:8080/dwellings/{{dwellingId}}/creature-recruitments
+PUT http://localhost:8080/games/{{gameId}}/dwellings/{{dwellingId}}/creature-recruitments
 Content-Type: application/json
 
 {
@@ -31,6 +32,6 @@ Content-Type: application/json
 }
 
 ### Dwelling read model
-GET http://localhost:8080/dwellings/{{dwellingId}}
+GET http://localhost:8080/games/{{gameId}}/dwellings/{{dwellingId}}
 Content-Type: application/json
 

src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/builddwelling/BuildDwellingRestApi.java

@@ -1,15 +1,18 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling;
 
+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.Map;
 import java.util.concurrent.CompletableFuture;
 
 @RestController
+@RequestMapping("games/{gameId}")
 class BuildDwellingRestApi {
 
     record Body(String creatureId, Map<String, Integer> costPerTroop) {
@@ -24,6 +27,7 @@ record Body(String creatureId, Map<String, Integer> costPerTroop) {
 
     @PutMapping("/dwellings/{dwellingId}")
     CompletableFuture<Void> putDwellings(
+            @PathVariable String gameId,
             @PathVariable String dwellingId,
             @RequestBody Body requestBody
     ) {
@@ -32,6 +36,6 @@ CompletableFuture<Void> putDwellings(
                 requestBody.creatureId(),
                 requestBody.costPerTroop()
         );
-        return commandGateway.send(command);
+        return commandGateway.send(command, GameMetaData.withId(gameId));
     }
 }

src/main/java/com/dddheroes/heroesofddd/creaturerecruitment/write/changeavailablecreatures/IncreaseAvailableCreaturesRestApi.java

@@ -1,16 +1,17 @@
 package com.dddheroes.heroesofddd.creaturerecruitment.write.changeavailablecreatures;
 
-import com.dddheroes.heroesofddd.creaturerecruitment.write.builddwelling.BuildDwelling;
+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.Map;
 import java.util.concurrent.CompletableFuture;
 
 @RestController
+@RequestMapping("/games/{gameId}")
 class IncreaseAvailableCreaturesRestApi {
 
     record Body(String creatureId, Integer increaseBy) {
@@ -25,6 +26,7 @@ record Body(String creatureId, Integer increaseBy) {
 
     @PutMapping("/dwellings/{dwellingId}/available-creatures-increases")
     CompletableFuture<Void> putDwellingAvailableCreaturesIncreases(
+            @PathVariable String gameId,
             @PathVariable String dwellingId,
             @RequestBody Body requestBody
     ) {
@@ -33,6 +35,6 @@ CompletableFuture<Void> putDwellingAvailableCreaturesIncreases(
                 requestBody.creatureId(),
                 requestBody.increaseBy()
         );
-        return commandGateway.send(command);
+        return commandGateway.send(command, GameMetaData.withId(gameId));
     }
 }