Merge pull request ion232#48 from yzoug/zoug/fix/deserialize-gameeven…

…tplayer-ai Make fields optional in GameEventPlayer
yzoug · Jan 30, 2024 · b49bf0a · b49bf0a
2 parents a2d6330 + a5165bf
commit b49bf0a
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 3 deletions.
diff --git a/src/model/board/stream/game.rs b/src/model/board/stream/game.rs
@@ -97,10 +97,10 @@ pub struct OpponentGone {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct GameEventPlayer {
-    pub id: String,
+    pub id: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub ai_level: Option<u32>,
-    pub name: String,
+    pub name: Option<String>,
     // This field can be null according to the openapi spec.
     pub title: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]

diff --git a/tests/data/response/game_full_ai.json b/tests/data/response/game_full_ai.json
@@ -0,0 +1,35 @@
+{
+  "id": "4JurXGpQ",
+  "variant": {
+    "key": "standard",
+    "name": "Standard",
+    "short": "Std"
+  },
+  "speed": "correspondence",
+  "perf": {
+    "name": "Correspondance"
+  },
+  "rated": false,
+  "createdAt": 1706471805992,
+  "white": {
+    "id": "saintmau46",
+    "name": "saintmau46",
+    "title": null,
+    "rating": 1500,
+    "provisional": true
+  },
+  "black": {
+    "aiLevel": 1
+  },
+  "initialFen": "startpos",
+  "type": "gameFull",
+  "state": {
+    "type": "gameState",
+    "moves": "",
+    "wtime": 2147483647,
+    "btime": 2147483647,
+    "winc": 0,
+    "binc": 0,
+    "status": "started"
+  }
+}
diff --git a/tests/data/response/game_full.json → tests/data/response/game_full_humans.json b/tests/data/response/game_full.json → tests/data/response/game_full_humans.json
diff --git a/tests/response_models.rs b/tests/response_models.rs
@@ -27,7 +27,7 @@ pub fn board_event_stream() {
 
 #[test]
 pub fn board_game_stream() {
-    test_response_model::<board::stream::game::Event>("game_full");
+    test_response_model::<board::stream::game::Event>("game_full_humans");
     test_response_model::<board::stream::game::Event>("game_state");
     test_response_model::<board::stream::game::Event>("game_state_resign");
     test_response_model::<board::stream::game::Event>("chat_line");
@@ -39,6 +39,7 @@ pub fn board_game_stream() {
 #[test]
 pub fn challenge_ai() {
     test_response_model::<games::stream::moves::Move>("challenge_ai");
+    test_response_model::<board::stream::game::Event>("game_full_ai");
 }
 
 #[test]