From 9ebe746097f86d6a26a55d3e5acdc026f842b426 Mon Sep 17 00:00:00 2001
From: Nuwan Samarasinghe <nuwansamarasinghe100@gmail.com>
Date: Tue, 10 Dec 2024 15:44:34 +0000
Subject: [PATCH] FS-4865: validating empty spaces between short names of the
 fund and round and also updating intelij idea setting

---
 .idea/runConfigurations/FAB.xml            |  6 +++---
 app/blueprints/fund_builder/forms/fund.py  |  3 ++-
 app/blueprints/fund_builder/forms/round.py |  4 +++-
 app/shared/helpers.py                      | 13 ++++++++++++-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/.idea/runConfigurations/FAB.xml b/.idea/runConfigurations/FAB.xml
index fe625bc5..d9a69d0a 100644
--- a/.idea/runConfigurations/FAB.xml
+++ b/.idea/runConfigurations/FAB.xml
@@ -5,11 +5,11 @@
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
-      <env name="DATABASE_URL" value="postgresql://postgres:password@localhost:5432/fsd_application_builder" />
+      <env name="DATABASE_URL" value="postgresql://postgres:password@localhost:5432/fab_store" />
       <env name="FLASK_DEBUG" value="0" />
       <env name="FLASK_ENV" value="development" />
-      <env name="FORM_RUNNER_EXTERNAL_HOST" value="http://localhost:3019" />
-      <env name="FORM_RUNNER_INTERNAL_HOST" value="=http://localhost:3009" />
+      <env name="FORM_RUNNER_EXTERNAL_HOST" value="http://localhost:3009" />
+      <env name="FORM_RUNNER_INTERNAL_HOST" value="http://localhost:3009" />
       <env name="PYTHONUNBUFFERED" value="1" />
       <env name="SECRET_KEY" value="local" />
     </envs>
diff --git a/app/blueprints/fund_builder/forms/fund.py b/app/blueprints/fund_builder/forms/fund.py
index 19cf1d32..5b553964 100644
--- a/app/blueprints/fund_builder/forms/fund.py
+++ b/app/blueprints/fund_builder/forms/fund.py
@@ -9,6 +9,7 @@
 from wtforms.validators import Length
 
 from app.db.models.fund import FundingType
+from app.shared.helpers import no_spaces_between_letters
 
 
 class GovUkRadioEnumField(RadioField):
@@ -36,7 +37,7 @@ class FundForm(FlaskForm):
     name_cy = StringField("Name (Welsh)", description="Leave blank for English-only funds")
     title_en = StringField("Title (English)", validators=[DataRequired()])
     title_cy = StringField("Title (Welsh)", description="Leave blank for English-only funds")
-    short_name = StringField("Short Name", validators=[DataRequired(), Length(max=10)])
+    short_name = StringField("Short Name", validators=[DataRequired(), Length(max=10), no_spaces_between_letters])
     description_en = TextAreaField("Description", validators=[DataRequired()])
     description_cy = TextAreaField("Description (Welsh)", description="Leave blank for English-only funds")
     welsh_available = RadioField("Welsh Available", choices=[("true", "Yes"), ("false", "No")], default="false")
diff --git a/app/blueprints/fund_builder/forms/round.py b/app/blueprints/fund_builder/forms/round.py
index 34becda9..4ee44f41 100644
--- a/app/blueprints/fund_builder/forms/round.py
+++ b/app/blueprints/fund_builder/forms/round.py
@@ -14,6 +14,8 @@
 from wtforms.validators import Length
 from wtforms.validators import ValidationError
 
+from app.shared.helpers import no_spaces_between_letters
+
 
 def validate_json_field(form, field):
     str_content = field.data
@@ -126,7 +128,7 @@ class RoundForm(FlaskForm):
     short_name = StringField(
         "Short Name",
         description="Choose a unique short name with 6 or fewer characters",
-        validators=[DataRequired(), Length(max=6)],
+        validators=[DataRequired(), Length(max=6), no_spaces_between_letters],
     )
     opens = FormField(DateInputForm, label="Opens")
     deadline = FormField(DateInputForm, label="Deadline")
diff --git a/app/shared/helpers.py b/app/shared/helpers.py
index 07f3ad45..1c638f4b 100644
--- a/app/shared/helpers.py
+++ b/app/shared/helpers.py
@@ -1,5 +1,7 @@
+import re
 from dataclasses import asdict
 from dataclasses import is_dataclass
+from wtforms.validators import ValidationError
 
 from app.db.models import Page
 
@@ -51,4 +53,13 @@ def error_formatter(errors):
                     errorsList.append({'text': "Enter valid datetime", 'href': f'#{field}'})
         if errorsList:
             error = {'titleText': "There is a problem", 'errorList': errorsList}
-    return error
\ No newline at end of file
+    return error
+
+
+# Custom validator to check for spaces between letters
+def no_spaces_between_letters(form, field):
+    # Regular expression to check for spaces between letters
+    if not field.data:
+        return
+    if re.search(r'\b\w+\s+\w+\b', field.data):  # Matches sequences with spaces in between
+        raise ValidationError("Spaces between letters are not allowed.")
\ No newline at end of file