Significant changes in data model;

Author: MaKleSoft

admin.py

@@ -41,14 +41,13 @@ class GameAdmin(admin.ModelAdmin):
 admin.site.register(handball.models.Person, PersonAdmin)
 admin.site.register(handball.models.Club, ClubAdmin)
 admin.site.register(handball.models.Group)
-admin.site.register(handball.models.League)
-admin.site.register(handball.models.LeagueTemplate)
 admin.site.register(handball.models.District)
 admin.site.register(handball.models.Union)
 admin.site.register(handball.models.Game, GameAdmin)
-admin.site.register(handball.models.GameType)
 admin.site.register(handball.models.Team, TeamAdmin)
 admin.site.register(handball.models.Site)
 admin.site.register(handball.models.Event)
 admin.site.register(handball.models.EventType)
 admin.site.register(handball.models.GamePlayerRelation)
+admin.site.register(handball.models.LeagueLevel)
+admin.site.register(handball.models.AgeGroup)

api.py

@@ -52,23 +52,19 @@ def dehydrate(self, bundle):
         return bundle
 
 
-class LeagueResource(ModelResource):
-    class Meta:
-        queryset = League.objects.all()
-        allowed_methods = ['get']
-        authentication = Authentication()
-        authorization = Authorization()
-
-    def dehydrate(self, bundle):
-        bundle.data['display_name'] = str(bundle.obj)
-        return bundle
-
-
 class GroupResource(ModelResource):
+    union = fields.ForeignKey(UnionResource, 'union', blank=True, null=True)
+    district = fields.ForeignKey(DistrictResource, 'district', blank=True, null=True)
+
     class Meta:
         queryset = Group.objects.all()
-        authorization = Authorization()
+        # allowed_methods = ['get', '']
         authentication = Authentication()
+        authorization = Authorization()
+        filtering = {
+            'union': ALL_WITH_RELATIONS,
+            'district': ALL_WITH_RELATIONS
+        }
 
 
 class PersonResource(ModelResource):
@@ -161,13 +157,6 @@ def dehydrate(self, bundle):
         return bundle
 
 
-class GameTypeResource(ModelResource):
-    class Meta:
-        queryset = GameType.objects.all()
-        authorization = Authorization()
-        authentication = Authentication()
-
-
 class SiteResource(ModelResource):
     class Meta:
         queryset = Site.objects.all()
@@ -184,7 +173,6 @@ class GameResource(ModelResource):
     supervisor = fields.ForeignKey(PersonResource, 'supervisor')
     winner = fields.ForeignKey(TeamResource, 'winner', null=True)
     group = fields.ForeignKey(GroupResource, 'group')
-    game_type = fields.ForeignKey(GameTypeResource, 'game_type')
     site = fields.ForeignKey(SiteResource, 'site')
     events = fields.ToManyField('handball.api.EventResource', 'events', full=True)
 
@@ -323,6 +311,15 @@ def obj_create(self, bundle, request=None, **kwargs):
         return super(TeamManagerRelationResource, self).obj_create(bundle, request)
 
 
+class LeagueLevelResource(ModelResource):
+    class Meta:
+        queryset = LeagueLevel.objects.all()
+        authorization = Authorization()
+        authentication = Authentication()
+        always_return_data = True
+        allowed_methods = ['get']
+
+
 # class LeagueManagerRelationResource(ModelResource):
 #     league = fields.ForeignKey(LeagueResource, 'league', full=True)
 #     manager = fields.ForeignKey(PersonResource, 'manager', full=True)

models.py

@@ -7,35 +7,23 @@
 from tastypie.models import create_api_key
 
 
-class Person(models.Model):
-    user = models.OneToOneField(User, blank=True, null=True, related_name='handball_profile')
+class Union(models.Model):
+    name = models.CharField(max_length=50)
 
-    first_name = models.CharField(max_length=50)
-    last_name = models.CharField(max_length=50)
-    address = models.CharField(max_length=50, blank=True)
-    city = models.CharField(max_length=50, blank=True)
-    zip_code = models.IntegerField(null=True, blank=True)
-    birthday = models.DateField(null=True, blank=True)
-    pass_number = models.IntegerField(null=True, blank=True)
-    gender = models.CharField(max_length=10, choices=(('male', _('male')), ('female', _('female'))), default='male')
-    mobile_number = models.CharField(max_length=20, blank=True)
+    managers = models.ManyToManyField('Person', blank=True, related_name='unions_managed', through='UnionManagerRelation')
 
     def __unicode__(self):
-        return self.first_name + ' ' + self.last_name
+        return self.name
 
 
-class Team(models.Model):
+class District(models.Model):
     name = models.CharField(max_length=50)
-    validated = models.BooleanField(blank=True, default=False)
 
-    players = models.ManyToManyField('Person', blank=True, related_name='teams', through='TeamPlayerRelation')
-    coaches = models.ManyToManyField('Person', blank=True, related_name='teams_coached', through='TeamCoachRelation')
-    # league = models.ForeignKey('League', related_name='league', blank=True)
-    club = models.ForeignKey('Club', related_name='teams')
-    managers = models.ManyToManyField('Person', blank=True, related_name='teams_managed', through='TeamManagerRelation')
+    union = models.ForeignKey('Union', related_name='districts')
+    managers = models.ManyToManyField('Person', blank=True, related_name='districts_managed', through='DistrictManagerRelation')
 
     def __unicode__(self):
-        return self.club.name + ' ' + self.name
+        return self.name
 
 
 class Club(models.Model):
@@ -51,64 +39,82 @@ def __unicode__(self):
         return self.name
 
 
-class League(models.Model):
+class Team(models.Model):
     name = models.CharField(max_length=50)
-    gender = models.CharField(max_length=10, choices=(('male', _('male')), ('female', _('female'))))
-    age_group = models.CharField(max_length=20, choices=(('adults', _('adults')), ('juniors', _('juniors')), ('kids', _('kids'))))
+    validated = models.BooleanField(blank=True, default=False)
 
-    union = models.ForeignKey('Union', related_name='leagues', blank=True)
-    district = models.ForeignKey('District', related_name='leagues', blank=True)
-    managers = models.ManyToManyField('Person', blank=True, related_name='leagues_managed', through='LeagueManagerRelation')
+    players = models.ManyToManyField('Person', blank=True, related_name='teams', through='TeamPlayerRelation')
+    coaches = models.ManyToManyField('Person', blank=True, related_name='teams_coached', through='TeamCoachRelation')
+    # league = models.ForeignKey('League', related_name='league', blank=True)
+    club = models.ForeignKey('Club', related_name='teams')
+    managers = models.ManyToManyField('Person', blank=True, related_name='teams_managed', through='TeamManagerRelation')
 
     def __unicode__(self):
-        return u'{0} {1} {2}'.format(self.name, self.gender, self.age_group)
+        return self.club.name + ' ' + self.name
 
 
-class LeagueTemplate(models.Model):
+class LeagueLevel(models.Model):
     name = models.CharField(max_length=50)
-    gender = models.CharField(max_length=10, choices=(('male', _('male')), ('female', _('female'))))
-    age_group = models.CharField(max_length=20, choices=(('adults', _('adults')), ('juniors', _('juniors')), ('kids', _('kids'))))
 
-    def __unicode__(self):
-        return u'{0} {1} {2}'.format(self.name, self.gender, self.age_group)
+    union_specific = models.BooleanField(default=False)
+    district_specific = models.BooleanField(default=False)
+
+
+class AgeGroup(models.Model):
+    name = models.CharField(max_length=20)
+
+    min_age = models.IntegerField()
+    max_age = models.IntegerField()
 
 
 class Group(models.Model):
     name = models.CharField(max_length=50)
+    kind = models.CharField(max_length=20, choices=(('league', _('league')), ('cup', _('cup')), ('tournament', _('tournament'))))
+    gender = models.CharField(max_length=10, choices=(('male', _('male')), ('female', _('female'))), default='male')
 
-    union = models.ForeignKey('Union', related_name='groups', blank=True)
-    district = models.ForeignKey('District', related_name='groups', blank=True)
-    league = models.ForeignKey('League', related_name='groups', blank=True)
-    teams = models.ManyToManyField('Team', related_name='groups', blank=True)
+    level = models.ForeignKey('LeagueLevel', blank=True, null=True)
+    age_group = models.CharField(max_length=20, choices=(('adults', _('adults')), ('juniors_a', _('juniors a')),
+        ('juniors_b', _('juniors b')), ('juniors_c', _('juniors c')), ('juniors_d', _('juniors d')), ('juniors_e', _('juniors e'))))
+    union = models.ForeignKey('Union', related_name='leagues', blank=True, null=True)
+    district = models.ForeignKey('District', related_name='leagues', blank=True, null=True)
+    teams = models.ManyToManyField('Team', related_name='groups', through='GroupTeamRelation')
+    managers = models.ManyToManyField('Person', blank=True, related_name='groups_managed', through='GroupManagerRelation')
 
     def __unicode__(self):
-        return u'{0}, {1}, {2}, {3}'.format(self.name, self.league.name, self.league.gender, self.league.age_group, self.league.district.name)
-
+        return u'{0}: {1} {2} {3}'.format(self.kind, self.name, self.gender, self.age_group.name)
 
-class District(models.Model):
-    name = models.CharField(max_length=50)
 
-    union = models.ForeignKey('Union', related_name='districts')
-    managers = models.ManyToManyField('Person', blank=True, related_name='districts_managed', through='DistrictManagerRelation')
+class GroupTeamRelation(models.Model):
+    group = models.ForeignKey('Group')
+    team = models.ForeignKey('Team')
 
-    def __unicode__(self):
-        return self.name
+    points = models.IntegerField()
+    position = models.IntegerField()
 
 
-class Union(models.Model):
-    name = models.CharField(max_length=50)
+class Person(models.Model):
+    user = models.OneToOneField(User, blank=True, null=True, related_name='handball_profile')
 
-    managers = models.ManyToManyField('Person', blank=True, related_name='unions_managed', through='UnionManagerRelation')
+    first_name = models.CharField(max_length=50)
+    last_name = models.CharField(max_length=50)
+    address = models.CharField(max_length=50, blank=True)
+    city = models.CharField(max_length=50, blank=True)
+    zip_code = models.IntegerField(null=True, blank=True)
+    birthday = models.DateField(null=True, blank=True)
+    pass_number = models.IntegerField(null=True, blank=True)
+    gender = models.CharField(max_length=10, choices=(('male', _('male')), ('female', _('female'))), default='male')
+    mobile_number = models.CharField(max_length=20, blank=True)
 
     def __unicode__(self):
-        return self.name
+        return self.first_name + ' ' + self.last_name
 
 
 class Game(models.Model):
     number = models.IntegerField(unique=True, blank=True, null=True)
     start = models.DateTimeField()
     score_home = models.IntegerField()
     score_away = models.IntegerField()
+    duration = models.IntegerField(default=60)
 
     home = models.ForeignKey('Team', related_name='games_home')
     away = models.ForeignKey('Team', related_name='games_away')
@@ -117,22 +123,15 @@ class Game(models.Model):
     secretary = models.ForeignKey('Person', related_name='games_as_secretary')
     supervisor = models.ForeignKey('Person', related_name='games_as_supervisor')
     winner = models.ForeignKey('Team', related_name='games_won', blank=True, null=True)
-    group = models.ForeignKey('Group', related_name='games')
-    game_type = models.ForeignKey('GameType')
+    group = models.ForeignKey('Group', related_name='games', blank=True, null=True)
+    # game_type = models.CharField(max_length=20, choices=(('cub', _('cub')), ('friendly', _('friendly')), ('league', _('league')), ('tournament', _('tournament'))))
     site = models.ForeignKey('Site')
     players = models.ManyToManyField('Person', through='GamePlayerRelation')
 
     def __unicode__(self):
         return u'{0}/{1}/{2}: {3} {4} vs. {5} {6}'.format(self.start.year, self.start.month, self.start.day, self.home.club.name, self.home.name, self.away.club.name, self.away.name)
 
 
-class GameType(models.Model):
-    name = models.CharField(max_length=20)
-
-    def __unicode__(self):
-        return self.name
-
-
 class Site(models.Model):
     # name = models.CharField(max_length=50)
     address = models.CharField(max_length=50)
@@ -180,7 +179,7 @@ class TeamCoachRelation(models.Model):
     coach = models.ForeignKey('Person')
     team = models.ForeignKey('Team')
 
-    member_confirmed = models.BooleanField(default=False)
+    coach_confirmed = models.BooleanField(default=False)
     manager_confirmed = models.BooleanField(default=False)
 
 
@@ -196,10 +195,10 @@ class TeamManagerRelation(models.Model):
     appointed_by = models.ForeignKey(User, related_name='handball_team_managers_appointed', blank=True, null=True)
 
 
-class LeagueManagerRelation(models.Model):
-    league = models.ForeignKey('League')
+class GroupManagerRelation(models.Model):
+    group = models.ForeignKey('Group')
     manager = models.ForeignKey('Person')
-    appointed_by = models.ForeignKey(User, related_name='handball_league_managers_appointed', blank=True, null=True)
+    appointed_by = models.ForeignKey(User, related_name='handball_group_managers_appointed', blank=True, null=True)
 
 
 class DistrictManagerRelation(models.Model):
@@ -230,29 +229,28 @@ def __unicode__(self):
         return self.name
 
 
-def create_default_leagues(sender, instance, created, **kwargs):
-    # Create defaults leagues for District after creation
-    if created:
-        templates = LeagueTemplate.objects.all()
-
-        for template in templates:
-            League.objects.create(name=template.name, gender=template.gender, age_group=template.age_group, district=instance)
-
-
 def set_union_by_district(sender, instance, **kwargs):
     # If district is set, set according union
     if instance.district:
         instance.union = instance.district.union
 
 
-def set_club_by_team(sender, instance, created, **kwargs):
+def player_to_club_member(sender, instance, created, **kwargs):
     try:
         ClubMemberRelation.objects.get(member=instance.player, club=instance.team.club)
     except ClubMemberRelation.DoesNotExist:
         ClubMemberRelation.objects.create(member=instance.player, club=instance.team.club,
             manager_confirmed=instance.manager_confirmed, member_confirmed=instance.player_confirmed)
 
 
+def coach_to_club_member(sender, instance, created, **kwargs):
+    try:
+        ClubMemberRelation.objects.get(member=instance.coach, club=instance.team.club)
+    except ClubMemberRelation.DoesNotExist:
+        ClubMemberRelation.objects.create(member=instance.coach, club=instance.team.club,
+            manager_confirmed=instance.manager_confirmed, member_confirmed=instance.coach_confirmed)
+
+
 def add_player_to_team(sender, instance, created, **kwargs):
     try:
         TeamPlayerRelation.objects.get(team=instance.team, player=instance.player)
@@ -287,9 +285,9 @@ def club_primary_check(sender, instance, **kwargs):
 
 # Create API key for a new user
 post_save.connect(create_api_key, sender=User)
-post_save.connect(create_default_leagues, sender=District)
-pre_save.connect(set_union_by_district, sender=League)
-post_save.connect(set_club_by_team, sender=TeamPlayerRelation)
+pre_save.connect(set_union_by_district, sender=Group)
+post_save.connect(player_to_club_member, sender=TeamPlayerRelation)
+post_save.connect(coach_to_club_member, sender=TeamCoachRelation)
 post_save.connect(add_player_to_team, sender=GamePlayerRelation)
 post_save.connect(club_member_to_manager, sender=ClubMemberRelation)
 post_save.connect(team_player_to_manager, sender=TeamPlayerRelation)

urls.py

@@ -9,11 +9,9 @@
 v1_api.register(TeamResource())
 v1_api.register(PersonResource())
 v1_api.register(GameResource())
-v1_api.register(LeagueResource())
 v1_api.register(DistrictResource())
 v1_api.register(ClubMemberRelationResource())
 v1_api.register(SiteResource())
-v1_api.register(GameTypeResource())
 v1_api.register(GroupResource())
 v1_api.register(EventResource())
 v1_api.register(EventTypeResource())
@@ -22,6 +20,7 @@
 v1_api.register(TeamCoachRelationResource())
 v1_api.register(ClubManagerRelationResource())
 v1_api.register(TeamManagerRelationResource())
+v1_api.register(LeagueLevelResource())
 
 urlpatterns = patterns('', (r'^', include(v1_api.urls)))