Grants form: add Nationality and Departure City questions (#4195)

Author: estyxx

backend/api/grants/mutations.py

@@ -44,7 +44,9 @@ class _GrantErrors:
         need_accommodation: list[str] = strawberry.field(default_factory=list)
         why: list[str] = strawberry.field(default_factory=list)
         notes: list[str] = strawberry.field(default_factory=list)
-        travelling_from: list[str] = strawberry.field(default_factory=list)
+        departure_country: list[str] = strawberry.field(default_factory=list)
+        nationality: list[str] = strawberry.field(default_factory=list)
+        departure_city: list[str] = strawberry.field(default_factory=list)
         non_field_errors: list[str] = strawberry.field(default_factory=list)
         participant_bio: list[str] = strawberry.field(default_factory=list)
         participant_website: list[str] = strawberry.field(default_factory=list)
@@ -68,17 +70,16 @@ def validate(self, conference: Conference, user: User) -> GrantErrors:
             errors.add_error("non_field_errors", "The grants form is not open!")
 
         max_length_fields = {
-            "name": 300,
             "full_name": 300,
-            "travelling_from": 200,
-            "twitter_handle": 15,
-            "github_handle": 39,
+            "name": 300,
+            "departure_country": 100,
+            "nationality": 100,
+            "departure_city": 100,
         }
         for field, max_length in max_length_fields.items():
             value = getattr(self, field, "")
 
-            if len(value) > max_length:
-                print(field)
+            if value and len(value) > max_length:
                 errors.add_error(
                     field,
                     f"{field}: Cannot be more than {max_length} chars",
@@ -118,7 +119,9 @@ class SendGrantInput(BaseGrantInput):
     need_accommodation: bool
     why: str
     notes: str
-    travelling_from: str
+    departure_country: str | None = None
+    nationality: str
+    departure_city: str | None = None
 
     participant_bio: str
     participant_website: str
@@ -155,7 +158,9 @@ class UpdateGrantInput(BaseGrantInput):
     need_accommodation: bool
     why: str
     notes: str
-    travelling_from: str
+    departure_country: str | None = None
+    nationality: str
+    departure_city: str | None = None
 
     participant_bio: str
     participant_website: str
@@ -233,7 +238,9 @@ def send_grant(self, info: Info, input: SendGrantInput) -> SendGrantResult:
                     "need_accommodation": input.need_accommodation,
                     "why": input.why,
                     "notes": input.notes,
-                    "travelling_from": input.travelling_from,
+                    "departure_country": input.departure_country,
+                    "nationality": input.nationality,
+                    "departure_city": input.departure_city,
                 }
             )
 

backend/api/grants/tests/test_send_grant.py

@@ -38,7 +38,9 @@ def _send_grant(client, conference, conference_code=None, **kwargs):
                         validationNeedAccommodation: needAccommodation
                         validationWhy: why
                         validationNotes: notes
-                        validationTravellingFrom: travellingFrom
+                        validationDepartureCountry: departureCountry
+                        validationNationality: nationality
+                        validationDepartureCity: departureCity
                         validationParticipantBio: participantBio
                         validationParticipantWebsite: participantWebsite
                         validationParticipantTwitterHandle: participantTwitterHandle
@@ -69,7 +71,9 @@ def _send_grant(client, conference, conference_code=None, **kwargs):
         "needAccommodation": grant.need_accommodation,
         "why": grant.why,
         "notes": grant.notes,
-        "travellingFrom": grant.travelling_from,
+        "departureCountry": grant.departure_country,
+        "nationality": grant.nationality,
+        "departureCity": grant.departure_city,
         "participantBio": "my bio",
         "participantWebsite": "http://website.it",
         "participantTwitterHandle": "handle",
@@ -214,15 +218,23 @@ def test_cannot_send_grant_outside_allowed_values(
         graphql_client,
         conference,
         name="Marcotte" * 50,
-        travellingFrom="Very long location" * 50,
+        departureCountry="Very long location" * 50,
+        nationality="Freedonia" * 50,
+        departureCity="Emerald City " * 50,
     )
 
     assert response["data"]["sendGrant"]["__typename"] == "GrantErrors"
     assert response["data"]["sendGrant"]["errors"]["validationName"] == [
         "name: Cannot be more than 300 chars"
     ]
-    assert response["data"]["sendGrant"]["errors"]["validationTravellingFrom"] == [
-        "travelling_from: Cannot be more than 200 chars"
+    assert response["data"]["sendGrant"]["errors"]["validationDepartureCountry"] == [
+        "departure_country: Cannot be more than 100 chars"
+    ]
+    assert response["data"]["sendGrant"]["errors"]["validationNationality"] == [
+        "nationality: Cannot be more than 100 chars"
+    ]
+    assert response["data"]["sendGrant"]["errors"]["validationDepartureCity"] == [
+        "departure_city: Cannot be more than 100 chars"
     ]
 
 

backend/api/grants/tests/test_update_grant.py

@@ -34,7 +34,9 @@ def _update_grant(graphql_client, grant, **kwargs):
                     validationNeedAccommodation: needAccommodation
                     validationWhy: why
                     validationNotes: notes
-                    validationTravellingFrom: travellingFrom
+                    validationDepartureCountry: departureCountry
+                    validationNationality: nationality
+                    validationDepartureCity: departureCity
                     validationParticipantBio: participantBio
                     validationParticipantWebsite: participantWebsite
                     validationParticipantTwitterHandle: participantTwitterHandle
@@ -65,7 +67,9 @@ def _update_grant(graphql_client, grant, **kwargs):
         "needAccommodation": grant.need_accommodation,
         "why": grant.why,
         "notes": grant.notes,
-        "travellingFrom": grant.travelling_from,
+        "departureCountry": grant.departure_country,
+        "nationality": grant.nationality,
+        "departureCity": grant.departure_city,
         "participantBio": "bio",
         "participantWebsite": "http://website.it",
         "participantTwitterHandle": "handle",
@@ -109,7 +113,9 @@ def test_update_grant(graphql_client, user):
         needAccommodation=True,
         why="why not",
         notes="🧸",
-        travellingFrom="GB",
+        departureCountry="GB",
+        nationality="Italian",
+        departureCity="Rome",
         participantFacebookUrl="http://facebook.com/pythonpizza",
         participantLinkedinUrl="http://linkedin.com/company/pythonpizza",
     )
@@ -205,13 +211,21 @@ def test_cannot_update_submission_with_lang_outside_allowed_values(
         graphql_client,
         grant=grant,
         name="Marcotte" * 50,
-        travellingFrom="Very long location" * 50,
+        departureCountry="Very long location" * 50,
+        nationality="Freedonia" * 50,
+        departureCity="Emerald City " * 50,
     )
 
     assert response["data"]["updateGrant"]["__typename"] == "GrantErrors"
     assert response["data"]["updateGrant"]["errors"]["validationName"] == [
         "name: Cannot be more than 300 chars"
     ]
-    assert response["data"]["updateGrant"]["errors"]["validationTravellingFrom"] == [
-        "travelling_from: Cannot be more than 200 chars"
+    assert response["data"]["updateGrant"]["errors"]["validationDepartureCountry"] == [
+        "departure_country: Cannot be more than 100 chars"
+    ]
+    assert response["data"]["updateGrant"]["errors"]["validationNationality"] == [
+        "nationality: Cannot be more than 100 chars"
+    ]
+    assert response["data"]["updateGrant"]["errors"]["validationDepartureCity"] == [
+        "departure_city: Cannot be more than 100 chars"
     ]

backend/api/grants/types.py

@@ -31,7 +31,9 @@ class Grant:
     need_accommodation: bool
     why: str
     notes: str
-    travelling_from: Optional[str]
+    departure_country: Optional[str]
+    nationality: Optional[str]
+    departure_city: Optional[str]
     applicant_reply_deadline: Optional[datetime]
 
     @classmethod
@@ -53,6 +55,8 @@ def from_model(cls, grant: GrantModel) -> Grant:
             need_accommodation=grant.need_accommodation,
             why=grant.why,
             notes=grant.notes,
-            travelling_from=grant.travelling_from,
+            departure_country=grant.departure_country,
+            nationality=grant.nationality,
+            departure_city=grant.departure_city,
             applicant_reply_deadline=grant.applicant_reply_deadline,
         )

backend/grants/admin.py

@@ -42,7 +42,7 @@
     "needs_funds_for_travel",
     "why",
     "notes",
-    "travelling_from",
+    "departure_country",
     "conference__code",
     "created",
 )
@@ -375,7 +375,9 @@ class Meta:
             "needs_funds_for_travel",
             "why",
             "notes",
-            "travelling_from",
+            "nationality",
+            "departure_country",
+            "departure_city",
             "country_type",
             "applicant_reply_sent_at",
             "applicant_reply_deadline",
@@ -450,13 +452,13 @@ class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
         "need_accommodation",
         IsProposedSpeakerFilter,
         IsConfirmedSpeakerFilter,
-        ("travelling_from", CountryFilter),
+        ("departure_country", CountryFilter),
         "user__gender",
     )
     search_fields = (
         "email",
         "full_name",
-        "travelling_from",
+        "departure_country",
         "been_to_other_events",
         "why",
         "notes",
@@ -514,7 +516,9 @@ class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
                     "needs_funds_for_travel",
                     "need_visa",
                     "need_accommodation",
-                    "travelling_from",
+                    "nationality",
+                    "departure_country",
+                    "departure_city",
                     "why",
                     "python_usage",
                     "been_to_other_events",
@@ -540,8 +544,8 @@ def user_display_name(self, obj):
         description="C",
     )
     def country(self, obj):
-        if obj.travelling_from:
-            country = countries.get(code=obj.travelling_from)
+        if obj.departure_country:
+            country = countries.get(code=obj.departure_country)
             if country:
                 return country.emoji