Refactor test code

Author: hlship

src/clojure_game_geek/db.clj

@@ -44,58 +44,55 @@
 
 (defn find-member-by-id
   [component member-id]
-  (->> component
-       :db
-       deref
-       :members
-       (filter #(= member-id (:id %)))
-       first))
+  (-> (query! (:conn component)
+              ["select member_id, name, created_at, updated_at
+              from member
+              where member_id = $1" member-id])
+      take!
+      first))
 
 (defn list-designers-for-game
   [component game-id]
-  (let [designers (:designers (find-game-by-id component game-id))]
-    (->> component
-         :db
-         deref
-         :designers
-         (filter #(contains? designers (:id %))))))
+  (take!
+    (query! (:conn component)
+            ["select d.designer_id, d.name, d.uri, d.created_at, d.updated_at
+              from designer d
+              inner join designer_to_game j on (d.designer_id = j.designer_id)
+              where j.game_id = $1
+              order by d.name" game-id])))
 
 (defn list-games-for-designer
   [component designer-id]
-  (->> component
-       :db
-       deref
-       :games
-       (filter #(-> % :designers (contains? designer-id)))))
+  (take!
+    (query! (:conn component)
+            ["select g.game_id, g.name, g.summary, g.min_players, g.max_players, g.created_at, g.updated_at
+              from board_game g
+              inner join designer_to_game j on (g.game_id = j.game_id)
+              where j.designer_id = $1
+              order by g.name" designer-id])))
 
 (defn list-ratings-for-game
   [component game-id]
-  (->> component
-       :db
-       deref
-       :ratings
-       (filter #(= game-id (:game_id %)))))
+  (take!
+    (query! (:conn component)
+            ["select game_id, member_id, rating, created_at, updated_at
+              from game_rating
+              where game_id = $1" game-id])))
 
 (defn list-ratings-for-member
   [component member-id]
-  (->> component
-       :db
-       deref
-       :ratings
-       (filter #(= member-id (:member_id %)))))
-
-(defn ^:private apply-game-rating
-  [game-ratings game-id member-id rating]
-  (->> game-ratings
-       (remove #(and (= game-id (:game_id %))
-                     (= member-id (:member_id %))))
-       (cons {:game_id game-id
-              :member_id member-id
-              :rating rating})))
+  (take!
+    (query! (:conn component)
+            ["select game_id, member_id, rating, created_at, updated_at
+              from game_rating
+              where member_id = $1" member-id])))
 
 (defn upsert-game-rating
   "Adds a new game rating, or changes the value of an existing game rating."
-  [db game-id member-id rating]
-  (-> db
-      :db
-      (swap! update :ratings apply-game-rating game-id member-id rating)))
+  [component game-id member-id rating]
+  (take!
+    (query! (:conn component)
+            ["insert into game_rating (game_id, member_id, rating)
+              values ($1, $2, $3)
+              on conflict (game_id, member_id) do update set rating = $3"
+             game-id member-id rating])))

test/clojure_game_geek/system_tests.clj

@@ -1,6 +1,6 @@
 (ns clojure-game-geek.system-tests
   (:require
-    [clojure.test :refer [deftest is]]
+    [clojure.test :refer [deftest is use-fixtures]]
     [clojure-game-geek.system :as system]
     [clojure-game-geek.test-utils :refer [simplify]]
     [com.stuartsierra.component :as component]
@@ -13,23 +13,29 @@
   (-> (system/new-system)
       (assoc-in [:server :port] 8989)))
 
+(def ^:dynamic ^:private *system*)
+
+(use-fixtures :once
+  (fn [test-fn]
+    (binding [*system* (component/start-system (test-system))]
+      (try
+        (test-fn)
+        (finally
+          (component/stop-system *system*))))))
+
 (defn ^:private q
   "Extracts the compiled schema and executes a query."
-  [system query variables]
-  (-> system
+  [query variables]
+  (-> *system*
       (get-in [:schema-provider :schema])
       (lacinia/execute query variables nil)
       simplify))
 
 (deftest can-read-board-game
-  (let [system (component/start-system (test-system))
-        results (q system
-                   "{ game_by_id(id: 1234) { name summary min_players max_players play_time }}"
-                   nil)]
-    (is (= {:data {:game_by_id {:max_players 2
-                                :min_players 2
-                                :name "Zertz"
-                                :play_time nil
-                                :summary "Two player abstract with forced moves and shrinking board"}}}
-           results))
-    (component/stop-system system)))
+  (is (= {:data {:game_by_id {:max_players 2
+                              :min_players 2
+                              :name "Zertz"
+                              :play_time nil
+                              :summary "Two player abstract with forced moves and shrinking board"}}}
+         (q "{ game_by_id(id: 1234) { name summary min_players max_players play_time }}"
+            nil))))