Country code fixes. Hopefully
This commit is contained in:
@@ -70,6 +70,86 @@ security_bearer = HTTPBearer()
|
||||
# Constants for token sanitization
|
||||
TOKEN_LOG_LENGTH = 10
|
||||
|
||||
# Country name to ISO 3166-1 alpha-2 code mapping
|
||||
COUNTRY_NAME_TO_CODE = {
|
||||
# English names
|
||||
"germany": "DE",
|
||||
"italy": "IT",
|
||||
"austria": "AT",
|
||||
"switzerland": "CH",
|
||||
"france": "FR",
|
||||
"netherlands": "NL",
|
||||
"belgium": "BE",
|
||||
"spain": "ES",
|
||||
"portugal": "PT",
|
||||
"united kingdom": "GB",
|
||||
"uk": "GB",
|
||||
"czech republic": "CZ",
|
||||
"poland": "PL",
|
||||
"hungary": "HU",
|
||||
"croatia": "HR",
|
||||
"slovenia": "SI",
|
||||
# German names
|
||||
"deutschland": "DE",
|
||||
"italien": "IT",
|
||||
"österreich": "AT",
|
||||
"schweiz": "CH",
|
||||
"frankreich": "FR",
|
||||
"niederlande": "NL",
|
||||
"belgien": "BE",
|
||||
"spanien": "ES",
|
||||
"vereinigtes königreich": "GB",
|
||||
"tschechien": "CZ",
|
||||
"polen": "PL",
|
||||
"ungarn": "HU",
|
||||
"kroatien": "HR",
|
||||
"slowenien": "SI",
|
||||
# Italian names
|
||||
"germania": "DE",
|
||||
"italia": "IT",
|
||||
"svizzera": "CH",
|
||||
"francia": "FR",
|
||||
"paesi bassi": "NL",
|
||||
"belgio": "BE",
|
||||
"spagna": "ES",
|
||||
"portogallo": "PT",
|
||||
"regno unito": "GB",
|
||||
"repubblica ceca": "CZ",
|
||||
"polonia": "PL",
|
||||
"ungheria": "HU",
|
||||
"croazia": "HR",
|
||||
}
|
||||
|
||||
|
||||
def normalize_country_input(country_input: str | None) -> str | None:
|
||||
"""Normalize country input to ISO 3166-1 alpha-2 code.
|
||||
|
||||
Handles:
|
||||
- Country names in English, German, and Italian
|
||||
- Already valid 2-letter codes (case-insensitive)
|
||||
- None/empty values
|
||||
|
||||
Args:
|
||||
country_input: Country name or code (case-insensitive)
|
||||
|
||||
Returns:
|
||||
2-letter ISO country code (uppercase) or None if input is None/empty
|
||||
|
||||
"""
|
||||
if not country_input:
|
||||
return None
|
||||
|
||||
country_input = country_input.strip()
|
||||
|
||||
# If already 2 letters, assume it's a country code (ISO 3166-1 alpha-2)
|
||||
iso_country_code_length = 2
|
||||
if len(country_input) == iso_country_code_length and country_input.isalpha():
|
||||
return country_input.upper()
|
||||
|
||||
# Try to match as country name (case-insensitive)
|
||||
country_lower = country_input.lower()
|
||||
return COUNTRY_NAME_TO_CODE.get(country_lower, country_input)
|
||||
|
||||
|
||||
# Pydantic models for language detection
|
||||
class LanguageDetectionRequest(BaseModel):
|
||||
@@ -738,6 +818,9 @@ async def process_generic_webhook_submission(
|
||||
city = form_data.get("stadt", "")
|
||||
country = form_data.get("land", "")
|
||||
|
||||
# Normalize country input (convert names to codes, handle case)
|
||||
country = normalize_country_input(country)
|
||||
|
||||
# Parse dates - handle DD.MM.YYYY format
|
||||
start_date_str = form_data.get("anreise")
|
||||
end_date_str = form_data.get("abreise")
|
||||
|
||||
Reference in New Issue
Block a user