Converted models to use abstract models

Added Game and GameDefinition fields which contain all fields and
constants common to Match/Tournament/MoranProcess & their corresponding
definition classes. These classes instead inherit from the abstract models.

Author: erik-sn

api/core/models.py

@@ -41,28 +41,22 @@ class Game(Model):
     results = JSONField()
 
     class Meta:
-        managed = False
+        abstract = True
 
 
-class Tournament(Model):
+class GameDefinition(Model):
+    created = DateTimeField(auto_now_add=True, editable=False)
+    last_updated = DateTimeField(auto_now=True, editable=False)
+    turns = IntegerField()
+    noise = FloatField()
+    player_list = ManyToManyField('InternalStrategy')
 
-    PENDING = 0
-    RUNNING = 1
-    SUCCESS = 2
-    FAILED = 3
+    class Meta:
+        abstract = True
 
-    STATUS_CHOICES = (
-        (PENDING, 'PENDING'),
-        (RUNNING, 'RUNNING'),
-        (SUCCESS, 'SUCCESS'),
-        (FAILED, 'FAILED'),
-    )
 
-    # Fields
-    created = DateTimeField(auto_now_add=True, editable=False)
-    last_updated = DateTimeField(auto_now=True, editable=False)
-    status = IntegerField(choices=STATUS_CHOICES, default=PENDING)
-    results = JSONField(null=True)
+class Tournament(Game):
+
     definition = ForeignKey('TournamentDefinition')
 
     def run(self, strategies):
@@ -80,37 +74,14 @@ def run(self, strategies):
         return results
 
 
-class TournamentDefinition(Model):
-    # Fields
+class TournamentDefinition(GameDefinition):
     name = CharField(max_length=255)
-    created = DateTimeField(auto_now_add=True, editable=False)
-    last_updated = DateTimeField(auto_now=True, editable=False)
-    turns = IntegerField()
     repetitions = IntegerField()
-    noise = FloatField()
     with_morality = BooleanField()
-    player_list = ManyToManyField('InternalStrategy')
 
 
-class Match(Model):
+class Match(Game):
 
-    PENDING = 0
-    RUNNING = 1
-    SUCCESS = 2
-    FAILED = 3
-
-    STATUS_CHOICES = (
-        (PENDING, 'PENDING'),
-        (RUNNING, 'RUNNING'),
-        (SUCCESS, 'SUCCESS'),
-        (FAILED, 'FAILED'),
-    )
-
-    # Fields
-    created = DateTimeField(auto_now_add=True, editable=False)
-    last_updated = DateTimeField(auto_now=True, editable=False)
-    status = IntegerField(choices=STATUS_CHOICES, default=PENDING)
-    results = JSONField(null=True)
     definition = ForeignKey('MatchDefinition')
 
     def run(self, strategies):
@@ -125,33 +96,14 @@ def run(self, strategies):
         return match
 
 
-class MatchDefinition(Model):
-    created = DateTimeField(auto_now_add=True, editable=False)
-    last_updated = DateTimeField(auto_now=True, editable=False)
-    turns = IntegerField()
-    noise = FloatField()
-    player_list = ManyToManyField('InternalStrategy')
+class MatchDefinition(GameDefinition):
 
+    class Meta:
+        managed = True
 
-class MoranProcess(Model):
 
-    PENDING = 0
-    RUNNING = 1
-    SUCCESS = 2
-    FAILED = 3
+class MoranProcess(Game):
 
-    STATUS_CHOICES = (
-        (PENDING, 'PENDING'),
-        (RUNNING, 'RUNNING'),
-        (SUCCESS, 'SUCCESS'),
-        (FAILED, 'FAILED'),
-    )
-
-    # Fields
-    created = DateTimeField(auto_now_add=True, editable=False)
-    last_updated = DateTimeField(auto_now=True, editable=False)
-    status = IntegerField(choices=STATUS_CHOICES, default=PENDING)
-    results = JSONField(null=True)
     definition = ForeignKey('MoranDefinition')
 
     def run(self, strategies):
@@ -168,23 +120,19 @@ def run(self, strategies):
         return mp
 
 
-class MoranDefinition(Model):
-    created = DateTimeField(auto_now_add=True, editable=False)
-    last_updated = DateTimeField(auto_now=True, editable=False)
-    turns = IntegerField()
-    noise = FloatField()
+class MoranDefinition(GameDefinition):
     mode = CharField(max_length=2)
-    player_list = ManyToManyField('InternalStrategy')
 
 
 class InternalStrategy(Model):
+    """
+    This model is used to represent strategies in an internal
+    database table. Games reference this in a ManyToMany
+    to store the strategies in their player_list field. This is
+    necessary to facilitate normalization of the database.
+    """
     id = TextField(primary_key=True)
     created = DateTimeField(auto_now_add=True, editable=False)
     last_updated = DateTimeField(auto_now=True, editable=False)
 
 
-class Result(Model):
-    created = DateTimeField(auto_now_add=True, editable=False)
-    last_updated = DateTimeField(auto_now=True, editable=False)
-    type = CharField(max_length=255)
-    result = JSONField()