Decompose some membership functions, now we have a good linting :)

apps/member/models.py

@@ -341,6 +341,9 @@ class Membership(models.Model):
             return self.date_start.toordinal() <= datetime.datetime.now().toordinal()
 
     def renew(self):
+        """
+        If the current membership comes to expiration, create a new membership that starts immediately after this one.
+        """
         if not Membership.objects.filter(
                 user=self.user,
                 club=self.club,
@@ -362,35 +365,10 @@ class Membership(models.Model):
             new_membership.roles.set(self.roles.all())
             new_membership.save()
 
-    def save(self, *args, **kwargs):
+    def renew_parent(self):
         """
-        Calculate fee and end date before saving the membership and creating the transaction if needed.
+        Ensure that the parent membership is renewed, and renew/create it if needed.
         """
-        created = not self.pk
-        if not created:
-            for role in self.roles.all():
-                club = role.for_club
-                if club is not None:
-                    if club.pk != self.club_id:
-                        raise ValidationError(_('The role {role} does not apply to the club {club}.')
-                                              .format(role=role.name, club=club.name))
-        else:
-            if Membership.objects.filter(
-                    user=self.user,
-                    club=self.club,
-                    date_start__lte=self.date_start,
-                    date_end__gte=self.date_start,
-            ).exists():
-                raise ValidationError(_('User is already a member of the club'))
-
-            if self.club.parent_club is not None:
-                # Check that the user is already a member of the parent club if the membership is created
-                if not Membership.objects.filter(
-                    user=self.user,
-                    club=self.club.parent_club,
-                    date_start__gte=self.club.parent_club.membership_start,
-                ).exists():
-                    if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
         parent_membership = Membership.objects.filter(
             user=self.user,
             club=self.club.parent_club,
@@ -428,6 +406,37 @@ class Membership(models.Model):
             else:
                 parent_membership.roles.set(Role.objects.filter(name="Membre de club").all())
             parent_membership.save()
+
+    def save(self, *args, **kwargs):
+        """
+        Calculate fee and end date before saving the membership and creating the transaction if needed.
+        """
+        created = not self.pk
+        if not created:
+            for role in self.roles.all():
+                club = role.for_club
+                if club is not None:
+                    if club.pk != self.club_id:
+                        raise ValidationError(_('The role {role} does not apply to the club {club}.')
+                                              .format(role=role.name, club=club.name))
+        else:
+            if Membership.objects.filter(
+                    user=self.user,
+                    club=self.club,
+                    date_start__lte=self.date_start,
+                    date_end__gte=self.date_start,
+            ).exists():
+                raise ValidationError(_('User is already a member of the club'))
+
+            if self.club.parent_club is not None:
+                # Check that the user is already a member of the parent club if the membership is created
+                if not Membership.objects.filter(
+                    user=self.user,
+                    club=self.club.parent_club,
+                    date_start__gte=self.club.parent_club.membership_start,
+                ).exists():
+                    if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
+                        self.renew_parent()
                     else:
                         raise ValidationError(_('User is not a member of the parent club')
                                               + ' ' + self.club.parent_club.name)

apps/member/views.py

@@ -584,6 +584,64 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
 
         return context
 
+    def perform_verifications(self, form, user, club, fee):
+        """
+        Make some additional verifications to check that the membership can be created.
+        :return: True if the form is clean, False if there is an error.
+        """
+        error = False
+
+        # Retrieve form data
+        credit_type = form.cleaned_data["credit_type"]
+        credit_amount = form.cleaned_data["credit_amount"]
+        last_name = form.cleaned_data["last_name"]
+        first_name = form.cleaned_data["first_name"]
+        bank = form.cleaned_data["bank"]
+        soge = form.cleaned_data["soge"] and not user.profile.soge and (club.name == "BDE" or club.name == "Kfet")
+
+        if not soge and user.note.balance + credit_amount < fee and not Membership.objects.filter(
+                club__name="Kfet",
+                user=user,
+                date_start__lte=date.today(),
+                date_end__gte=date.today(),
+        ).exists():
+            # Users without a valid Kfet membership can't have a negative balance.
+            # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note
+            form.add_error('user',
+                           _("This user don't have enough money to join this club, and can't have a negative balance."))
+            error = True
+
+        if Membership.objects.filter(
+                user=form.instance.user,
+                club=club,
+                date_start__lte=form.instance.date_start,
+                date_end__gte=form.instance.date_start,
+        ).exists():
+            form.add_error('user', _('User is already a member of the club'))
+            error = True
+
+        if club.membership_start and form.instance.date_start < club.membership_start:
+            form.add_error('user', _("The membership must start after {:%m-%d-%Y}.")
+                           .format(form.instance.club.membership_start))
+            error = True
+
+        if club.membership_end and form.instance.date_start > club.membership_end:
+            form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.")
+                           .format(form.instance.club.membership_end))
+            error = True
+
+        if credit_amount:
+            if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
+                if not last_name:
+                    form.add_error('last_name', _("This field is required."))
+                if not first_name:
+                    form.add_error('first_name', _("This field is required."))
+                if not bank and credit_type.special_type == "Chèque":
+                    form.add_error('bank', _("This field is required."))
+                return self.form_invalid(form)
+
+        return not error
+
     def form_valid(self, form):
         """
         Create membership, check that all is good, make transactions
@@ -630,36 +688,9 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
                 fee += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid
             c = c.parent_club
 
-        if not soge and user.note.balance + credit_amount < fee and not Membership.objects.filter(
+        # Make some verifications about the form, and if there is an error, then assume that the form is invalid
-                club__name="Kfet",
+        if not self.perform_verifications(form, user, club, fee):
-                user=user,
+            return self.form_invalid(form)
-                date_start__lte=date.today(),
-                date_end__gte=date.today(),
-        ).exists():
-            # Users without a valid Kfet membership can't have a negative balance.
-            # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note
-            form.add_error('user',
-                           _("This user don't have enough money to join this club, and can't have a negative balance."))
-            return super().form_invalid(form)
-
-        if Membership.objects.filter(
-                user=form.instance.user,
-                club=club,
-                date_start__lte=form.instance.date_start,
-                date_end__gte=form.instance.date_start,
-        ).exists():
-            form.add_error('user', _('User is already a member of the club'))
-            return super().form_invalid(form)
-
-        if club.membership_start and form.instance.date_start < club.membership_start:
-            form.add_error('user', _("The membership must start after {:%m-%d-%Y}.")
-                           .format(form.instance.club.membership_start))
-            return super().form_invalid(form)
-
-        if club.membership_end and form.instance.date_start > club.membership_end:
-            form.add_error('user', _("The membership must begin before {:%m-%d-%Y}.")
-                           .format(form.instance.club.membership_end))
-            return super().form_invalid(form)
 
         # Now, all is fine, the membership can be created.
 
@@ -671,15 +702,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, ProtectedCreateView):
 
         # Credit note before the membership is created.
         if credit_amount > 0:
-            if not last_name or not first_name or (not bank and credit_type.special_type == "Chèque"):
-                if not last_name:
-                    form.add_error('last_name', _("This field is required."))
-                if not first_name:
-                    form.add_error('first_name', _("This field is required."))
-                if not bank and credit_type.special_type == "Chèque":
-                    form.add_error('bank', _("This field is required."))
-                return self.form_invalid(form)
-
             transaction = SpecialTransaction(
                 source=credit_type,
                 destination=user.note,