Simplify signup form and api endpoint

Author: MaKleSoft

Diff for: api.py

@@ -23,7 +23,7 @@ class UnionResource(ModelResource):
 
     class Meta:
         queryset = Union.objects.all()
-        allowed_methods = ['get', 'post', 'put', 'patch']
+        allowed_methods = ['get']
         authorization = Authorization()
         authentication = Authentication()
         filtering = {
@@ -36,16 +36,33 @@ def obj_create(self, bundle, request=None, **kwargs):
         return super(UnionResource, self).obj_create(bundle, request)
 
 
+class DistrictResource(ModelResource):
+    union = fields.ForeignKey(UnionResource, 'union', full=True)
+
+    class Meta:
+        queryset = District.objects.all()
+        allowed_methods = ['get']
+        authorization = Authorization()
+        authentication = Authentication()
+        filtering = {
+            'union': ALL_WITH_RELATIONS
+        }
+
+    def dehydrate(self, bundle):
+        bundle.data['display_name'] = str(bundle.obj)
+        return bundle
+
+
 class LeagueResource(ModelResource):
     class Meta:
         queryset = League.objects.all()
-        allowed_methods = ['get', 'post', 'put']
+        allowed_methods = ['get']
         authentication = Authentication()
         authorization = Authorization()
 
 
 class ClubResource(ModelResource):
-    union = fields.ForeignKey(UnionResource, 'union', full=True)
+    district = fields.ForeignKey(DistrictResource, 'district', full=True)
     # teams = fields.ToManyField('handball.api.TeamResource', 'teams')
 
     class Meta:
@@ -59,7 +76,7 @@ class Meta:
 
     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) + '/']
+        # bundle.data['managers'] = ['/api/v1/person/' + str(request.user.get_profile().id) + '/']
         return super(ClubResource, self).obj_create(bundle, request)
 
 
@@ -94,6 +111,7 @@ class Meta:
 
 class PersonResource(ModelResource):
     user = fields.ForeignKey(UserResource, 'user', blank=True, null=True)
+    clubs = fields.ManyToManyField(ClubResource, 'clubs')
     # teams = fields.ManyToManyField(TeamResource, 'teams')
 
     class Meta:
@@ -183,26 +201,26 @@ def sign_up(request):
         username = form.cleaned_data['username']
         password = form.cleaned_data['password']
         email = form.cleaned_data['email']
-        gender = form.cleaned_data['gender']
         first_name = form.cleaned_data['first_name']
         last_name = form.cleaned_data['last_name']
-        pass_number = form.cleaned_data['pass_number']
-        address = form.cleaned_data['address']
-        city = form.cleaned_data['city']
-        zip_code = form.cleaned_data['zip_code']
-        mobile_number = form.cleaned_data['mobile_number']
+        # gender = form.cleaned_data['gender']
+        # pass_number = form.cleaned_data['pass_number']
+        # address = form.cleaned_data['address']
+        # city = form.cleaned_data['city']
+        # zip_code = form.cleaned_data['zip_code']
+        # mobile_number = form.cleaned_data['mobile_number']
 
         user = User.objects.create(username=username, password=password, first_name=first_name, last_name=last_name, email=email)
 
         profile = form.cleaned_data['profile'] or Person.objects.create()
         profile.first_name = first_name
         profile.last_name = last_name
-        profile.gender = gender
-        profile.pass_number = pass_number
-        profile.address = address
-        profile.city = city
-        profile.zip_code = zip_code
-        profile.mobile_number = mobile_number
+        # profile.gender = gender
+        # profile.pass_number = pass_number
+        # profile.address = address
+        # profile.city = city
+        # profile.zip_code = zip_code
+        # profile.mobile_number = mobile_number
         profile.user = user
 
         # Build the activation key

Diff for: forms.py

@@ -12,15 +12,15 @@ class SignUpForm(forms.Form):
     # password_repeat = forms.CharField(widget=forms.PasswordInput,
     #     label=_('Repeat Password'), required=True)
 
-    gender = forms.ChoiceField(choices=(('male', _('male')), ('female', _('female'))))
     first_name = forms.CharField(label=_('First Name'), required=True)
     last_name = forms.CharField(label=_('Last Name'), required=True)
     profile = forms.ModelChoiceField(required=False, queryset=Person.objects.filter(user__isnull=True))
-    pass_number = forms.IntegerField(label=_('Pass Number'), required=False)
-    address = forms.CharField(label=_('Address'), required=False)
-    city = forms.CharField(label=_('City'), required=False)
-    zip_code = forms.IntegerField(label=_('Zip Code'), required=False)
-    mobile_number = forms.CharField(label=_('Mobile Number'), required=False)
+    # gender = forms.ChoiceField(choices=(('male', _('male')), ('female', _('female'))))
+    # pass_number = forms.IntegerField(label=_('Pass Number'), required=False)
+    # address = forms.CharField(label=_('Address'), required=False)
+    # city = forms.CharField(label=_('City'), required=False)
+    # zip_code = forms.IntegerField(label=_('Zip Code'), required=False)
+    # mobile_number = forms.CharField(label=_('Mobile Number'), required=False)
 
     def clean_username(self):
         data = self.cleaned_data['username']
@@ -39,22 +39,22 @@ def clean_email(self):
         raise forms.ValidationError(
             _('A user with this email is already registered.'))
 
-    def clean(self):
-        cleaned_data = super(SignUpForm, self).clean()
-        pass_number = cleaned_data['pass_number']
-        profile = cleaned_data['profile'] or {'id': None}
+    # def clean(self):
+    #     cleaned_data = super(SignUpForm, self).clean()
+    #     pass_number = cleaned_data['pass_number']
+    #     profile_id = cleaned_data['profile'].id if cleaned_data['profile'] else None
 
-        # check if pass number is unique
-        try:
-            Person.objects.exclude(id=profile.id).get(pass_number=pass_number)
-        except Person.DoesNotExist:
-            return cleaned_data
+    #     # check if pass number is unique
+    #     try:
+    #         Person.objects.exclude(id=profile_id).get(pass_number=pass_number)
+    #     except Person.DoesNotExist:
+    #         return cleaned_data
 
-        msg = _('A user with this pass number does already exist!')
-        self._errors['pass_number'] = self.error_class([msg])
-        del cleaned_data['pass_number']
+    #     msg = _('A user with this pass number does already exist!')
+    #     self._errors['pass_number'] = self.error_class([msg])
+    #     del cleaned_data['pass_number']
 
-        return cleaned_data
+    #     return cleaned_data
 
     # def clean(self):
     #     cleaned_data = super(SignUpForm, self).clean()

Diff for: models.py

@@ -8,7 +8,7 @@
 
 
 class Person(models.Model):
-    user = models.OneToOneField(User, blank=True)
+    user = models.OneToOneField(User, blank=True, null=True)
     clubs = models.ManyToManyField('Club', related_name='members', blank=False)
 
     # Fields used for user activation after signup
@@ -49,7 +49,7 @@ def __unicode__(self):
 class Club(models.Model):
     name = models.CharField(max_length=50)
 
-    union = models.ForeignKey('Union', related_name='clubs')
+    district = models.ForeignKey('District', related_name='clubs')
     managers = models.ManyToManyField('Person', blank=True, related_name='clubs_managed')
 
     def __unicode__(self):

Diff for: urls.py

@@ -11,6 +11,7 @@
 v1_api.register(PersonResource())
 v1_api.register(GameResource())
 v1_api.register(LeagueResource())
+v1_api.register(DistrictResource())
 
 urlpatterns = patterns('handball.views',
     (r'^$', 'index'),