Update build script for client/server use.

dsst/dsst_server/data_access/mapping.py

@@ -3,10 +3,21 @@ from common import models
 
 
 def map_base_fields(cls, db_model):
+    """Automatically map fields of db models to common models
+    :param cls: common.models class to create
+    :param db_model: database model from which to map
+    :return: An common.models object
+    """
     model = cls()
     attrs = [attr for attr in db_model._meta.fields]
     for attr in attrs:
-        setattr(model, attr, getattr(db_model, attr))
+        db_attr = getattr(db_model, attr)
+        # Check if the attribute is an relation to another db model
+        # In that case just take its id
+        if hasattr(db_attr, 'id'):
+            setattr(model, attr, getattr(db_attr, 'id'))
+        else:
+            setattr(model, attr, getattr(db_model, attr))
     return model
 
 

dsst/dsst_server/data_access/sql.py

@@ -5,8 +5,12 @@ Example:
 from sql import Episode
 query = Episode.select().where(Episode.name == 'MyName')
 """
-
-from peewee import *
+import sys
+try:
+    from peewee import *
+except ImportError:
+    print('peewee package not installed')
+    sys.exit(0)
 
 db = MySQLDatabase(None)
 
@@ -56,7 +60,7 @@ class Drink(Model):
 class Enemy(Model):
     id = AutoField()
     name = CharField()
-    optional = BooleanField()
+    boss = BooleanField()
     season = ForeignKeyField(Season, backref='enemies')
 
     class Meta:

dsst/dsst_server/data_access/sql_func.py

@@ -1,7 +1,7 @@
 """
 This module contains shorthand functions for common queries to ease access from the UI
 """
-from data_access.sql import *
+from dsst_server.data_access import sql
 
 
 def get_episodes_for_season(season_id: int) -> list:
@@ -10,8 +10,8 @@ def get_episodes_for_season(season_id: int) -> list:
     :return: List of sql.Episode or empty list
     """
     try:
-        return list(Season.get(Season.id == season_id).episodes)
-    except Episode.DoesNotExist:
+        return list(sql.Season.get(sql.Season.id == season_id).episodes)
+    except sql.Episode.DoesNotExist:
         return []
 
 
@@ -22,7 +22,7 @@ def get_player_deaths_for_season(season_id: int, player_id: int) -> int:
     :return: Number of deaths of the player in the season
     """
     deaths = 0
-    for episode in list(Season.get(Season.id == season_id).episodes):
+    for episode in list(sql.Season.get(sql.Season.id == season_id).episodes):
         deaths = deaths + len([death for death in list(episode.deaths) if death.player.id == player_id])
     return deaths
 
@@ -34,19 +34,33 @@ def get_player_victories_for_season(season_id: int, player_id: int) -> int:
     :return: Number of all victories of the player in the season
     """
     victories = 0
-    for episode in list(Season.get(Season.id == season_id).episodes):
+    for episode in list(sql.Season.get(sql.Season.id == season_id).episodes):
         victories = victories + len([vic for vic in list(episode.victories) if vic.player.id == player_id])
     return victories
 
 
+def players_for_season(season_id: int) -> set:
+    season_eps = list(sql.Season.get(sql.Season.id == season_id).episodes)
+    players = set()
+    for ep in season_eps:
+        players.update([player for player in ep.players])
+    return players
+
+
+def enemy_attempts(enemy_id: int) -> int:
+    return sql.Death.select().where(sql.Death.enemy == enemy_id).count()
+
+
 def create_tables():
     """Create all database tables"""
-    models = [Season, Episode, Player, Drink, Enemy, Death, Victory, Penalty, Episode.players.get_through_model()]
+    models = [sql.Season, sql.Episode, sql.Player, sql.Drink, sql.Enemy, sql.Death, sql.Victory, sql.Penalty,
+              sql.Episode.players.get_through_model()]
     for model in models:
         model.create_table()
 
 
 def drop_tables():
     """Drop all data in database"""
-    models = [Season, Episode, Player, Drink, Enemy, Death, Victory, Penalty, Episode.players.get_through_model()]
-    db.drop_tables(models)
+    models = [sql.Season, sql.Episode, sql.Player, sql.Drink, sql.Enemy, sql.Death, sql.Victory, sql.Penalty,
+              sql.Episode.players.get_through_model()]
+    sql.db.drop_tables(models)