Add GamePlayerRelation resource; A couple of other adjustments

Author: MaKleSoft

admin.py

@@ -17,8 +17,13 @@ class TeamCoachInline(admin.TabularInline):
     extra = 1
 
 
+class GamePlayerInline(admin.TabularInline):
+    model = handball.models.GamePlayerRelation
+    extra = 1
+
+
 class PersonAdmin(admin.ModelAdmin):
-    inlines = (ClubMemberInline, TeamPlayerInline, TeamCoachInline)
+    inlines = (ClubMemberInline, TeamPlayerInline, TeamCoachInline, GamePlayerInline)
 
 
 class ClubAdmin(admin.ModelAdmin):
@@ -29,16 +34,21 @@ class TeamAdmin(admin.ModelAdmin):
     inlines = (TeamPlayerInline, TeamCoachInline)
 
 
+class GameAdmin(admin.ModelAdmin):
+    inlines = (GamePlayerInline,)
+
+
 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)
+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)

api.py

@@ -60,6 +60,13 @@ def dehydrate(self, bundle):
         return bundle
 
 
+class GroupResource(ModelResource):
+    class Meta:
+        queryset = Group.objects.all()
+        authorization = Authorization()
+        authentication = Authentication()
+
+
 class ClubResource(ModelResource):
     district = fields.ForeignKey(DistrictResource, 'district', full=True)
     # teams = fields.ToManyField('handball.api.TeamResource', 'teams')
@@ -150,26 +157,19 @@ def dehydrate(self, bundle):
             clubBundle = resource.build_bundle(obj=membership.club, request=bundle.request)
             bundle.data['clubs'].append(resource.full_dehydrate(clubBundle))
 
-        # del bundle.data['clubs']
-        # del bundle.data['clubs_managed']
-        # del bundle.data['teams']
-        # del bundle.data['teams_managed']
-        # del bundle.data['teams_coached']
         return bundle
 
 
 class GameTypeResource(ModelResource):
     class Meta:
         queryset = GameType.objects.all()
-        include_resource_uri = False
         authorization = Authorization()
         authentication = Authentication()
 
 
 class SiteResource(ModelResource):
     class Meta:
         queryset = Site.objects.all()
-        include_resource_uri = False
         authorization = Authorization()
         authentication = Authentication()
 
@@ -180,33 +180,37 @@ class GameResource(ModelResource):
     referee = fields.ForeignKey(PersonResource, 'referee')
     timer = fields.ForeignKey(PersonResource, 'timer')
     secretary = fields.ForeignKey(PersonResource, 'secretary')
-    winner = fields.ForeignKey(TeamResource, 'winner')
-    union = fields.ForeignKey(UnionResource, 'union', full=True)
-    league = fields.ForeignKey(LeagueResource, 'league', full=True)
-    game_type = fields.ForeignKey(GameTypeResource, 'game_type', full=True)
-    site = fields.ForeignKey(SiteResource, 'site', full=True)
-    players = fields.ManyToManyField(PersonResource, 'players')
+    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)
 
     class Meta:
         queryset = Game.objects.all()
         authorization = Authorization()
         authentication = Authentication()
+        always_return_data = True
 
+    def hydrate_m2m(self, bundle):
+        for item in bundle.data['events']:
+            item[u'game'] = self.get_resource_uri(bundle)
+        return super(GameResource, self).hydrate_m2m(bundle)
 
-class EventTypeResource(ModelResource):
-    game = fields.ForeignKey(GameResource, 'game')
 
+class EventTypeResource(ModelResource):
     class Meta:
         queryset = EventType.objects.all()
-        include_resource_uri = False
         authorization = Authorization()
         authentication = Authentication()
 
 
 class EventResource(ModelResource):
-    player = fields.ForeignKey(PersonResource, 'person')
+    person = fields.ForeignKey(PersonResource, 'person', full=True)
     game = fields.ForeignKey(GameResource, 'game')
+    event_type = fields.ForeignKey(EventTypeResource, 'event_type')
+    team = fields.ForeignKey(TeamResource, 'team')
 
     class Meta:
         queryset = Event.objects.all()
@@ -226,6 +230,18 @@ class Meta:
         always_return_data = True
 
 
+class GamePlayerRelationResource(ModelResource):
+    game = fields.ForeignKey(GameResource, 'game', full=True)
+    player = fields.ForeignKey(PersonResource, 'player', full=True)
+    team = fields.ForeignKey(TeamResource, 'team')
+
+    class Meta:
+        queryset = GamePlayerRelation.objects.all()
+        authorization = Authorization()
+        authentication = Authentication()
+        always_return_data = True
+
+
 class SiteResource(ModelResource):
     class Meta:
         queryset = Site.objects.all()
@@ -238,13 +254,6 @@ def dehydrate(self, bundle):
         return bundle
 
 
-class GroupResource(ModelResource):
-    class Meta:
-        queryset = Group.objects.all()
-        authorization = Authorization()
-        authentication = Authentication()
-
-
 """
 Non-resource api endpoints
 """

urls.py

@@ -15,6 +15,10 @@
 v1_api.register(SiteResource())
 v1_api.register(GameTypeResource())
 v1_api.register(GroupResource())
+v1_api.register(GameResource())
+v1_api.register(EventResource())
+v1_api.register(EventTypeResource())
+v1_api.register(GamePlayerRelationResource())
 
 urlpatterns = patterns('handball.views',
     (r'^$', 'index')