From 168d65862a41706180647114da2b977639f1281e Mon Sep 17 00:00:00 2001
From: Steffen Nitschke <steffen.nitschke90@hotmail.com>
Date: Wed, 3 Feb 2021 13:59:03 +0100
Subject: [PATCH] add fields to game

---
 .../de/fd/fh/server/game/GameService.java     | 21 ++++++++++++++++++-
 .../de/fd/fh/server/game/GameServiceTest.java |  1 -
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/fh.fd.ci.server/src/main/java/de/fd/fh/server/game/GameService.java b/fh.fd.ci.server/src/main/java/de/fd/fh/server/game/GameService.java
index 86dd604..f8517c3 100644
--- a/fh.fd.ci.server/src/main/java/de/fd/fh/server/game/GameService.java
+++ b/fh.fd.ci.server/src/main/java/de/fd/fh/server/game/GameService.java
@@ -3,6 +3,9 @@ package de.fd.fh.server.game;
 import de.fd.fh.server.user.UserId;
 import lombok.RequiredArgsConstructor;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @RequiredArgsConstructor
 public class GameService
 {
@@ -15,7 +18,23 @@ public class GameService
 
     public GameId createGame(final UserId blackUser, final UserId whiteUser)
     {
-        final Game game = new Game(null, null, null, null, null, null);
+        final Set<Field> fields = initFields(blackUser, whiteUser);
+
+        final Game game = new Game(null, whiteUser, blackUser, whiteUser, fields, null);
+
         return (GameId) repository.save(game).getId();
     }
+
+    private Set<Field> initFields(UserId blackUser, UserId whiteUser)
+    {
+        final Set<Field> fields = new HashSet<>();
+        for (int x = 0; x < 8; x++)
+        {
+            for (int y = 0; y < 8; y++)
+            {
+                fields.add(new Field(x, y, null , null));
+            }
+        }
+        return fields;
+    }
 }
diff --git a/fh.fd.ci.server/src/test/java/de/fd/fh/server/game/GameServiceTest.java b/fh.fd.ci.server/src/test/java/de/fd/fh/server/game/GameServiceTest.java
index af0f889..0d0c5b5 100644
--- a/fh.fd.ci.server/src/test/java/de/fd/fh/server/game/GameServiceTest.java
+++ b/fh.fd.ci.server/src/test/java/de/fd/fh/server/game/GameServiceTest.java
@@ -49,7 +49,6 @@ class GameServiceTest
 
         final Game savedGame = captor.getValue();
 
-        assertNotNull(savedGame.getId());
         assertEquals("12345", savedGame.getBlackPlayer().getIdentifier());
         assertEquals("98765", savedGame.getWhitePlayer().getIdentifier());
         assertEquals("98765", savedGame.getCurrentPlayer().getIdentifier());