api inherits errors (#134)

kenan-rhoton · Sep 3, 2018 · c8cd119 · c8cd119
1 parent d383333
commit c8cd119
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/backend/src/api/base.clj b/backend/src/api/base.clj
@@ -17,9 +17,12 @@
   [game-id player-id card-id row-id & target]
   (let [game-state (persistence/fetch-game game-id)]
       (if (= (:status (get-game game-id player-id)) messages/play)
-          (do
-            (persistence/save-game (play-card/play-card game-state player-id card-id row-id (first target)))
-            (get-game game-id player-id))
+          (let [new-game-state (play-card/play-card game-state player-id card-id row-id (first target))]
+            (if (contains? new-game-state :error)
+              new-game-state
+              (do
+                (persistence/save-game new-game-state)
+                (get-game game-id player-id))))
           {:error messages/out-of-turn})))
 
 (defn ^:private create-empty-game

diff --git a/backend/test/api/base_test.clj b/backend/test/api/base_test.clj
@@ -46,6 +46,9 @@
         p1 (:player-id game)
         p2 (:player-id (base/add-player game-id))]
 
+    (expect {:error messages/no-row}
+            (base/play-card-as-player game-id p1 1 99))
+
     (expect messages/wait
             (:status (base/play-card-as-player game-id p1 1 0)))