feat; add prefill

app/util/housewife_statement_letter_generator.py

@@ -1,18 +1,14 @@
-# util/housewife_statement_letter.py
-
 from fpdf import FPDF
 import datetime
 import logging
 import pandas as pd
 from .pdf_document_generator import PDFDocumentGenerator
-from .db_utils import DBManager  # Import the DBManager
+from .db_utils import DBManager # Import the DBManager
 
 class HousewifeStatementLetterGenerator(PDFDocumentGenerator):
     """
     Generates a specific PDF for a Housewife's Statement Letter
-    for a visa application.
-    
-    This class now fetches and prioritizes data from the database.
+    for a visa application, with prefill capability.
     """
     
     def __init__(self, data: dict):
@@ -21,76 +17,109 @@ class HousewifeStatementLetterGenerator(PDFDocumentGenerator):
         self.logger = logging.getLogger(__name__)
         self.logger.setLevel(logging.INFO)
 
+    def get_prefill_data(self) -> dict:
+        """
+        Fetches all data from form, smart_upload, and profile
+        and merges it for the frontend, using priority logic.
+        """
+        application_id = self.data.get("application_id")
+        if not application_id:
+            self.logger.error("application_id missing from data for prefill")
+            return {"error": "application_id missing"}
+
+        # Start with initial_data (data passed to the constructor)
+        initial_data = self.data.copy()
+
+        try:
+            db_manager = DBManager()
+            
+            # 1. Get Form Data
+            form_df = db_manager.get_form_data(application_id)
+            form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
+
+            # 2. Get Smart Upload Data
+            smart_df = db_manager.get_smart_upload_results(application_id)
+            ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
+            passport_data = self._get_smart_doc_data(smart_df, 'passport')
+            
+            # 3. Get Profile Name
+            profile_name = db_manager.get_profile_name_by_app_id(application_id)
+            
+            # 4. Start with initial_data as the base (lowest priority)
+            final_data = initial_data.copy()
+            
+            # 5. Apply Priority Logic (DB data overrides initial_data)
+            
+            # Applicant Details
+            # Priority: 1. Profile, 2. Passport, 3. KTP, 4. InitialData
+            final_data["applicant_name"] = profile_name or \
+                                           passport_data.get("name") or \
+                                           ktp_data.get("name") or \
+                                           initial_data.get("applicant_name")
+            
+            # Priority: 1. Passport, 2. KTP, 3. Form, 4. InitialData
+            final_data["applicant_dob"] = passport_data.get("date_of_birth") or \
+                                          ktp_data.get("date_of_birth") or \
+                                          form_data.get("Applicant Date of Birth") or \
+                                          initial_data.get("applicant_dob")
+
+            # Priority: 1. Passport, 2. Form, 3. InitialData
+            final_data["applicant_passport"] = passport_data.get("passport_number") or \
+                                               form_data.get("Applicant Passport Number") or \
+                                               initial_data.get("applicant_passport")
+
+            # --- Form-Specific Data (Priority: 1. Form, 2. InitialData) ---
+            
+            final_data["sponsor_name"] = form_data.get("Sponsor Full Name") or \
+                                         initial_data.get("sponsor_name")
+                                         
+            final_data["sponsor_bank_details"] = form_data.get("Sponsor Bank Account Details") or \
+                                                 initial_data.get("sponsor_bank_details")
+                                                 
+            final_data["destination_country"] = form_data.get("Destination Country") or \
+                                                initial_data.get("destination_country")
+                                                
+            final_data["visa_type"] = form_data.get("Visa Type") or \
+                                      initial_data.get("visa_type")
+                                      
+            final_data["visit_end_date"] = form_data.get("Planned Trip End Date") or \
+                                           initial_data.get("visit_end_date")
+                                           
+            final_data["travel_companions"] = form_data.get("Travel Companions") or \
+                                              initial_data.get("travel_companions")
+
+            # Location Priority: 1. KTP, 2. Form, 3. InitialData
+            final_data["letter_location"] = ktp_data.get("city") or \
+                                            form_data.get("City of Residence") or \
+                                            initial_data.get("letter_location")
+
+            final_data["letter_date"] = initial_data.get("letter_date") # Keep initial data for date if provided manually
+
+            final_data["application_id"] = application_id
+            
+            return final_data
+
+        except Exception as e:
+            self.logger.error(f"Failed to prepare data for Housewife prefill: {e}", exc_info=True)
+            return {"error": str(e)}
+
     def _prepare_data(self, application_id: int, initial_data: dict) -> dict:
         """
-        Fetches all data from form, smart_upload, and profile,
-        then combines it with the initial_data using a clear priority logic.
+        Fetches and merges data using the public get_prefill_data method.
+        This is used internally before building the document.
         """
-        db_manager = DBManager()
-        
-        # 1. Get Form Data
-        form_df = db_manager.get_form_data(application_id)
-        form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
-
-        # 2. Get Smart Upload Data
-        smart_df = db_manager.get_smart_upload_results(application_id)
-        ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
-        passport_data = self._get_smart_doc_data(smart_df, 'passport')
-        
-        # 3. Get Profile Name
-        profile_name = db_manager.get_profile_name_by_app_id(application_id)
-        
-        # 4. Start with initial_data as the base (lowest priority)
-        final_data = initial_data.copy()
+        # Call the public method to handle data fetching and merging
+        data = self.get_prefill_data()
         
-        # 5. Apply Priority Logic (DB data overrides initial_data)
+        # If prefill failed (e.g., missing application_id), return the initial_data
+        if data.get("error"):
+            self.logger.warning(f"Prefill failed, falling back to initial data for App ID {application_id}")
+            return initial_data
         
-        # Priority: 1. Profile, 2. Passport, 3. KTP, 4. InitialData
-        final_data["applicant_name"] = profile_name or \
-                                       passport_data.get("name") or \
-                                       ktp_data.get("name") or \
-                                       final_data.get("applicant_name")
-        
-        # Priority: 1. Passport, 2. KTP, 3. Form, 4. InitialData
-        # (Assuming 'date_of_birth' key from smart_upload and 'Applicant Date of Birth' from form)
-        final_data["applicant_dob"] = passport_data.get("date_of_birth") or \
-                                      ktp_data.get("date_of_birth") or \
-                                      form_data.get("Applicant Date of Birth") or \
-                                      final_data.get("applicant_dob")
-
-        # Priority: 1. Passport, 2. Form, 3. InitialData
-        # (Assuming 'passport_number' key from smart_upload and 'Applicant Passport Number' from form)
-        final_data["applicant_passport"] = passport_data.get("passport_number") or \
-                                           form_data.get("Applicant Passport Number") or \
-                                           final_data.get("applicant_passport")
-
-        # --- Form-Specific Data (Priority: 1. Form, 2. InitialData) ---
-        
-        # (Assuming form field names for the following)
-        final_data["sponsor_name"] = form_data.get("Sponsor Full Name") or \
-                                     final_data.get("sponsor_name")
-                                     
-        final_data["sponsor_bank_details"] = form_data.get("Sponsor Bank Account Details") or \
-                                             final_data.get("sponsor_bank_details")
-                                             
-        final_data["destination_country"] = form_data.get("Destination Country") or \
-                                            final_data.get("destination_country")
-                                            
-        final_data["visa_type"] = form_data.get("Visa Type") or \
-                                  final_data.get("visa_type")
-                                  
-        final_data["visit_end_date"] = form_data.get("Planned Trip End Date") or \
-                                       final_data.get("visit_end_date")
-                                       
-        final_data["travel_companions"] = form_data.get("Travel Companions") or \
-                                          final_data.get("travel_companions")
-
-        # Priority: 1. KTP, 2. Form, 3. InitialData
-        final_data["letter_location"] = ktp_data.get("city") or \
-                                        form_data.get("City of Residence") or \
-                                        final_data.get("letter_location")
-
-        return final_data
+        # Ensure 'application_id' is preserved
+        data["application_id"] = application_id 
+        return data
+
 
     def build_document(self, pdf: FPDF):
         """
@@ -127,9 +156,13 @@ class HousewifeStatementLetterGenerator(PDFDocumentGenerator):
         travel_companions = prepared_data.get("travel_companions", "[people who join the trip]")
 
         today = datetime.date.today()
-        default_date = today.strftime("%B %d, %Y")
         letter_location = prepared_data.get("letter_location", "[City]")
-        letter_date = prepared_data.get("letter_date", default_date)
+        
+        # Use prepared data for date, falling back to today's date if not set
+        letter_date = prepared_data.get("letter_date")
+        if not letter_date:
+            letter_date = today.strftime("%B %d, %Y")
+
 
         # --- 3. Build the PDF Document (Original logic) ---
         pdf.set_font('Times', 'BU', 12)
@@ -185,7 +218,7 @@ class HousewifeStatementLetterGenerator(PDFDocumentGenerator):
         )
         pdf.multi_cell(0, 5, body_p3)
         pdf.ln(10)
-        
+
         # Body Paragraph 4
         body_p4 = "Thus, I have made this statement in all honesty."
         pdf.multi_cell(0, 5, body_p4)
@@ -195,4 +228,6 @@ class HousewifeStatementLetterGenerator(PDFDocumentGenerator):
         pdf.cell(0, 5, f"{letter_location}, {letter_date}")
         pdf.ln(25)  # Space for signature
         pdf.set_font('Times', 'B', 11)
-        pdf.cell(0, 5, applicant_name)
+        pdf.cell(0, 5, applicant_name)
+        
+        return pdf

app/util/japan_multientry_visa_letter_generator.py

@@ -5,71 +5,106 @@ from .pdf_document_generator import PDFDocumentGenerator # The fpdf2-based one
 from .db_utils import DBManager 
 import pandas as pd
 import logging
+
 class JapanMultiEntryVisaLetterGenerator(PDFDocumentGenerator):
     """
     Generates the specific PDF for the Japan Multiple Entry Visa application
     using the pure-Python fpdf2 library.
     
     Follows a clean pattern:
-    1. _prepare_data() fetches and prioritizes all data from DB.
-    2. build_document() uses that data to draw the PDF.
+    1. get_prefill_data() fetches and prioritizes all data from DB for frontend prefill.
+    2. _prepare_data() does the same for PDF generation context.
+    3. build_document() uses that data to draw the PDF.
     """
     def __init__(self, data: dict):
         super().__init__(data)
         self.logger = logging.getLogger(__name__)
         self.logger.setLevel(logging.INFO)
-        self.logger.info("Init Japan: %s", data)
+        # self.logger.info("Init Japan: %s", data)
 
     def _prepare_data(self, application_id: int, initial_data: dict) -> dict:
         """
         Fetches all data from form, smart_upload, and profile,
         then combines it with the initial_data using a clear priority logic.
+        (Internal method used before building the document)
         """
-        db_manager = DBManager()
-        
-        # 1. Get Form Data
-        form_df = db_manager.get_form_data(application_id)
-        form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
-
-        # 2. Get Smart Upload Data
-        smart_df = db_manager.get_smart_upload_results(application_id)
-        ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
-        passport_data = self._get_smart_doc_data(smart_df, 'passport')
-        
-        # 3. Get Profile Name
-        profile_name = db_manager.get_profile_name_by_app_id(application_id)
+        # Call the public method to handle data fetching and merging
+        data = self.get_prefill_data()
         
-        # 4. Start with initial_data as the base (lowest priority)
-        final_data = initial_data.copy()
+        # If prefill failed to get data (e.g., missing application_id), return initial_data
+        if data.get("error"):
+            return initial_data
         
-        # 5. Apply Priority Logic (DB data overrides initial_data)
-        
-        # NAME Priority: 1. Profile, 2. Passport, 3. KTP, 4. InitialData
-        final_data["name"] = profile_name or \
-                           passport_data.get("name") or \
-                           ktp_data.get("name") or \
-                           final_data.get("name") # Fallback to initial data
-        
-        # ADDRESS Priority: 1. KTP, 2. Form Data, 3. InitialData
-        final_data["address"] = ktp_data.get("address") or \
-                                form_data.get("Current Residential Address in Home Country") or \
-                                final_data.get("address") # Fallback to initial data
+        # Ensure 'application_id' is preserved
+        data["application_id"] = application_id 
+        return data
+
+    def get_prefill_data(self) -> dict:
+        """
+        Fetches all data from form, smart_upload, and profile
+        and merges it for the frontend.
+        """
+        application_id = self.data.get("application_id")
+        if not application_id:
+            self.logger.error("application_id missing from data for prefill")
+            return {"error": "application_id missing"}
         
-        # EMAIL Priority: 1. Form Data, 2. InitialData
-        final_data["email"] = form_data.get("E-mail address") or final_data.get("email")
+        # Start with initial_data (data passed to the constructor)
+        initial_data = self.data.copy()
         
-        # PHONE Priority: 1. Form Data, 2. InitialData
-        phone_raw = form_data.get("Your Phone Number") or final_data.get("phone")
-        if phone_raw and isinstance(phone_raw, str) and not phone_raw.startswith("+"):
-            final_data["phone"] = f"+{phone_raw}"
-        else:
-            final_data["phone"] = phone_raw
-
-        # Ensure other fields from initial_data are kept
-        final_data["city"] = final_data.get("city")
-        final_data["postal_code"] = final_data.get("postal_code")
-
-        return final_data
+        try:
+            db_manager = DBManager()
+            
+            # 1. Get Form Data
+            form_df = db_manager.get_form_data(application_id)
+            form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
+
+            # 2. Get Smart Upload Data
+            smart_df = db_manager.get_smart_upload_results(application_id)
+            ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
+            passport_data = self._get_smart_doc_data(smart_df, 'passport')
+            
+            # 3. Get Profile Name
+            profile_name = db_manager.get_profile_name_by_app_id(application_id)
+            
+            # 4. Start with initial_data as the base (lowest priority)
+            final_data = initial_data.copy()
+            
+            # 5. Apply Priority Logic (DB data overrides initial_data)
+            
+            # NAME Priority: 1. Profile, 2. Passport, 3. KTP, 4. InitialData
+            final_data["name"] = profile_name or \
+                                passport_data.get("name") or \
+                                ktp_data.get("name") or \
+                                initial_data.get("name") # Fallback to initial data
+            
+            # ADDRESS Priority: 1. KTP, 2. Form Data, 3. InitialData
+            final_data["address"] = ktp_data.get("address") or \
+                                    form_data.get("Current Residential Address in Home Country") or \
+                                    initial_data.get("address") # Fallback to initial data
+            
+            # CITY/POSTAL CODE Priority: 1. KTP, 2. InitialData (if not already set)
+            final_data["city"] = ktp_data.get("city") or initial_data.get("city")
+            final_data["postal_code"] = ktp_data.get("postal_code") or initial_data.get("postal_code")
+            
+            # EMAIL Priority: 1. Form Data, 2. InitialData
+            final_data["email"] = form_data.get("E-mail address") or initial_data.get("email")
+            
+            # PHONE Priority: 1. Form Data, 2. InitialData (format check)
+            phone_raw = form_data.get("Your Phone Number") or initial_data.get("phone")
+            if phone_raw and isinstance(phone_raw, str) and not phone_raw.startswith("+"):
+                final_data["phone"] = f"+{phone_raw}"
+            else:
+                final_data["phone"] = phone_raw
+
+            # Ensure application_id is included
+            final_data["application_id"] = application_id
+
+            return final_data
+            
+        except Exception as e:
+            self.logger.error(f"Failed to prepare data for Japan prefill: {e}", exc_info=True)
+            return {"error": str(e)}
 
     def build_document(self, pdf: FPDF):
         """
@@ -78,12 +113,12 @@ class JapanMultiEntryVisaLetterGenerator(PDFDocumentGenerator):
         """
 
         # --- 1. Data Preparation ---
-        # Start with the initial data passed to the class
+        # Get the final prepared data
         prepared_data = self.data.copy() if self.data else {}
 
         if prepared_data.get("application_id"):
             try:
-                # Try to get new data, using the initial data as a fallback
+                # Use the internal _prepare_data which now calls get_prefill_data
                 prepared_data = self._prepare_data(
                     prepared_data["application_id"], 
                     prepared_data 
@@ -95,13 +130,12 @@ class JapanMultiEntryVisaLetterGenerator(PDFDocumentGenerator):
         # --- 2. PDF Drawing ---
         # Use the prepared_data (which is either merged or initial)
         # with the original hardcoded fallbacks as the final safety net.
-        self.logger.info("LOL: %s", self.data)
-        name = prepared_data.get("name", self.data.get("name", "[YOUR NAME]"))
-        address = prepared_data.get("address", self.data.get("address", "[YOUR ADDRESS]"))
-        city = prepared_data.get("city", self.data.get("city", "[CITY]"))
-        postal_code = prepared_data.get("postal_code", self.data.get("postal_code", "[POSTAL CODE]"))
-        email = prepared_data.get("email", self.data.get("email", "[your.email@example.com]"))
-        phone = prepared_data.get("phone", self.data.get("phone", "[+123456789]"))
+        name = prepared_data.get("name", "[YOUR NAME]")
+        address = prepared_data.get("address", "[YOUR ADDRESS]")
+        city = prepared_data.get("city", "[CITY]")
+        postal_code = prepared_data.get("postal_code", "[POSTAL CODE]")
+        email = prepared_data.get("email", "[your.email@example.com]")
+        phone = prepared_data.get("phone", "[+123456789]")
 
         today = datetime.date.today()
         formatted_date = today.strftime("%d, %B, %Y")
@@ -151,7 +185,7 @@ class JapanMultiEntryVisaLetterGenerator(PDFDocumentGenerator):
             "Should you require any further information or additional "
             "documentation, please feel free to contact me.\n\n"
             "Thank you for considering my application. I look forward to your response."
-     )
+       )
         pdf.multi_cell(0, 5, body_text)
 
         pdf.ln(10) 
@@ -159,4 +193,6 @@ class JapanMultiEntryVisaLetterGenerator(PDFDocumentGenerator):
         
         pdf.ln(25) 
 
-        pdf.cell(0, 5, name)
+        pdf.cell(0, 5, name)
+        
+        return pdf

app/util/passport_collection_letter_generator.py

@@ -3,14 +3,12 @@ import datetime
 import logging
 import pandas as pd
 from .pdf_document_generator import PDFDocumentGenerator
-from .db_utils import DBManager  # Import the DBManager
+from .db_utils import DBManager # Import the DBManager
 
 class PassportCollectionLetterGenerator(PDFDocumentGenerator):
     """
     Generates a specific PDF for a Passport Collection Letter (Surat Kuasa)
-    based on the provided Indonesian template.
-    
-    This class now fetches and prioritizes data from the database.
+    based on the provided Indonesian template, with prefill capability.
     """
     
     def __init__(self, data: dict):
@@ -19,70 +17,105 @@ class PassportCollectionLetterGenerator(PDFDocumentGenerator):
         self.logger = logging.getLogger(__name__)
         self.logger.setLevel(logging.INFO)
 
+    def get_prefill_data(self) -> dict:
+        """
+        Fetches all data from form, smart_upload, and profile
+        and merges it for the frontend, using priority logic.
+        """
+        application_id = self.data.get("application_id")
+        if not application_id:
+            self.logger.error("application_id missing from data for prefill")
+            return {"error": "application_id missing"}
+
+        # Start with initial_data (data passed to the constructor)
+        initial_data = self.data.copy()
+        
+        try:
+            db_manager = DBManager()
+            
+            # 1. Get Form Data
+            form_df = db_manager.get_form_data(application_id)
+            form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
+
+            # 2. Get Smart Upload Data
+            smart_df = db_manager.get_smart_upload_results(application_id)
+            ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
+            passport_data = self._get_smart_doc_data(smart_df, 'passport')
+            
+            # 3. Get Profile Name
+            profile_name = db_manager.get_profile_name_by_app_id(application_id)
+            
+            # 4. Start with initial_data as the base (lowest priority)
+            final_data = initial_data.copy()
+            
+            # 5. Apply Priority Logic (DB data overrides initial_data)
+            
+            # --- Applicant Data (Pemberi Kuasa) ---
+            # Priority: 1. Profile, 2. Passport, 3. KTP, 4. InitialData
+            final_data["applicant_name"] = profile_name or \
+                                           passport_data.get("name") or \
+                                           ktp_data.get("name") or \
+                                           initial_data.get("applicant_name")
+            
+            # Priority: 1. KTP, 2. Form, 3. InitialData
+            final_data["applicant_nik"] = ktp_data.get("nik") or \
+                                          form_data.get("Applicant NIK") or \
+                                          initial_data.get("applicant_nik")
+            
+            # Priority: 1. KTP, 2. Form, 3. InitialData
+            final_data["applicant_address"] = ktp_data.get("address") or \
+                                              form_data.get("Applicant Address") or \
+                                              initial_data.get("applicant_address")
+
+            # --- Agent Data (Penerima Kuasa) ---
+            # Priority: 1. Form, 2. InitialData
+            final_data["agent_name"] = form_data.get("Agent Name") or \
+                                       initial_data.get("agent_name")
+                                       
+            final_data["agent_nik"] = form_data.get("Agent NIK") or \
+                                      initial_data.get("agent_nik")
+                                      
+            final_data["agent_address"] = form_data.get("Agent Address") or \
+                                          initial_data.get("agent_address")
+
+            # --- Document/Letter Data ---
+            # Passport No. Priority: 1. Passport, 2. Form, 3. InitialData
+            final_data["passport_no"] = passport_data.get("passport_number") or \
+                                        form_data.get("Applicant Passport Number") or \
+                                        initial_data.get("passport_no")
+
+            # Location Priority: 1. KTP (City), 2. Form, 3. InitialData
+            final_data["letter_location"] = ktp_data.get("city") or \
+                                            form_data.get("City of Residence") or \
+                                            initial_data.get("letter_location")
+
+            final_data["letter_date"] = initial_data.get("letter_date") # Keep initial data for date
+
+            final_data["application_id"] = application_id
+            
+            return final_data
+
+        except Exception as e:
+            self.logger.error(f"Failed to prepare data for Passport Collection prefill: {e}", exc_info=True)
+            return {"error": str(e)}
+
     def _prepare_data(self, application_id: int, initial_data: dict) -> dict:
         """
-        Fetches all data from form, smart_upload, and profile,
-        then combines it with the initial_data using a clear priority logic.
+        Fetches and merges data using the public get_prefill_data method.
+        This is used internally before building the document.
         """
-        db_manager = DBManager()
-        
-        # 1. Get Form Data
-        form_df = db_manager.get_form_data(application_id)
-        form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
-
-        # 2. Get Smart Upload Data
-        smart_df = db_manager.get_smart_upload_results(application_id)
-        ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
-        passport_data = self._get_smart_doc_data(smart_df, 'passport')
-        
-        # 3. Get Profile Name
-        profile_name = db_manager.get_profile_name_by_app_id(application_id)
-        
-        # 4. Start with initial_data as the base (lowest priority)
-        final_data = initial_data.copy()
-        
-        # 5. Apply Priority Logic (DB data overrides initial_data)
-        
-        # --- Applicant Data ---
-        # Priority: 1. Profile, 2. Passport, 3. KTP, 4. InitialData
-        final_data["applicant_name"] = profile_name or \
-                                       passport_data.get("name") or \
-                                       ktp_data.get("name") or \
-                                       final_data.get("applicant_name")
-        
-        # Priority: 1. KTP, 2. Form, 3. InitialData
-        final_data["applicant_nik"] = ktp_data.get("nik") or \
-                                      form_data.get("Applicant NIK") or \
-                                      final_data.get("applicant_nik")
-        
-        # Priority: 1. KTP, 2. Form, 3. InitialData
-        final_data["applicant_address"] = ktp_data.get("address") or \
-                                          form_data.get("Applicant Address") or \
-                                          final_data.get("applicant_address")
-
-        # --- Agent Data (Must come from form or initial data) ---
-        # Priority: 1. Form, 2. InitialData
-        final_data["agent_name"] = form_data.get("Agent Name") or \
-                                   final_data.get("agent_name")
-                                     
-        final_data["agent_nik"] = form_data.get("Agent NIK") or \
-                                  final_data.get("agent_nik")
-                                             
-        final_data["agent_address"] = form_data.get("Agent Address") or \
-                                      final_data.get("agent_address")
-
-        # --- Document/Letter Data ---
-        # Priority: 1. Passport, 2. Form, 3. InitialData
-        final_data["passport_no"] = passport_data.get("passport_number") or \
-                                    form_data.get("Applicant Passport Number") or \
-                                    final_data.get("passport_no")
-
-        # Priority: 1. KTP (City), 2. Form, 3. InitialData
-        final_data["letter_location"] = ktp_data.get("city") or \
-                                        form_data.get("City of Residence") or \
-                                        final_data.get("letter_location")
-
-        return final_data
+        # Call the public method to handle data fetching and merging
+        data = self.get_prefill_data()
+        
+        # If prefill failed (e.g., missing application_id), return the initial_data
+        if data.get("error"):
+            self.logger.warning(f"Prefill failed, falling back to initial data for App ID {application_id}")
+            return initial_data
+        
+        # Ensure 'application_id' is preserved
+        data["application_id"] = application_id 
+        return data
+
 
     def build_document(self, pdf: FPDF):
         """
@@ -118,7 +151,11 @@ class PassportCollectionLetterGenerator(PDFDocumentGenerator):
         today = datetime.date.today()
         default_date = today.strftime("%d %B %Y")
         letter_location = prepared_data.get("letter_location", "[City]")
-        letter_date = prepared_data.get("letter_date", default_date)
+        
+        # Use prepared data for date, falling back to today's date if not set
+        letter_date = prepared_data.get("letter_date")
+        if not letter_date:
+            letter_date = default_date
 
         # --- 3. Build the PDF Document (Original logic) ---
         pdf.set_left_margin(25)
@@ -212,4 +249,6 @@ class PassportCollectionLetterGenerator(PDFDocumentGenerator):
         
         # Agent Name
         pdf.set_x(pdf.l_margin + col_width)
-        pdf.cell(col_width, 5, f"({agent_name})", 0, 1, 'C')
+        pdf.cell(col_width, 5, f"({agent_name})", 0, 1, 'C')
+
+        return pdf

app/util/pdf_document_generator.py

@@ -146,4 +146,17 @@ class PDFDocumentGenerator(ABC):
 
         except Exception as e:
             print(f"Error during PDF generation: {e}")
-            return None, str(e)
+            return None, str(e)
+        
+    def get_prefill_data(self) -> dict:
+        """
+        Fetches and merges all required data from various DB sources
+        based on the 'application_id' in self.data.
+        
+        Subclasses should override this to implement their specific
+        data-fetching and merging logic.
+        """
+        # Base implementation just returns the data it was given.
+        # This acts as a placeholder for generators that don't need prefill.
+        self.logger.warning("Base get_prefill_data called. No data merging performed.")
+        return self.data

app/util/schengen_visa_letter_generator.py

@@ -83,141 +83,134 @@ class SchengenVisaLetterGenerator(PDFDocumentGenerator):
         
         return travel_start, travel_end
 
-    def _prepare_data(self, application_id: int, initial_data: dict) -> dict:
+    def get_prefill_data(self) -> dict:
         """
-        Fetches all data from form, smart_upload, and profile,
-        then combines it with the initial_data using the new priority logic.
-        
-        PRIORITY:
-        1. Official DB Data (e.g., destination_country)
-        2. Initial Data (initial_data)
-        3. Form Data (form_data)
-        4. High-Trust Smart Upload (smart_upload_data)
+        Fetches all data from form, smart_upload, and profile
+        and merges it for the frontend.
         """
-        db_manager = DBManager()
-        
-        # --- NEW: Get official data from DB ---
-        destination_country_name = db_manager.get_destination_country(application_id)
-        # ---
-        
-        # 1. Hit 1: Ambil data form (Priority 3)
-        form_df = db_manager.get_form_data(application_id)
-        form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
-        
-        # 2. Hit 2: Ambil semua hasil JSON (Data Mentah)
-        smart_df = db_manager.get_smart_upload_results(application_id)
-        self.logger.info(f"Smart DF (raw): {smart_df}")
-        
-        # 3. Ekstrak data "High Trust" AI Data (Priority 4)
-        passport_data = self._get_smart_doc_data(smart_df, 'passport')
-        itinerary_data = self._get_smart_doc_data(smart_df, 'travel_itinerary')
-        employment_data = self._get_smart_doc_data(smart_df, 'employment_letter')
-        cover_letter_data = self._get_smart_doc_data(smart_df, 'cover_letter')
-        flight_data = self._get_smart_doc_data(smart_df, 'flight_booking')
-        
-        # 4. Ekstrak data nested
-        nested_start, nested_end = self._get_nested_flight_dates(flight_data)
-        if not nested_start and not nested_end:
-            nested_start, nested_end = self._get_nested_travel_dates(itinerary_data)
-        
-        # 5. Start with initial_data as the base (Priority 2)
-        final_data = initial_data.copy()
-
-        # --- MEMBANGUN DICT DATA FINAL DENGAN PRIORITAS ---
-        
-        # 5.1 Data Personal 
-        personal = final_data.get("personal_details", {}).copy()
+        application_id = self.data.get("application_id")
+        if not application_id:
+            self.logger.error("application_id missing from data for prefill")
+            return {"error": "application_id missing"}
+            
+        # initial_data is just the dict containing the application_id
+        initial_data = self.data.copy()
         
-        personal["name"] = personal.get("name") or \
-                           form_data.get("name") or \
-                           passport_data.get("name")
-                           
-        personal["dob"] = personal.get("dob") or \
-                          form_data.get("date_of_birth") or \
-                          passport_data.get("date_of_birth")
-                          
-        personal["nationality"] = personal.get("nationality") or \
-                                  form_data.get("nationality") or \
-                                  passport_data.get("nationality")
-                                  
-        personal["passport_number"] = personal.get("passport_number") or \
-                                      form_data.get("passport_number") or \
-                                      passport_data.get("passport_number")
-                                      
-        personal["occupation"] = personal.get("occupation") or \
-                                 form_data.get("occupation") or \
-                                 employment_data.get("position") or \
-                                 passport_data.get("occupation")
-                                 
-        final_data["personal_details"] = personal
+        try:
+            db_manager = DBManager()
+            
+            # --- This is all your logic from _prepare_data ---
+            destination_country_name = db_manager.get_destination_country(application_id)
+            form_df = db_manager.get_form_data(application_id)
+            form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
+            smart_df = db_manager.get_smart_upload_results(application_id)
+            
+            passport_data = self._get_smart_doc_data(smart_df, 'passport')
+            itinerary_data = self._get_smart_doc_data(smart_df, 'travel_itinerary')
+            employment_data = self._get_smart_doc_data(smart_df, 'employment_letter')
+            cover_letter_data = self._get_smart_doc_data(smart_df, 'cover_letter')
+            flight_data = self._get_smart_doc_data(smart_df, 'flight_booking')
+            
+            nested_start, nested_end = self._get_nested_flight_dates(flight_data)
+            if not nested_start and not nested_end:
+                nested_start, nested_end = self._get_nested_travel_dates(itinerary_data)
+            
+            final_data = initial_data.copy()
+            personal = final_data.get("personal_details", {}).copy()
+            personal["name"] = personal.get("name") or \
+                            form_data.get("name") or \
+                            passport_data.get("name")
+                            
+            personal["dob"] = personal.get("dob") or \
+                            form_data.get("date_of_birth") or \
+                            passport_data.get("date_of_birth")
+                            
+            personal["nationality"] = personal.get("nationality") or \
+                                    form_data.get("nationality") or \
+                                    passport_data.get("nationality")
+                                    
+            personal["passport_number"] = personal.get("passport_number") or \
+                                        form_data.get("passport_number") or \
+                                        passport_data.get("passport_number")
+                                        
+            personal["occupation"] = personal.get("occupation") or \
+                                    form_data.get("occupation") or \
+                                    employment_data.get("position") or \
+                                    passport_data.get("occupation")
+                                    
+            final_data["personal_details"] = personal
 
-        # 5.2 Data Perjalanan Inti
-        
-        # --- UPDATED PRIORITY ---
-        final_data["country"] = destination_country_name or \
-                                final_data.get("country") or \
-                                form_data.get("schengen_country") or \
-                                cover_letter_data.get("schengen_country")
+            # 5.2 Data Perjalanan Inti
+            
+            # --- UPDATED PRIORITY ---
+            final_data["country"] = destination_country_name or \
+                                    final_data.get("country") or \
+                                    form_data.get("schengen_country") or \
+                                    cover_letter_data.get("schengen_country")
 
-        final_data["main_dest"] = destination_country_name or \
-                                  final_data.get("main_dest") or \
-                                  form_data.get("main_destination") or \
-                                  itinerary_data.get("main_destination")
-        # ---
+            final_data["main_dest"] = destination_country_name or \
+                                    final_data.get("main_dest") or \
+                                    form_data.get("main_destination") or \
+                                    itinerary_data.get("main_destination")
+            # ---
+                                    
+            final_data["purpose"] = final_data.get("purpose") or \
+                                    form_data.get("purpose") or \
+                                    itinerary_data.get("purpose")
+            
+            # 5.3 Data Tanggal
+            final_data["start"] = final_data.get("start") or \
+                                form_data.get("travel_start") or \
+                                nested_start
                                 
-        final_data["purpose"] = final_data.get("purpose") or \
-                                form_data.get("purpose") or \
-                                itinerary_data.get("purpose")
-        
-        # 5.3 Data Tanggal
-        final_data["start"] = final_data.get("start") or \
-                              form_data.get("travel_start") or \
-                              nested_start
-                              
-        final_data["end"] = final_data.get("end") or \
-                            form_data.get("travel_end") or \
-                            nested_end
+            final_data["end"] = final_data.get("end") or \
+                                form_data.get("travel_end") or \
+                                nested_end
 
-        # 5.4 Data Lainnya
-        final_data["city"] = final_data.get("city") or \
-                             form_data.get("city") or \
-                             cover_letter_data.get("city")
+            # 5.4 Data Lainnya
+            final_data["city"] = final_data.get("city") or \
+                                form_data.get("city") or \
+                                cover_letter_data.get("city")
+                                    
+            final_data["event"] = final_data.get("event") or \
+                                form_data.get("event") or \
+                                cover_letter_data.get("event")
                                 
-        final_data["event"] = final_data.get("event") or \
-                              form_data.get("event") or \
-                              cover_letter_data.get("event")
-                              
-        final_data["other_dest"] = final_data.get("other_dest", "") or \
-                                   form_data.get("other_destinations") or \
-                                   cover_letter_data.get("other_destinations")
-        
-        duration_smart = itinerary_data.get("duration") or itinerary_data.get("total_days")
-        final_data["duration"] = final_data.get("duration") or \
-                                 form_data.get("duration") or \
-                                 (str(duration_smart) if duration_smart else None)
-        
-        final_data["trip_highlight"] = final_data.get("trip_highlight") or \
-                                       form_data.get("trip_highlight") or \
-                                       cover_letter_data.get("trip_highlight")
-        
-        final_data["contact_email"] = final_data.get("contact_email") or \
-                                      form_data.get("contact_email") or \
-                                      cover_letter_data.get("contact_email")
-                                      
-        final_data["contact_phone"] = final_data.get("contact_phone") or \
-                                      form_data.get("contact_phone") or \
-                                      cover_letter_data.get("contact_phone")
-        
-        final_data["job_commitment"] = final_data.get("job_commitment") or \
-                                       form_data.get("job_commitment") or \
-                                       employment_data.get("job_commitment") or \
-                                       cover_letter_data.get("job_commitment")
-        
-        final_data["financial_status"] = final_data.get("financial_status") or \
-                                         form_data.get("financial_status") or \
-                                         cover_letter_data.get("financial_status") or "sound"
+            final_data["other_dest"] = final_data.get("other_dest", "") or \
+                                    form_data.get("other_destinations") or \
+                                    cover_letter_data.get("other_destinations")
+            
+            duration_smart = itinerary_data.get("duration") or itinerary_data.get("total_days")
+            final_data["duration"] = final_data.get("duration") or \
+                                    form_data.get("duration") or \
+                                    (str(duration_smart) if duration_smart else None)
+            
+            final_data["trip_highlight"] = final_data.get("trip_highlight") or \
+                                        form_data.get("trip_highlight") or \
+                                        cover_letter_data.get("trip_highlight")
+            
+            final_data["contact_email"] = final_data.get("contact_email") or \
+                                        form_data.get("E-mail address") or \
+                                        cover_letter_data.get("contact_email")
+                                        
+            final_data["contact_phone"] = final_data.get("contact_phone") or \
+                                        form_data.get("Your Phone Number") or \
+                                        cover_letter_data.get("contact_phone")
+            
+            final_data["job_commitment"] = final_data.get("job_commitment") or \
+                                        form_data.get("job_commitment") or \
+                                        employment_data.get("job_commitment") or \
+                                        cover_letter_data.get("job_commitment")
+            
+            final_data["financial_status"] = final_data.get("financial_status") or \
+                                            form_data.get("financial_status") or \
+                                            cover_letter_data.get("financial_status") or "sound"
 
-        return final_data
+            return final_data
+            
+        except Exception as e:
+            self.logger.error(f"Failed to prepare data for Schengen: {e}", exc_info=True)
+            return {"error": str(e)}
 
     def build_document(self, pdf: FPDF):
         """

app/util/sponsorship_letter_generator.py

@@ -10,7 +10,8 @@ class SponsorshipLetterGenerator(PDFDocumentGenerator):
     Generates a specific PDF for a Visa Sponsorship Letter based on
     the provided template.
     
-    This class now fetches and prioritizes data from the database.
+    This class now fetches and prioritizes data from the database
+    and provides a method for frontend prefill.
     """
     
     def __init__(self, data: dict):
@@ -19,74 +20,106 @@ class SponsorshipLetterGenerator(PDFDocumentGenerator):
         self.logger = logging.getLogger(__name__)
         self.logger.setLevel(logging.INFO)
 
+    def get_prefill_data(self) -> dict:
+        """
+        Fetches all data from form, smart_upload, and profile
+        and merges it for the frontend.
+        """
+        application_id = self.data.get("application_id")
+        if not application_id:
+            self.logger.error("application_id missing from data for prefill")
+            return {"error": "application_id missing"}
+
+        # Start with initial_data (data passed to the constructor)
+        initial_data = self.data.copy()
+
+        try:
+            db_manager = DBManager()
+            
+            # 1. Get Form Data
+            form_df = db_manager.get_form_data(application_id)
+            form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
+
+            # 2. Get Smart Upload Data (for Applicant)
+            smart_df = db_manager.get_smart_upload_results(application_id)
+            ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
+            passport_data = self._get_smart_doc_data(smart_df, 'passport')
+            
+            # 3. Get Profile Name (for Applicant)
+            profile_name = db_manager.get_profile_name_by_app_id(application_id)
+            
+            # 4. Start with initial_data as the base (lowest priority)
+            final_data = initial_data.copy()
+            
+            # 5. Apply Priority Logic
+            
+            # --- Sponsor Data (Priority: 1. Form, 2. InitialData) ---
+            # (Assuming form field names match the purpose)
+            final_data["sponsor_name"] = form_data.get("Sponsor Full Name") or \
+                                         initial_data.get("sponsor_name")
+            final_data["sponsor_address"] = form_data.get("Sponsor Address") or \
+                                            initial_data.get("sponsor_address")
+            final_data["sponsor_postal_code"] = form_data.get("Sponsor Postal Code") or \
+                                                initial_data.get("sponsor_postal_code")
+            final_data["sponsor_email"] = form_data.get("Sponsor Email") or \
+                                          initial_data.get("sponsor_email")
+            final_data["sponsor_contact_number"] = form_data.get("Sponsor Phone Number") or \
+                                                   initial_data.get("sponsor_contact_number")
+
+            # --- Applicant Data (Priority: 1. Profile, 2. Passport, 3. KTP, 4. Form, 5. InitialData) ---
+            final_data["applicant_name"] = profile_name or \
+                                           passport_data.get("name") or \
+                                           ktp_data.get("name") or \
+                                           form_data.get("Applicant Full Name") or \
+                                           initial_data.get("applicant_name")
+            
+            final_data["applicant_dob"] = passport_data.get("date_of_birth") or \
+                                          ktp_data.get("date_of_birth") or \
+                                          form_data.get("Applicant Date of Birth") or \
+                                          initial_data.get("applicant_dob")
+                                          
+            final_data["applicant_passport_no"] = passport_data.get("passport_number") or \
+                                                  form_data.get("Applicant Passport Number") or \
+                                                  initial_data.get("applicant_passport_no")
+
+            # --- Embassy & Visit Details (Priority: 1. Form, 2. InitialData) ---
+            final_data["officer_title"] = form_data.get("Embassy Officer Title") or initial_data.get("officer_title")
+            final_data["embassy_name"] = form_data.get("Embassy Name") or initial_data.get("embassy_name")
+            final_data["embassy_address"] = form_data.get("Embassy Address") or initial_data.get("embassy_address")
+            final_data["embassy_city_state_postal"] = form_data.get("Embassy City State Postal") or initial_data.get("embassy_city_state_postal")
+            
+            final_data["visa_name"] = form_data.get("Visa Name") or initial_data.get("visa_name")
+            final_data["sponsor_relationship"] = form_data.get("Sponsor Relationship") or initial_data.get("sponsor_relationship")
+            final_data["visit_reason"] = form_data.get("Visit Reason") or initial_data.get("visit_reason")
+            final_data["destination_country"] = form_data.get("Destination Country") or initial_data.get("destination_country")
+            final_data["visit_start_date"] = form_data.get("Visit Start Date") or initial_data.get("visit_start_date")
+            final_data["visit_end_date"] = form_data.get("Visit End Date") or initial_data.get("visit_end_date")
+            final_data["visit_purpose_details"] = form_data.get("Visit Purpose Details") or initial_data.get("visit_purpose_details")
+
+            final_data["application_id"] = application_id
+            
+            return final_data
+
+        except Exception as e:
+            self.logger.error(f"Failed to prepare data for Sponsorship prefill: {e}", exc_info=True)
+            return {"error": str(e)}
+
     def _prepare_data(self, application_id: int, initial_data: dict) -> dict:
         """
-        Fetches all data from form, smart_upload, and profile,
-        then combines it with the initial_data using a clear priority logic.
+        Fetches and merges data using the public get_prefill_data method.
+        This is used internally before building the document.
         """
-        db_manager = DBManager()
-        
-        # 1. Get Form Data
-        form_df = db_manager.get_form_data(application_id)
-        form_data = pd.Series(form_df.value.values, index=form_df.name).to_dict()
-
-        # 2. Get Smart Upload Data (for Applicant)
-        smart_df = db_manager.get_smart_upload_results(application_id)
-        ktp_data = self._get_smart_doc_data(smart_df, 'ktp')
-        passport_data = self._get_smart_doc_data(smart_df, 'passport')
-        
-        # 3. Get Profile Name (for Applicant)
-        profile_name = db_manager.get_profile_name_by_app_id(application_id)
+        # Call the public method to handle data fetching and merging
+        data = self.get_prefill_data()
         
-        # 4. Start with initial_data as the base (lowest priority)
-        final_data = initial_data.copy()
+        # If prefill failed (e.g., missing application_id), return the initial_data
+        if data.get("error"):
+            self.logger.warning(f"Prefill failed, falling back to initial data for App ID {application_id}")
+            return initial_data
         
-        # 5. Apply Priority Logic
-        
-        # --- Sponsor Data (Priority: 1. Form, 2. InitialData) ---
-        # (Assuming form field names match the purpose)
-        final_data["sponsor_name"] = form_data.get("Sponsor Full Name") or \
-                                     final_data.get("sponsor_name")
-        final_data["sponsor_address"] = form_data.get("Sponsor Address") or \
-                                        final_data.get("sponsor_address")
-        final_data["sponsor_postal_code"] = form_data.get("Sponsor Postal Code") or \
-                                            final_data.get("sponsor_postal_code")
-        final_data["sponsor_email"] = form_data.get("Sponsor Email") or \
-                                      final_data.get("sponsor_email")
-        final_data["sponsor_contact_number"] = form_data.get("Sponsor Phone Number") or \
-                                               final_data.get("sponsor_contact_number")
-
-        # --- Applicant Data (Priority: 1. Profile, 2. Passport, 3. KTP, 4. Form, 5. InitialData) ---
-        final_data["applicant_name"] = profile_name or \
-                                       passport_data.get("name") or \
-                                       ktp_data.get("name") or \
-                                       form_data.get("Applicant Full Name") or \
-                                       final_data.get("applicant_name")
-        
-        final_data["applicant_dob"] = passport_data.get("date_of_birth") or \
-                                      ktp_data.get("date_of_birth") or \
-                                      form_data.get("Applicant Date of Birth") or \
-                                      final_data.get("applicant_dob")
-                                      
-        final_data["applicant_passport_no"] = passport_data.get("passport_number") or \
-                                              form_data.get("Applicant Passport Number") or \
-                                              final_data.get("applicant_passport_no")
-
-        # --- Embassy & Visit Details (Priority: 1. Form, 2. InitialData) ---
-        final_data["officer_title"] = form_data.get("Embassy Officer Title") or final_data.get("officer_title")
-        final_data["embassy_name"] = form_data.get("Embassy Name") or final_data.get("embassy_name")
-        final_data["embassy_address"] = form_data.get("Embassy Address") or final_data.get("embassy_address")
-        final_data["embassy_city_state_postal"] = form_data.get("Embassy City State Postal") or final_data.get("embassy_city_state_postal")
-        
-        final_data["visa_name"] = form_data.get("Visa Name") or final_data.get("visa_name")
-        final_data["sponsor_relationship"] = form_data.get("Sponsor Relationship") or final_data.get("sponsor_relationship")
-        final_data["visit_reason"] = form_data.get("Visit Reason") or final_data.get("visit_reason")
-        final_data["destination_country"] = form_data.get("Destination Country") or final_data.get("destination_country")
-        final_data["visit_start_date"] = form_data.get("Visit Start Date") or final_data.get("visit_start_date")
-        final_data["visit_end_date"] = form_data.get("Visit End Date") or final_data.get("visit_end_date")
-        final_data["visit_purpose_details"] = form_data.get("Visit Purpose Details") or final_data.get("visit_purpose_details")
-
-        return final_data
+        # Ensure 'application_id' is preserved
+        data["application_id"] = application_id 
+        return data
 
     def build_document(self, pdf: FPDF):
         """
@@ -209,4 +242,6 @@ class SponsorshipLetterGenerator(PDFDocumentGenerator):
         pdf.ln(15) # Space for signature
         pdf.cell(0, 5, sponsor_name)
         pdf.ln(5)
-        pdf.cell(0, 5, sponsor_phone)
+        pdf.cell(0, 5, sponsor_phone)
+        
+        return pdf

server.py

@@ -36,9 +36,67 @@ def create_app() -> Flask:
         logging.exception(f"Could not load secrets from SSM: {e}")
     print("ENV VARS:", dict(os.environ))
 
+    GENERATOR_MAP = {
+        "japan-multientry-tourist": (
+            "app.util.japan_multientry_visa_letter_generator",
+            "JapanMultiEntryVisaLetterGenerator",
+        ),
+        "schengen": (
+            "app.util.schengen_visa_letter_generator",
+            "SchengenVisaLetterGenerator",
+        ),
+        "sponsorship": (
+            "app.util.sponsorship_letter_generator",
+            "SponsorshipLetterGenerator"
+        ),
+        "housewife-statement": (
+            "app.util.housewife_statement_letter_generator",
+            "HousewifeStatementLetterGenerator"
+        ),
+        "passport-collection": (
+            "app.util.passport_collection_letter_generator",
+            "PassportCollectionLetterGenerator"
+        )
+    }
+
     WORKER_API_KEY = os.getenv("WORKER_API_KEY")
     
+    @app.route('/prefill/<visa_type>/<int:application_id>', methods=['GET'])
+    def get_prefill_data(visa_type, application_id):
+        """
+        Dynamically fetches and merges data for a specific visa type
+        to pre-fill the frontend form.
+        """
+        try:
+            if visa_type.lower() not in GENERATOR_MAP:
+                return jsonify({"error": f"Unsupported visa type: {visa_type}"}), 400
+
+            module_path, class_name = GENERATOR_MAP[visa_type.lower()]
+
+            module = importlib.import_module(module_path)
+            generator_class = getattr(module, class_name)
+
+            # Instantiate the generator, passing the application_id
+            letter_generator = generator_class(data={"application_id": application_id})
+
+            # Call the new public method to fetch and merge data
+            # This method MUST exist on the generator class (see step 2)
+            prefill_data = letter_generator.get_prefill_data()
             
+            if not prefill_data:
+                return jsonify({"error": "Failed to prepare data or no data found."}), 500
+
+            return jsonify(prefill_data), 200
+
+        except AttributeError as e:
+            # This error happens if the class doesn't have "get_prefill_data"
+            msg = f"Generator {class_name} does not implement 'get_prefill_data'. {e}"
+            logging.error(msg)
+            return jsonify({"error": msg}), 501 # 501 Not Implemented
+        except Exception as e:
+            logging.error(f"Error in /prefill/{visa_type}/{application_id}: {e}", exc_info=True)
+            return jsonify({"error": str(e)}), 500
+        
     @app.route('/scrape', methods=['POST'])
     async def scrape():
         try:
@@ -102,28 +160,6 @@ def create_app() -> Flask:
             traceback.print_exc()
             return jsonify({"error": str(e)}), 500
     
-    # @app.route('/visa-checker', methods=['POST'])
-    # async def visa_checker():
-    #     raw = request.get_data(as_text=True)
-    #     body = json.loads(raw)
-    #     source = body.get('source')
-    #     logging.info(f"Received visa check request: {body}")
-    #     destination = body.get('destination')
-    #     async with PassportIndexVisaScraper(debug=True) as scraper:
-    #         if not await scraper.initialize_session():
-    #             return jsonify({"error": "Failed to initialize session"}), 500
-    #         result = await scraper.check_visa_requirement_browser(source, destination)
-
-    #         if result:
-    #             return jsonify(result), 200
-    #         else:
-    #             result = await scraper.check_visa_interactive(source, destination)
-    #             if result:
-    #                 return jsonify(result), 200
-    #             else:
-    #                 return jsonify({"error": "Failed to retrieve visa information"}), 404
-    #     return jsonify({"error": "Unexpected error"}), 500
-    
     @app.route('/generate/<visa_type>', methods=['POST'])
     def generate_visa_letter(visa_type):
         """
@@ -139,34 +175,10 @@ def create_app() -> Flask:
             if not data:
                 return jsonify({"error": "No JSON payload provided"}), 400
 
-            # ✅ Map visa types to their module and class
-            generator_map = {
-                "japan-multientry-tourist": (
-                    "app.util.japan_multientry_visa_letter_generator",
-                    "JapanMultiEntryVisaLetterGenerator",
-                ),
-                "schengen": (
-                    "app.util.schengen_visa_letter_generator",
-                    "SchengenVisaLetterGenerator",
-                ),
-                "sponsorship": (
-                    "app.util.sponsorship_letter_generator",
-                    "SponsorshipLetterGenerator"
-                ),
-                "housewife-statement": (
-                    "app.util.housewife_statement_letter_generator",
-                    "HousewifeStatementLetterGenerator"
-                ),
-                "passport-collection": (
-                    "app.util.passport_collection_letter_generator",
-                    "PassportCollectionLetterGenerator"
-                )
-            }
-
-            if visa_type.lower() not in generator_map:
+            if visa_type.lower() not in GENERATOR_MAP:
                 return jsonify({"error": f"Unsupported visa type: {visa_type}"}), 400
 
-            module_path, class_name = generator_map[visa_type.lower()]
+            module_path, class_name = GENERATOR_MAP[visa_type.lower()]
 
             module = importlib.import_module(module_path)
             generator_class = getattr(module, class_name)