Update API to handle nationality and departure city

Author: estyxx

backend/api/grants/mutations.py

@@ -45,6 +45,8 @@ class _GrantErrors:
         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)
+        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,11 +70,11 @@ 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,
+            "travelling_from": 100,
+            "nationality": 100,
+            "departure_city": 100,
         }
         for field, max_length in max_length_fields.items():
             value = getattr(self, field, "")
@@ -119,6 +121,8 @@ class SendGrantInput(BaseGrantInput):
     why: str
     notes: str
     travelling_from: str
+    nationality: str
+    departure_city: str
 
     participant_bio: str
     participant_website: str
@@ -156,6 +160,8 @@ class UpdateGrantInput(BaseGrantInput):
     why: str
     notes: str
     travelling_from: str
+    nationality: str
+    departure_city: str
 
     participant_bio: str
     participant_website: str
@@ -234,6 +240,8 @@ def send_grant(self, info: Info, input: SendGrantInput) -> SendGrantResult:
                     "why": input.why,
                     "notes": input.notes,
                     "travelling_from": input.travelling_from,
+                    "nationality": input.nationality,
+                    "departure_city": input.departure_city,
                 }
             )
 

backend/api/grants/tests/test_send_grant.py

@@ -39,6 +39,8 @@ def _send_grant(client, conference, conference_code=None, **kwargs):
                         validationWhy: why
                         validationNotes: notes
                         validationTravellingFrom: travellingFrom
+                        validationNationality: nationality
+                        validationDepartureCity: departureCity
                         validationParticipantBio: participantBio
                         validationParticipantWebsite: participantWebsite
                         validationParticipantTwitterHandle: participantTwitterHandle
@@ -70,6 +72,8 @@ def _send_grant(client, conference, conference_code=None, **kwargs):
         "why": grant.why,
         "notes": grant.notes,
         "travellingFrom": grant.travelling_from,
+        "nationality": grant.nationality,
+        "departureCity": grant.departure_city,
         "participantBio": "my bio",
         "participantWebsite": "http://website.it",
         "participantTwitterHandle": "handle",
@@ -215,14 +219,22 @@ def test_cannot_send_grant_outside_allowed_values(
         conference,
         name="Marcotte" * 50,
         travellingFrom="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"
+        "travelling_from: 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

@@ -35,6 +35,8 @@ def _update_grant(graphql_client, grant, **kwargs):
                     validationWhy: why
                     validationNotes: notes
                     validationTravellingFrom: travellingFrom
+                    validationNationality: nationality
+                    validationDepartureCity: departureCity
                     validationParticipantBio: participantBio
                     validationParticipantWebsite: participantWebsite
                     validationParticipantTwitterHandle: participantTwitterHandle
@@ -66,6 +68,8 @@ def _update_grant(graphql_client, grant, **kwargs):
         "why": grant.why,
         "notes": grant.notes,
         "travellingFrom": grant.travelling_from,
+        "nationality": grant.nationality,
+        "departureCity": grant.departure_city,
         "participantBio": "bio",
         "participantWebsite": "http://website.it",
         "participantTwitterHandle": "handle",
@@ -110,6 +114,8 @@ def test_update_grant(graphql_client, user):
         why="why not",
         notes="🧸",
         travellingFrom="GB",
+        nationality="Italian",
+        departureCity="Rome",
         participantFacebookUrl="http://facebook.com/pythonpizza",
         participantLinkedinUrl="http://linkedin.com/company/pythonpizza",
     )
@@ -206,12 +212,20 @@ def test_cannot_update_submission_with_lang_outside_allowed_values(
         grant=grant,
         name="Marcotte" * 50,
         travellingFrom="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"
+        "travelling_from: 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

@@ -32,6 +32,8 @@ class Grant:
     why: str
     notes: str
     travelling_from: Optional[str]
+    nationality: Optional[str]
+    departure_city: Optional[str]
     applicant_reply_deadline: Optional[datetime]
 
     @classmethod
@@ -54,5 +56,7 @@ def from_model(cls, grant: GrantModel) -> Grant:
             why=grant.why,
             notes=grant.notes,
             travelling_from=grant.travelling_from,
+            nationality=grant.nationality,
+            departure_city=grant.departure_city,
             applicant_reply_deadline=grant.applicant_reply_deadline,
         )

backend/grants/tests/factories.py

@@ -31,6 +31,8 @@ class Meta:
     why = factory.Faker("text")
     notes = factory.Faker("text")
     travelling_from = factory.fuzzy.FuzzyChoice([country.code for country in countries])
+    nationality = factory.Faker("country")
+    departure_city = factory.Faker("city")
     website = factory.Faker("url")
     twitter_handle = "@handle"
     github_handle = factory.Faker("user_name")