Add display_name to team and person; Turn off authentication for testing purposes

Author: MaKleSoft

api.py

@@ -25,7 +25,7 @@ class Meta:
         queryset = Union.objects.all()
         allowed_methods = ['get', 'post', 'put', 'patch']
         authorization = Authorization()
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
         filtering = {
             'name': ('exact')
         }
@@ -40,19 +40,19 @@ class LeagueResource(ModelResource):
     class Meta:
         queryset = League.objects.all()
         allowed_methods = ['get', 'post', 'put']
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
         authorization = Authorization()
 
 
 class ClubResource(ModelResource):
-    union = fields.ForeignKey(UnionResource, 'union')
+    union = fields.ForeignKey(UnionResource, 'union', full=True)
     # teams = fields.ToManyField('handball.api.TeamResource', 'teams')
 
     class Meta:
         queryset = Club.objects.all()
         allowed_methods = ['get', 'post', 'put']
         authorization = Authorization()
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
         filtering = {
             'union': ALL_WITH_RELATIONS
         }
@@ -72,13 +72,17 @@ class Meta:
         queryset = Team.objects.all()
         allowed_methods = ['get', 'post', 'put']
         authorization = Authorization()
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
 
     def obj_create(self, bundle, request=None, **kwargs):
         # The user to create a team becomes its first manager (for lack of other people)
         bundle.data['managers'] = ['/api/v1/person/' + str(request.user.get_profile().id) + '/']
         return super(TeamResource, self).obj_create(bundle, request)
 
+    def dehydrate(self, bundle):
+        bundle.data['display_name'] = str(bundle.obj)
+        return bundle
+
 
 class UserResource(ModelResource):
     person = fields.OneToOneField('handball.api.PersonResource', 'person', full=True)
@@ -103,21 +107,25 @@ class Meta:
             'last_name': ['exact']
         }
 
+    def dehydrate(self, bundle):
+        bundle.data['display_name'] = str(bundle.obj)
+        return bundle
+
 
 class GameTypeResource(ModelResource):
     class Meta:
         queryset = GameType.objects.all()
         include_resource_uri = False
         authorization = Authorization()
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
 
 
 class SiteResource(ModelResource):
     class Meta:
         queryset = Site.objects.all()
         include_resource_uri = False
         authorization = Authorization()
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
 
 
 class GameResource(ModelResource):
@@ -137,7 +145,7 @@ class GameResource(ModelResource):
     class Meta:
         queryset = Game.objects.all()
         authorization = Authorization()
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
 
 
 class EventTypeResource(ModelResource):
@@ -147,7 +155,7 @@ class Meta:
         queryset = EventType.objects.all()
         include_resource_uri = False
         authorization = Authorization()
-        authentication = ApiKeyAuthentication()
+        authentication = Authentication()
 
 
 class EventResource(ModelResource):

models.py

@@ -9,6 +9,7 @@
 
 class Person(models.Model):
     user = models.OneToOneField(User, blank=True)
+    club = models.ForeignKey('Club', related_name='members', blank=True)
 
     # Fields used for user activation after signup
     activation_key = models.CharField(max_length=40, blank=True)
@@ -39,7 +40,7 @@ class Team(models.Model):
     coaches = models.ManyToManyField('Person', blank=True, related_name='teams_coaching')
     league = models.ForeignKey('League', related_name='league')
     club = models.ForeignKey('Club', related_name='teams')
-    managers = models.ManyToManyField('Person', blank=True)
+    managers = models.ManyToManyField('Person', blank=True, related_name='teams_managed')
 
     def __unicode__(self):
         return self.club.name + ' ' + self.name
@@ -49,7 +50,7 @@ class Club(models.Model):
     name = models.CharField(max_length=50)
 
     union = models.ForeignKey('Union', related_name='clubs')
-    managers = models.ManyToManyField('Person', blank=True)
+    managers = models.ManyToManyField('Person', blank=True, related_name='clubs_managed')
 
     def __unicode__(self):
         return self.name
@@ -66,7 +67,7 @@ def __unicode__(self):
 class Union(models.Model):
     name = models.CharField(max_length=50)
 
-    managers = models.ManyToManyField('Person', blank=True)
+    managers = models.ManyToManyField('Person', blank=True, related_name='unions_managed')
 
     def __unicode__(self):
         return self.name