feat add buildspec

README.md

@@ -38,7 +38,7 @@ It currently supports:
 | `/generate/japan-multientry` | POST | Generate a Japan multi-entry visa support letter |
 | `/generate/sponsorship` | POST | Generate sponsorship letter | 
 | `/generate/housewife-statement` | POST | Generate housewife statement letter |
-| `/generate/passport-collection | POST | Generate passport collection consent letter |
+| `/generate/passport-collection` | POST | Generate passport collection consent letter |
 
 ---
 

app/util/db_utils.py

@@ -0,0 +1,70 @@
+import os
+from sqlalchemy import create_engine, text
+import logging
+from dotenv import load_dotenv
+from sqlalchemy.engine import URL
+from typing import List, Dict, Any
+import pandas as pd
+
+class DBManager:
+    def __init__(self):
+        load_dotenv()
+        USERNAME = os.getenv("DB_USERNAME") 
+        PASSWORD = os.getenv("DB_PASSWORD") 
+        HOST = os.getenv("DB_HOST") 
+        NAME = os.getenv("DB_NAME") 
+        PORT = os.getenv("DB_PORT") 
+
+        if not all([USERNAME, PASSWORD, HOST, NAME]):
+            raise ValueError("One or more database environment variables are not set.")
+
+
+        connection_url = URL.create(
+            drivername="postgresql+psycopg2",
+            username=USERNAME,
+            password=PASSWORD,
+            host=HOST,
+            port=PORT,
+            database=NAME,
+            # query={"sslmode": "require"}  # kalau perlu SSL
+        )
+
+        self.engine = create_engine(connection_url, pool_pre_ping=True)
+
+
+        try:
+            safe_url = connection_url.render_as_string(hide_password=True)
+        except Exception:
+            safe_url = str(connection_url).replace(PASSWORD, "***")
+
+        logging.info(f"Database engine created with URL: {safe_url}")
+
+    def _execute_query(self, query: str, params: dict = None) -> pd.DataFrame:
+        """Executes a SQL query and returns the result as a pandas DataFrame."""
+        try:
+            with self.engine.connect() as connection:
+                df = pd.read_sql_query(sql=text(query), con=connection, params=params)
+            return df
+        except Exception as e:
+            logging.error(f"Failed to execute query: {e}", exc_info=True)
+            return pd.DataFrame()
+        
+    def get_info_for_japan_multientry(self, application_id: int) -> pd.DataFrame:
+        query = """
+        (
+    select 
+		'name' as name,
+		p.first_name || ' '|| p.last_name as value
+	from 
+		application a 
+	join profile p on p.id = a.profile_id
+	where a.id = :application_id)
+union 
+select d.name, ad.value from service_document sd 
+join "document" d on d.id = sd.document_id 
+join application_document ad ON ad.document_id  = d.id 
+--join document_extraction_result der on der.application_document_id  = ad.id
+where service_id = 292 and ad.application_id = :application_id and d.name in ('Current Residential Address in Home Country', 'E-mail address', 'Your Phone Number');
+    """
+        params = {"application_id": application_id}
+        return self._execute_query(query, params)

app/util/japan_multientry_visa_letter_generator.py

@@ -1,7 +1,8 @@
 import datetime
 from fpdf import FPDF
 from .pdf_document_generator import PDFDocumentGenerator # The fpdf2-based one
-
+from .db_utils import DBManager 
+import pandas as pd
 class JapanMultiEntryVisaLetterGenerator(PDFDocumentGenerator):
     """
     Generates the specific PDF for the Japan Multiple Entry Visa application
@@ -15,13 +16,31 @@ class JapanMultiEntryVisaLetterGenerator(PDFDocumentGenerator):
         Creates the full PDF document for the Japan visa letter
         by adding content to the FPDF object.
         """
+
+        if self.data.get("application_id"):
+            db_manager = DBManager()
+            info_df = db_manager.get_info_for_japan_multientry(self.data["application_id"])
+            raw_data_dict = pd.Series(info_df.value.values, index=info_df.name).to_dict()
+
+            data_to_use = {}
+            data_to_use["name"] = raw_data_dict.get("name")
+            data_to_use["address"] = raw_data_dict.get("Current Residential Address in Home Country")
+            data_to_use["email"] = raw_data_dict.get("E-mail address")
+
+            phone_raw = raw_data_dict.get("Your Phone Number")
+            if phone_raw and not phone_raw.startswith("+"):
+                data_to_use["phone"] = f"+{phone_raw}"
+            else:
+                data_to_use["phone"] = phone_raw
+
+            self.data = data_to_use
         
-        name = self.data.get("name", "YOUR NAME")
-        address = self.data.get("address", "YOUR ADDRESS")
-        city = self.data.get("city", "CITY")
-        postal_code = self.data.get("postal_code", "POSTAL CODE")
-        email = self.data.get("email", "your.email@example.com")
-        phone = self.data.get("phone", "+123456789")
+        name = self.data.get("name", "[YOUR NAME]")
+        address = self.data.get("address", "[YOUR ADDRESS]")
+        city = self.data.get("city", "[CITY]")
+        postal_code = self.data.get("postal_code", "[POSTAL CODE]")
+        email = self.data.get("email", "[your.email@example.com]")
+        phone = self.data.get("phone", "[+123456789]")
 
         today = datetime.date.today()
         formatted_date = today.strftime("%d, %B, %Y")

buildspec.yml

@@ -0,0 +1,37 @@
+version: 0.2
+
+phases:
+  pre_build:
+    commands:
+      - echo Logging in to Amazon ECR...
+      - aws --version
+      - docker version
+      - echo $AWS_REGION
+      - aws configure list
+      - aws --debug ecr get-login-password --region $AWS_REGION | docker login --username AWS --password-stdin 825765383758.dkr.ecr.$AWS_REGION.amazonaws.com
+
+  build:
+    commands:
+      - echo Build started on `date`
+      - echo $AWS_ACCESS_KEY_ID $AWS_SECRET_ACCESS_KEY $APP_ENV
+      - echo Building the Docker image...
+      - |
+        docker build \
+          -t $CONTAINER_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION \
+          . \
+          --build-arg AWS_ACCESS_KEY_ID \
+          --build-arg AWS_SECRET_ACCESS_KEY \
+          --build-arg APP_ENV
+      - docker tag $CONTAINER_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION 825765383758.dkr.ecr.$AWS_REGION.amazonaws.com/$CONTAINER_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION
+
+  post_build:
+    commands:
+      - echo Pushing the Docker image to Amazon ECR...
+      - docker push 825765383758.dkr.ecr.$AWS_REGION.amazonaws.com/$CONTAINER_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION
+      - echo Writing image definitions file...
+      - printf '[{"name":"%s","imageUri":"%s"}]' $CONTAINER_NAME 825765383758.dkr.ecr.$AWS_REGION.amazonaws.com/$CONTAINER_NAME:$CODEBUILD_RESOLVED_SOURCE_VERSION > imagedefinitions.json
+
+artifacts:
+  files:
+    - imagedefinitions.json
+    - echo Writing image definitions file...

docker-compose.yaml

@@ -5,6 +5,8 @@ services:
     build: .
     ports:
       - "7860:7860"
+    env_file:
+      - .env
     environment:
       - PORT=7860
       - PLAYWRIGHT_BROWSERS_PATH=/home/user/.cache/ms-playwright

requirements.txt

@@ -11,4 +11,8 @@ beautifulsoup4
 pymupdf
 flask[async]
 pandas
-fpdf
+fpdf
+pandas
+
+SQLAlchemy
+psycopg2-binary