Merge pull request #65 from Haraj-backend/fix/error-409-start-battle-…

…memory Fix: Error 409 When Starting Battle using Rest Memory Variant
Haraj-backend · Jul 18, 2024 · 25ca900 · 25ca900
2 parents 51cea85 + 673b37e
commit 25ca900
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/internal/driven/storage/memory/battlestrg/storage.go b/internal/driven/storage/memory/battlestrg/storage.go
@@ -11,7 +11,12 @@ type Storage struct {
 }
 
 func (s *Storage) GetBattle(ctx context.Context, gameID string) (*entity.Battle, error) {
-	b := s.data[gameID]
+	b, exist := s.data[gameID]
+	if !exist {
+		// if item is not found, returns nil as expected by battle interface
+		return nil, nil
+	}
+
 	return &b, nil
 }
 

diff --git a/internal/driven/storage/memory/battlestrg/storage_test.go b/internal/driven/storage/memory/battlestrg/storage_test.go
@@ -16,12 +16,17 @@ func TestSaveGetBattle(t *testing.T) {
 	strg := battlestrg.New()
 	expBattle := newBattle()
 
+	// get battle, supposedly the returned battle is nil
+	battle, err := strg.GetBattle(context.Background(), expBattle.GameID)
+	require.NoError(t, err)
+	require.Nil(t, battle, "battle is not nil")
+
 	// save battle
-	err := strg.SaveBattle(context.Background(), *expBattle)
+	err = strg.SaveBattle(context.Background(), *expBattle)
 	require.NoError(t, err)
 
 	// get battle
-	battle, err := strg.GetBattle(context.Background(), expBattle.GameID)
+	battle, err = strg.GetBattle(context.Background(), expBattle.GameID)
 	require.NoError(t, err)
 
 	// ensure battle is equal to expBattle

diff --git a/internal/driven/storage/memory/gamestrg/storage.go b/internal/driven/storage/memory/gamestrg/storage.go
@@ -11,7 +11,12 @@ type Storage struct {
 }
 
 func (s *Storage) GetGame(ctx context.Context, gameID string) (*entity.Game, error) {
-	g := s.data[gameID]
+	g, exist := s.data[gameID]
+	if !exist {
+		// if item is not found, returns nil as expected by game interface
+		return nil, nil
+	}
+
 	return &g, nil
 }
 

diff --git a/internal/driven/storage/memory/gamestrg/storage_test.go b/internal/driven/storage/memory/gamestrg/storage_test.go
@@ -16,12 +16,17 @@ func TestSaveGetGame(t *testing.T) {
 	strg := gamestrg.New()
 	expGame := initNewGame()
 
+	// get game, supposedly the returned game is nil
+	game, err := strg.GetGame(context.Background(), expGame.ID)
+	require.NoError(t, err)
+	require.Nil(t, game, "game is not nil")
+
 	// save game
-	err := strg.SaveGame(context.Background(), *expGame)
+	err = strg.SaveGame(context.Background(), *expGame)
 	require.NoError(t, err)
 
 	// get game
-	game, err := strg.GetGame(context.Background(), expGame.ID)
+	game, err = strg.GetGame(context.Background(), expGame.ID)
 	require.NoError(t, err)
 
 	// ensure game is equal to newGame