Added move serialization to Game

garrypas · Jul 10, 2020 · 14c8300 · 14c8300
1 parent 5be3d60
commit 14c8300
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/src/Game.spec.ts b/src/Game.spec.ts
@@ -301,10 +301,10 @@ describe("Game tests", () => {
         });
 
         it("Records card", () => {
-            expect(_game.moves[0].card.equals(_cards1[0])).to.be.true;
-            expect(_game.moves[1].card.equals(_cards2[0])).to.be.true;
-            expect(_game.moves[2].card.equals(_cards1[1])).to.be.true;
-            expect(_game.moves[3].card.equals(_cards2[1])).to.be.true;
+            expect(_game.moves[0].card?.equals(_cards1[0])).to.be.true;
+            expect(_game.moves[1].card?.equals(_cards2[0])).to.be.true;
+            expect(_game.moves[2].card?.equals(_cards1[1])).to.be.true;
+            expect(_game.moves[3].card?.equals(_cards2[1])).to.be.true;
         });
     });
 

diff --git a/src/Game.ts b/src/Game.ts
@@ -113,7 +113,7 @@ export class Game {
         return this._moves;
     }
 
-    private recordMove(card: Card, taken: Card[], player: Player, isScopa: boolean) {
+    private recordMove(card: Card | null, taken: Card[], player: Player, isScopa: boolean) {
         this._moves.push(new MoveLogItem(card, taken, new Date().toISOString(), player, isScopa));
     }
 
@@ -175,7 +175,11 @@ export class Game {
     }
 
     private giveTableToLastTaker() {
-        this._lastTaker?.capture(this._table.removeAll());
+        const tableCards = this._table.removeAll();
+        this._lastTaker?.capture(tableCards);
+        if(this._lastTaker) {
+            this.recordMove(null, tableCards, this._lastTaker?.player, false);
+        }
     }
 
     private updateScorecard() {

diff --git a/src/dtos/IMoveLogItemDto.ts b/src/dtos/IMoveLogItemDto.ts
@@ -2,7 +2,7 @@ import { ICardDto } from "./ICardDto"
 import { IPlayerDto } from "./IPlayerDto";
 
 export interface IMoveLogItemDto {
-    card: ICardDto;
+    card: ICardDto | null;
     taken: ICardDto[];
     timestamp: string;
     player: IPlayerDto;

diff --git a/src/models/MoveLogItem.spec.ts b/src/models/MoveLogItem.spec.ts
@@ -42,7 +42,7 @@ describe("MoveLogItem tests", () => {
 
                 it("serializes/deserializes cards", () =>
                     _moveLogItemAfter.forEach((_, i) =>
-                        expect(_moveLogItemAfter[i].card.equals(_moveLogItem[i].card)).to.be.true));
+                        expect(_moveLogItemAfter[i].card?.equals(_moveLogItem[i].card!)).to.be.true));
 
                 it("serializes/deserializes players", () =>
                     _moveLogItemAfter.forEach((_, i) =>

diff --git a/src/models/MoveLogItem.ts b/src/models/MoveLogItem.ts
@@ -3,14 +3,14 @@ import { Player } from "./Player";
 import { IMoveLogItemDto } from "../dtos/IMoveLogItemDto";
 
 export class MoveLogItem {
-    private _card: Card;
+    private _card: Card | null;
     private _taken: Card[];
     private _timestamp: string;
     private _player: Player;
     private _isScopa: boolean;
 
     constructor(
-        card: Card,
+        card: Card | null,
         taken: Card[],
         timestamp: string,
         player: Player,
@@ -23,7 +23,7 @@ export class MoveLogItem {
         this._isScopa = isScopa;
     }
 
-    get card(): Card { return this._card; }
+    get card(): Card | null { return this._card; }
     get taken(): Card[] { return this._taken.slice(); }
     get timestamp(): string { return this._timestamp; }
     get player(): Player { return this._player; }
@@ -39,7 +39,7 @@ export class MoveLogItem {
 
     static fromDto(dtoObj: IMoveLogItemDto): MoveLogItem {
         return new MoveLogItem(
-            Card.fromDto(dtoObj.card),
+            dtoObj.card ? Card.fromDto(dtoObj.card) : null,
             Card.fromDtoArray(dtoObj.taken),
             dtoObj.timestamp,
             Player.fromDto(dtoObj.player),
@@ -49,7 +49,7 @@ export class MoveLogItem {
 
     static toDto(obj: MoveLogItem): IMoveLogItemDto {
         return {
-            card: Card.toDto(obj._card),
+            card: obj._card ? Card.toDto(obj._card) : null,
             isScopa: obj._isScopa,
             player: Player.toDto(obj._player),
             taken: Card.toDtoArray(obj._taken),