ideas/fields//models: introduce CustomIntegerField that raises valida…

…tion error for decimals with only zeros and use that in models

apps/ideas/fields.py

@@ -0,0 +1,22 @@
+import re
+
+from django.db import models
+from django.forms import fields
+
+
+class CustomIntegerField(models.IntegerField):
+
+    def formfield(self, **kwargs):
+        return super().formfield(**{
+            'form_class': CustomIntegerFormField,
+            **kwargs,
+        })
+
+
+class CustomIntegerFormField(fields.IntegerField):
+    """
+    re_decimal is a regex that is sliced from the entered values, the original
+    regex (zeros after a decimal point) is overwritten here, in order to raise
+    a validation error for decimal values with only zeros after decimal
+    """
+    re_decimal = re.compile(r'')

apps/ideas/models/sections/applicant_section.py

@@ -4,6 +4,7 @@
 from django_countries.fields import CountryField
 from multiselectfield import MultiSelectField
 
+from apps.ideas import fields as custom_fields
 from apps.ideas.countries import EuropeanCountries
 
 NON_PROFIT = 'NP'
@@ -131,7 +132,7 @@ class ApplicantSection(models.Model):
         blank=True,
         verbose_name=_('Lead organization email')
     )
-    year_of_registration = models.IntegerField(
+    year_of_registration = custom_fields.CustomIntegerField(
         blank=True,
         null=True,
         validators=[

apps/ideas/models/sections/finances_section.py

@@ -2,6 +2,8 @@
 from django.db import models
 from django.utils.translation import ugettext as _
 
+from apps.ideas import fields as custom_fields
+
 TOTAL_BUDGET_HELP = _('Please indicate your overall budget. '
                       'The total budget may (but does not '
                       'have to) include the applicant’s own '
@@ -29,14 +31,14 @@
 
 
 class FinancesSection(models.Model):
-    total_budget = models.IntegerField(
+    total_budget = custom_fields.CustomIntegerField(
         verbose_name=_('Total budget'),
         help_text=TOTAL_BUDGET_HELP,
         validators=[
             MinValueValidator(0)
         ]
     )
-    budget_requested = models.IntegerField(
+    budget_requested = custom_fields.CustomIntegerField(
         verbose_name=_('Funding requested from Civic Europe'),
         help_text=BUDGET_REQUESTED_HELP,
         validators=[
@@ -49,7 +51,7 @@ class FinancesSection(models.Model):
         verbose_name=_('Major expenses'),
         help_text=MAJOR_EXPENSES_HELP
     )
-    duration = models.IntegerField(
+    duration = custom_fields.CustomIntegerField(
         verbose_name=_('Duration of idea (number of months)'),
         help_text=DURATION_HELP
     )