Exo01 fix

src/README.md → src/12_RefactoringGolf/hole1/README.md

@@ -1,11 +1,11 @@
-# Hole 1 to Hole 2
+# Exo 1 to Exo 2
 
-Change the code in hole 1 to be identical to the code in hole 2; implementation and tests can change.
 
 ## Refactorings
 
 - Tackle code comments, long method and large class
-  - Extract method
+  - Extract method where there is a comment 
+  - Extract when, logically, you can divide a method that is too long, into sub methods
 
 ## Tips
 

src/12_RefactoringGolf/hole1/kata.ts

@@ -2,73 +2,38 @@
 
 export class Game {
   private _lastSymbol = ' ';
-  private _toto: Board = new Board();
+  private _board: Board = new Board();
 
   public Play(symbol: string, x: number, y: number): void {
-    //if first move
     if (this._lastSymbol == ' ') {
-      //if player is X
       if (symbol == 'O') {
         throw new Error('Invalid first player');
       }
     }
-    //if not first move but player repeated
     else if (symbol == this._lastSymbol) {
       throw new Error('Invalid next player');
     }
-    //if not first move but play on an already played tile
-    else if (this._toto.TileAt(x, y).Symbol != ' ') {
+    else if (this._board.TileAt(x, y).Symbol != ' ') {
       throw new Error('Invalid position');
     }
-
-    // update game state
     this._lastSymbol = symbol;
-    this._toto.AddTileAt(symbol, x, y);
+    this._board.AddTileAt(symbol, x, y);
   }
 
   public Winner(): string {
-    //if the positions in first row are taken
-    if (
-      this._toto.TileAt(0, 0)!.Symbol != ' ' &&
-      this._toto.TileAt(0, 1)!.Symbol != ' ' &&
-      this._toto.TileAt(0, 2)!.Symbol != ' '
-    ) {
-      //if first row is full with same symbol
-      if (
-        this._toto.TileAt(0, 0)!.Symbol == this._toto.TileAt(0, 1)!.Symbol &&
-        this._toto.TileAt(0, 2)!.Symbol == this._toto.TileAt(0, 1)!.Symbol
-      ) {
-        return this._toto.TileAt(0, 0)!.Symbol;
-      }
-    }
-
-    //if the positions in first row are taken
-    if (
-      this._toto.TileAt(1, 0)!.Symbol != ' ' &&
-      this._toto.TileAt(1, 1)!.Symbol != ' ' &&
-      this._toto.TileAt(1, 2)!.Symbol != ' '
-    ) {
-      //if middle row is full with same symbol
-      if (
-        this._toto.TileAt(1, 0)!.Symbol == this._toto.TileAt(1, 1)!.Symbol &&
-        this._toto.TileAt(1, 2)!.Symbol == this._toto.TileAt(1, 1)!.Symbol
-      ) {
-        return this._toto.TileAt(1, 0)!.Symbol;
-      }
-    }
-
-    //if the positions in first row are taken
-    if (
-      this._toto.TileAt(2, 0)!.Symbol != ' ' &&
-      this._toto.TileAt(2, 1)!.Symbol != ' ' &&
-      this._toto.TileAt(2, 2)!.Symbol != ' '
-    ) {
-      //if middle row is full with same symbol
+    for (let i=0;i<3;i++) {
       if (
-        this._toto.TileAt(2, 0)!.Symbol == this._toto.TileAt(2, 1)!.Symbol &&
-        this._toto.TileAt(2, 2)!.Symbol == this._toto.TileAt(2, 1)!.Symbol
+          this._board.TileAt(i, 0)!.Symbol != ' ' &&
+          this._board.TileAt(i, 1)!.Symbol != ' ' &&
+          this._board.TileAt(i, 2)!.Symbol != ' '
       ) {
-        return this._toto.TileAt(2, 0)!.Symbol;
+        //if first row is full with same symbol
+        if (
+            this._board.TileAt(i, 0)!.Symbol == this._board.TileAt(i, 1)!.Symbol &&
+            this._board.TileAt(i, 2)!.Symbol == this._board.TileAt(i, 1)!.Symbol
+        ) {
+          return this._board.TileAt(i, 0)!.Symbol;
+        }
       }
     }
 
@@ -98,8 +63,7 @@ class Board {
     return this._plays.find((t: Tile) => t.X == x && t.Y == y)!;
   }
 
-  public AddTileAt(symbol: string, x: number, y: number): void {
-    //@ts-ignore
+  public AddTileAt(symbol: string, x: number, y: number): void {     //@ts-ignore
     const tile: Tile = { X: x, Y: y, Symbol: symbol };
 
     this._plays.find((t: Tile) => t.X == x && t.Y == y)!.Symbol = symbol;