Whoops - name collision

server/db.py

@@ -1,6 +1,7 @@
 from flask_sqlalchemy import SQLAlchemy
 
 db = SQLAlchemy()
+session = db.session
 
 
 class Game(db.Model):

server/game_api.py

@@ -3,7 +3,7 @@ import uuid
 
 from flask import Blueprint, abort, request, jsonify
 
-from db import db, Game, CoordSet, GuessSet, create_game
+import db
 from lib import generate_coord, score
 
 game = Blueprint("game", __name__)
@@ -17,7 +17,7 @@ def require_name():
 
 
 def require_game(game_id):
-    g = Game.query.get(game_id)
+    g = db.Game.query.get(game_id)
     if g is None:
         abort(404)
     return g
@@ -25,7 +25,7 @@ def require_game(game_id):
 
 def require_guess_set(game_id):
     name = require_name()
-    gs = GuessSet.query.get((game_id, name))
+    gs = db.GuessSet.query.get((game_id, name))
     if gs is None:
         abort(404)
     return gs
@@ -38,7 +38,7 @@ def create_game():
     if not isinstance(timer, int) or timer <= 0:
         abort(400)
 
-    new_game = create_game()
+    new_game = db.create_game()
 
     return jsonify({"gameId": new_game.game_id})
 
@@ -54,14 +54,14 @@ def join(game_id):
     name = require_name()
     g = require_game(game_id)
 
-    if GuessSet.query.get((g.game_id, name)) is not None:
+    if db.GuessSet.query.get((g.game_id, name)) is not None:
         abort(409)
 
-    cs = CoordSet()
+    cs = db.CoordSet()
     db.session.add(cs)
     db.session.commit()
 
-    gs = GuessSet(game_id=g.game_id, player_name=name, coord_set=cs)
+    gs = db.GuessSet(game_id=g.game_id, player_name=name, coord_set=cs)
     db.session.add(gs)
     db.session.commit()
     return "", 201