Swap Iraqi and Fly Dubai templates and fix date formats as requested

src/formats.py

@@ -69,43 +69,8 @@ def _to_ddmmmyy(date_str):
 
 def format_fly_dubai(data_list):
     """
-    Formats data for Fly Dubai template.
-    Columns: TYPE, TITLE, FIRST NAME, LAST NAME, DOB (DDMMMYY), GENDER
-    Example: Adult MR FirstNameOne LastNameOne 13NOV84 Male
-    """
-    formatted_rows = []
-    
-    for item in data_list:
-        sex = item.get('sex', '').upper()
-        gender_full = "Male" if sex == 'M' else "Female"
-        title = "MR" if sex == 'M' else "MRS"
-        
-        # Get and format dates
-        raw_dob = item.get('date_of_birth', '')
-        ddmmyyyy_dob = _format_mrz_date(raw_dob)
-        
-        # Calculate passenger type based on age
-        passenger_type, _ = calculate_passenger_type(ddmmyyyy_dob)
-        
-        # Dubai uses DDMMMYY format
-        dob_dubai = _to_ddmmmyy(ddmmyyyy_dob)
-        
-        row = {
-            "TYPE": passenger_type,
-            "TITLE": title,
-            "FIRST NAME": item.get('name', ''),
-            "LAST NAME": item.get('surname', ''),
-            "DOB (DDMMMYY)": dob_dubai,
-            "GENDER": gender_full
-        }
-        formatted_rows.append(row)
-        
-    return pd.DataFrame(formatted_rows)
-
-def format_iraqi(data_list):
-    """
-    Formats data for Iraqi template.
-    - Dates: DD/MM/YYYY (e.g., 20/03/2018)
+    Formats data for Fly Dubai template (Full details).
+    - Dates: DDMMMYY (e.g., 18NOV16)
     """
     formatted_rows = []
     
@@ -115,14 +80,14 @@ def format_iraqi(data_list):
         
         first_middle = item.get('name', '')
         
-        # Get and format dates to DD/MM/YYYY
+        # Get and format dates to DDMMMYY
         raw_dob = item.get('date_of_birth', '')
         raw_expiry = item.get('expiration_date', '')
         
-        ddmmyyyy_dob = _format_mrz_date(raw_dob)
-        ddmmyyyy_expiry = _format_mrz_date(raw_expiry)
+        dob_dubai = _to_ddmmmyy(_format_mrz_date(raw_dob))
+        expiry_dubai = _to_ddmmmyy(_format_mrz_date(raw_expiry))
             
-        _, ptc_code = calculate_passenger_type(ddmmyyyy_dob)
+        _, ptc_code = calculate_passenger_type(_format_mrz_date(raw_dob))
         
         row = {
             "Last Name": item.get('surname', ''),
@@ -130,14 +95,14 @@ def format_iraqi(data_list):
             "Title": title,
             "PTC": ptc_code,
             "Gender": sex,
-            "Date of Birth": ddmmyyyy_dob,
+            "Date of Birth": dob_dubai,
             "Passport Last Name": item.get('surname', ''),
             "Passport First Name": first_middle,
             "Passport Middle Name": "",
             "Passport Number": item.get('passport_number', ''),
             "Passport Nationality": item.get('nationality', '')[:3].upper(),
             "Passport Issue Country": item.get('country', '')[:3].upper(),
-            "Passport Expiry Date": ddmmyyyy_expiry,
+            "Passport Expiry Date": expiry_dubai,
             "Visa Number": "", "Visa Type": "", "Visa Issue Date": "", "Place of Birth": "",
             "Visa Place of Issue": "", "Visa Country of Application": "", "Address Type": "",
             "Address Country": "", "Address Details": "", "Address City": "",
@@ -147,6 +112,38 @@ def format_iraqi(data_list):
         
     return pd.DataFrame(formatted_rows)
 
+def format_iraqi(data_list):
+    """
+    Formats data for Iraqi template.
+    Columns: TYPE, TITLE, FIRST NAME, LAST NAME, DOB (DD/MM/YYYY), GENDER
+    Example: Adult MR FirstNameOne LastNameOne 20/03/2018 Male
+    """
+    formatted_rows = []
+    
+    for item in data_list:
+        sex = item.get('sex', '').upper()
+        gender_full = "Male" if sex == 'M' else "Female"
+        title = "MR" if sex == 'M' else "MRS"
+        
+        # Get and format dates
+        raw_dob = item.get('date_of_birth', '')
+        ddmmyyyy_dob = _format_mrz_date(raw_dob)
+        
+        # Calculate passenger type based on age
+        passenger_type, _ = calculate_passenger_type(ddmmyyyy_dob)
+        
+        row = {
+            "TYPE": passenger_type,
+            "TITLE": title,
+            "FIRST NAME": item.get('name', ''),
+            "LAST NAME": item.get('surname', ''),
+            "DOB (DD/MM/YYYY)": ddmmyyyy_dob,
+            "GENDER": gender_full
+        }
+        formatted_rows.append(row)
+        
+    return pd.DataFrame(formatted_rows)
+
 def format_fly_baghdad(data_list):
     """
     Formats data for Fly Baghdad template.