better ngo validation (#375)

* better ngo validation

* Save the NGO locality

* fix requirements

* Split the NGO description into paragraphs

* texts

---------

Co-authored-by: Daniel Ursache Dogariu <contact@danniel.net>

Author: tudoramariei

backend/donations/forms/ngo_account.py

@@ -5,13 +5,18 @@
 from localflavor.ro.forms import ROCIFField
 
 from donations.common.validation.phone_number import validate_phone_number
+from donations.models.ngos import Ngo
 
 
 class NgoPresentationForm(forms.Form):
     is_accepting_forms = forms.BooleanField(label=_("Is accepting forms"), required=False)
 
     name = forms.CharField(label=_("Name"), max_length=255, required=True)
-    cif = ROCIFField(label=_("CUI/CIF"), required=True)
+    if settings.ENABLE_FULL_CUI_VALIDATION:
+        cif = ROCIFField(label=_("CUI/CIF"), required=True)
+    else:
+        cif = forms.CharField(label=_("CUI/CIF"), max_length=10, min_length=2, required=True)
+
     logo = forms.ImageField(label=_("Logo"), required=False)
     website = forms.URLField(label=_("Website"), required=False)
 
@@ -22,12 +27,13 @@ class NgoPresentationForm(forms.Form):
     display_phone = forms.BooleanField(label=_("Display phone"), required=False)
 
     address = forms.CharField(label=_("Address"), max_length=255, required=True)
-    locality = forms.CharField(label=_("Locality"), max_length=255, required=False)
+    locality = forms.CharField(label=_("Locality"), max_length=100, required=False)
     county = forms.ChoiceField(label=_("County"), choices=settings.FORM_COUNTIES_CHOICES, required=True)
     active_region = forms.ChoiceField(label=_("Active region"), choices=settings.FORM_COUNTIES_CHOICES, required=True)
 
     def __init__(self, *args, **kwargs):
         is_fully_editable = kwargs.pop("is_fully_editable", True)
+        self.ngo = kwargs.pop("ngo")
 
         super().__init__(*args, **kwargs)
 
@@ -47,6 +53,14 @@ def __init__(self, *args, **kwargs):
             for field_name in ngohub_fields:
                 self.fields[field_name].required = False
 
+    def clean_cif(self):
+        cif = self.cleaned_data.get("cif")
+
+        if Ngo.objects.filter(registration_number=cif).exclude(pk=self.ngo.pk).exists():
+            raise forms.ValidationError(_("An NGO with this CUI/CIF already exists."))
+
+        return cif
+
     def clean_logo(self):
         logo = self.cleaned_data.get("logo")
         if not logo:

backend/donations/views/ngo_account.py

@@ -164,7 +164,7 @@ def post(self, request, *args, **kwargs):
 
         is_fully_editable = ngo.ngohub_org_id is None
 
-        form = NgoPresentationForm(post, files=request.FILES, is_fully_editable=is_fully_editable)
+        form = NgoPresentationForm(post, files=request.FILES, is_fully_editable=is_fully_editable, ngo=ngo)
         if not form.is_valid():
             messages.error(request, _("There are some errors on the presentation form."))
             context.update({"ngo_presentation": form})
@@ -193,6 +193,7 @@ def post(self, request, *args, **kwargs):
             ngo.website = form.cleaned_data["website"]
             ngo.address = form.cleaned_data["address"]
             ngo.county = form.cleaned_data["county"]
+            ngo.locality = form.cleaned_data["locality"]
             ngo.active_region = form.cleaned_data["active_region"]
 
         ngo.is_accepting_forms = form.cleaned_data["is_accepting_forms"]

backend/locale/ro/LC_MESSAGES/django.po

@@ -2351,15 +2351,15 @@ msgstr "Email de contact al organizației"
 
 #: templates/v2/ngo-account/my-organization/ngo-presentation.html:101
 msgid "Display e-mail in the profile"
-msgstr "Afișează email-ul în profil"
+msgstr "Afișează email-ul pe pagina publică"
 
 #: templates/v2/ngo-account/my-organization/ngo-presentation.html:110
 msgid "Organization contact phone"
 msgstr "Telefon de contact al organizației"
 
 #: templates/v2/ngo-account/my-organization/ngo-presentation.html:115
 msgid "Display phone in the profile"
-msgstr "Afișează telefonul în profil"
+msgstr "Afișează telefonul pe pagina publică"
 
 #: templates/v2/ngo-account/my-organization/ngo-presentation.html:124
 msgid "Organization address"

backend/redirectioneaza/settings/app_configs.py

@@ -121,7 +121,8 @@
 except IndexError:
     pass
 
-FORM_COUNTIES_CHOICES = [(county, county) for county in FORM_COUNTIES]
+EXTENDED_FORM_COUNTIES = [1, 2, 3, 4, 5, 6] + FORM_COUNTIES
+FORM_COUNTIES_CHOICES = [(county, county) for county in EXTENDED_FORM_COUNTIES]
 
 FORM_COUNTIES_NATIONAL = deepcopy(FORM_COUNTIES)
 FORM_COUNTIES_NATIONAL.insert(0, "Național")