Some model and resource adjustments

Author: MaKleSoft

api.py

@@ -1,36 +1,55 @@
-from tastypie.resources import ModelResource
+from tastypie.resources import ModelResource, ALL, ALL_WITH_RELATIONS
 from tastypie import fields
 from handball.models import *
 from django.contrib.auth.models import User
 from tastypie.authorization import DjangoAuthorization, Authorization
-from tastypie.authentication import BasicAuthentication
+from tastypie.authentication import BasicAuthentication, Authentication
 
 
 class UnionResource(ModelResource):
-    clubs = fields.ToManyField('handball.api.ClubResource', 'clubs', full=True)
+    # clubs = fields.ToManyField('handball.api.ClubResource', 'clubs', full=True)
+    managers = fields.ToManyField('handball.api.PersonResource', 'managers')
 
     class Meta:
         queryset = Union.objects.all()
-        allowed_methods = ['get', 'post', 'put']
-        authorization = DjangoAuthorization()
+        allowed_methods = ['get', 'post', 'put', 'patch']
+        authorization = Authorization()
         authentication = BasicAuthentication()
+        filtering = {
+            'name': ('exact')
+        }
 
+    def obj_create(self, bundle, request=None, **kwargs):
+        # The user to create a union becomes its first manager (for lack of other people)
+        bundle.data['managers'] = ['/api/v1/person/' + str(request.user.get_profile().id) + '/']
+        return super(UnionResource, self).obj_create(bundle, request)
 
-class ClubResource(ModelResource):
-    union = fields.ForeignKey(UnionResource, 'union')
-    teams = fields.ToManyField('handball.api.TeamResource', 'teams')
 
+class LeagueResource(ModelResource):
     class Meta:
-        queryset = Club.objects.all()
+        queryset = Team.objects.all()
         allowed_methods = ['get', 'post', 'put']
-        authorization = DjangoAuthorization()
+        authentication = Authentication()
+        authorization = Authorization()
 
 
-class LeagueResource(ModelResource):
+class ClubResource(ModelResource):
+    union = fields.ForeignKey(UnionResource, 'union')
+    # teams = fields.ToManyField('handball.api.TeamResource', 'teams')
+
     class Meta:
-        queryset = Team.objects.all()
+        queryset = Club.objects.all()
         allowed_methods = ['get', 'post', 'put']
-        authorization = DjangoAuthorization()
+        authorization = Authorization()
+        authentication = Authentication()
+        filtering = {
+            'union': ALL_WITH_RELATIONS
+        }
+
+    def obj_create(self, bundle, request=None, **kwargs):
+        # The user to create a club becomes its first manager (for lack of other people)
+        bundle.data['managers'] = ['/api/v1/person/' + str(request.user.get_profile().id) + '/']
+        return super(ClubResource, self).obj_create(bundle, request)
 
 
 class TeamResource(ModelResource):
@@ -39,7 +58,14 @@ class TeamResource(ModelResource):
 
     class Meta:
         queryset = Team.objects.all()
-        authorization = DjangoAuthorization()
+        allowed_methods = ['get', 'post', 'put']
+        authorization = Authorization()
+        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)
 
 
 class UserResource(ModelResource):
@@ -52,11 +78,12 @@ class Meta:
 
 class PersonResource(ModelResource):
     user = fields.ForeignKey(UserResource, 'user')
-    teams = fields.ManyToManyField(TeamResource, 'teams')
+    # teams = fields.ManyToManyField(TeamResource, 'teams')
 
     class Meta:
         queryset = Person.objects.all()
         authorization = DjangoAuthorization()
+        excludes = ['activation_key', 'key_expires']
 
 
 class GameTypeResource(ModelResource):

models.py

@@ -4,14 +4,15 @@
 from django.contrib.auth.models import User
 from django.db.models.signals import post_save
 from django.utils.translation import ugettext as _
+from tastypie.models import create_api_key
 
 
 class Person(models.Model):
-    user = models.OneToOneField(User)
+    user = models.OneToOneField(User, blank=True)
 
     # Fields used for user activation after signup
-    activation_key = models.CharField(max_length=40, null=True)
-    key_expires = models.DateTimeField(null=True)
+    activation_key = models.CharField(max_length=40, blank=True)
+    key_expires = models.DateTimeField(null=True, blank=True)
 
     first_name = models.CharField(max_length=50)
     last_name = models.CharField(max_length=50)
@@ -25,7 +26,7 @@ class Person(models.Model):
     is_player = models.BooleanField(default=True)
     is_exec = models.BooleanField(default=False)
 
-    teams = models.ManyToManyField('Team')
+    teams = models.ManyToManyField('Team', blank=True)
 
     def __unicode__(self):
         return self.first_name + ' ' + self.last_name
@@ -34,9 +35,9 @@ def __unicode__(self):
 class Team(models.Model):
     name = models.CharField(max_length=50)
 
-    league = models.ForeignKey('League')
+    league = models.ForeignKey('League', related_name='league')
     club = models.ForeignKey('Club', related_name='teams')
-    managers = models.ManyToManyField('Person')
+    managers = models.ManyToManyField('Person', blank=True)
 
     def __unicode__(self):
         return self.club.name + ' ' + self.name
@@ -46,7 +47,7 @@ class Club(models.Model):
     name = models.CharField(max_length=50)
 
     union = models.ForeignKey('Union', related_name='clubs')
-    managers = models.ManyToManyField('Person')
+    managers = models.ManyToManyField('Person', blank=True)
 
     def __unicode__(self):
         return self.name
@@ -63,7 +64,7 @@ def __unicode__(self):
 class Union(models.Model):
     name = models.CharField(max_length=50)
 
-    managers = models.ManyToManyField('Person')
+    managers = models.ManyToManyField('Person', blank=True)
 
     def __unicode__(self):
         return self.name
@@ -145,4 +146,7 @@ def create_user_profile(sender, instance, created, **kwargs):
     if created:
         Person.objects.create(user=instance, first_name=instance.first_name, last_name=instance.last_name)
 
-post_save.connect(create_user_profile, sender=User)
+# post_save.connect(create_user_profile, sender=User)
+
+# Create API key for a new user
+post_save.connect(create_api_key, sender=User)