large improve of tests and docker build

Dockerfile

@@ -1,11 +1,11 @@
-FROM python:3.11-slim
+FROM python:3.11-slim-bookworm AS builder
 
-COPY ./requirements.txt /tmp/requirements.txt
-COPY ./entrypoint.sh /tmp/entrypoint.sh
-COPY ./src /app/src
-COPY ./tests /app/tests
+WORKDIR /app
 
-RUN chmod +x /tmp/entrypoint.sh
+COPY requirements.txt requirements.txt
+COPY requirements-dev.txt requirements-dev.txt
+    
+ARG TEST
 
 # Avoid interactive prompts during package installation
 ENV DEBIAN_FRONTEND=noninteractive
@@ -15,13 +15,47 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Clean up apt cache to reduce image size
 # Use pip to install Python packages
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends gcc curl && \
-    pip install --upgrade pip && \
+    apt-get install -y --no-install-recommends \
+    gcc \
+    curl && \
+    pip install --upgrade pip && pip install --no-cache-dir -r requirements.txt && \
+    # Install development dependencies if TEST is true
+    if [ "$TEST" = "true" ]; then \
+        pip install --no-cache-dir -r requirements-dev.txt; \
+    fi && \
+    # Clean up apt cache and remove gcc and curl to reduce image size
+    apt-get remove -y gcc curl && \
+    apt-get autoremove -y && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN pip install --no-cache-dir -r /tmp/requirements.txt
+# ---- Runtime stage ----
+FROM python:3.11-slim-bookworm
 
 WORKDIR /app
+    
+ARG TEST
+
+COPY --from=builder /usr/local/lib/python3.11 /usr/local/lib/python3.11
+COPY --from=builder /usr/local/bin /usr/local/bin
+
+# For faking postgresql in tests
+RUN if [ "$TEST" = "true" ]; then \
+        apt-get update && \
+        apt-get install -y --no-install-recommends \
+        postgresql \
+        postgresql-contrib && \
+        apt-get clean && rm -rf /var/lib/apt/lists/* \
+    else \
+        echo "Skipping PostgreSQL installation for non-test build"; \
+    fi
+
+COPY ./entrypoint.sh /app/entrypoint.sh
+COPY ./src /app/src
+COPY ./tests /app/tests
+COPY ./pytest.ini /app/pytest.ini
+COPY ./.env.test /app/.env.test
+
+RUN chmod +x /app/entrypoint.sh
 
 ENV PYTHONPATH=/app
 
@@ -34,7 +68,8 @@ CMD [ "curl", "-f", "http://localhost:8860/check_health" ]
 
 # Create a non-root user 'appuser' and switch to this user
 RUN useradd --create-home appuser
+RUN chown -R appuser:appuser /app
 USER appuser
 
 # CMD with JSON notation
-CMD ["/tmp/entrypoint.sh"]
+CMD ["/app/entrypoint.sh"]

pytest.ini

@@ -0,0 +1,7 @@
+# pytest.ini
+[pytest]
+env_files =
+    .env.test
+
+filterwarnings =
+    ignore:.*Support for class-based `config` is deprecated.*:DeprecationWarning

requirements-dev.txt

@@ -0,0 +1,5 @@
+# This file is used to install the development dependencies for the project.
+pytest==8.3.5
+pytest-dotenv==0.5.2
+pytest-postgresql==7.0.1
+httpx==0.28.1

requirements.txt

@@ -3,5 +3,4 @@ fastapi==0.115.12
 requests==2.32.3
 sqlalchemy==2.0.40
 psycopg[binary]==3.2.7
-pytest==8.3.5
 uvicorn==0.34.2

tests/conftest.py

@@ -1,8 +1,84 @@
+import datetime
 import pytest
-import pandas as pd
+import pkgutil
+import importlib
+from fastapi.testclient import TestClient
+from sqlalchemy import create_engine, text
+from sqlalchemy.orm import sessionmaker
+
+from src.entity.fraud_details import FraudDetails
 from src.entity.transaction import Transaction
 from src.entity.api.transaction_api import TransactionApi
+from src.main import app, provide_connection
+from src.repository.common import get_session
+
+from src.entity import Base
+
+# ----------------------------------------------------------------
+# Load all classes from src.entity
+module = importlib.import_module('src.entity')
+
+# Loop over all modules in the 'src.entity' package
+package = importlib.import_module('src.entity')
+
+for _, module_name, _ in pkgutil.walk_packages(package.__path__, package.__name__ + '.'):
+    module = importlib.import_module(module_name)
+
+@pytest.fixture
+def client(db_session):
+    """
+    Create a test client for the FastAPI app.
+    """
+    # Override the get_session dependency to use the test database session
+    def override_get_session():
+        yield db_session
+
+    # Override the dependency in the FastAPI app
+    app.dependency_overrides[get_session] = override_get_session
+    app.dependency_overrides[provide_connection] = override_get_session
+
+    return TestClient(app)
+
+# ----------------------------------------------------------------
+# Fixtures for Database
+# ----------------------------------------------------------------
+@pytest.fixture
+def db_session(postgresql):
+    """
+    Create a new database session for each test
+    and tear it down after the test.
+    """
+    # Create a new database connection
+    host = postgresql.info.host
+    port = postgresql.info.port
+    user = postgresql.info.user
+    dbname = postgresql.info.dbname
+
+    dsn = f"postgresql+psycopg://{user}@{host}:{port}/{dbname}"
+    engine = create_engine(dsn, echo=True)
+
+    # Create schema and tables once
+    with engine.begin() as conn:
+        conn.execute(text("CREATE SCHEMA IF NOT EXISTS public"))
+    
+    Base.metadata.create_all(engine)
 
+    connection = engine.connect()
+    connection.begin()
+
+    SessionLocal = sessionmaker(bind=connection)
+    session = SessionLocal()
+
+    try:
+        yield session
+    except Exception:
+        session.rollback()  # In case of an error, rollback the session
+        raise
+    finally:
+        session.close()
+        connection.close()
+
+# ----------------------------------------------------------------
 @pytest.fixture
 def valid_transaction():
     return Transaction(
@@ -21,7 +97,7 @@ def valid_transaction():
         customer_dob='1968-03-19',
         transaction_number='2da90c7d74bd46a0caf3777415b3ebd3',
         transaction_amount=2.86,
-        transaction_datetime=pd.to_datetime('2020-06-21 12:14:25'),
+        transaction_datetime=datetime.datetime(2020, 6, 21, 12, 14, 25),
         transaction_category='personal_care',
         merchant_name='fraud_Kirlin and Sons',
         merchant_address_latitude=33.986391,
@@ -46,7 +122,7 @@ def fraudulent_transaction():
         customer_dob='1969-09-15',
         transaction_number='16bf2e46c54369a8eab2214649506425',
         transaction_amount=2400000.84,
-        transaction_datetime=pd.to_datetime('2020-06-21 22:06:39'),
+        transaction_datetime=datetime.datetime(2020, 6, 21, 22, 6, 39),
         transaction_category='health_fitness',
         merchant_name="fraud_Hamill-D'Amore",
         merchant_address_latitude=32.575873,
@@ -76,4 +152,41 @@ def transaction_api():
         customer_latitude=37.7749,
         customer_longitude=-122.4194,
         customer_city_population=870000,
-    )
+    )
+
+# ----------------------------------------------------------------
+# Fixtures in database
+# ----------------------------------------------------------------
+@pytest.fixture
+def valid_transaction_in_db(db_session, valid_transaction: Transaction):
+    """
+    Create a valid transaction and add it to the database
+    """
+    db_session.add(valid_transaction)
+    db_session.commit()
+    db_session.refresh(valid_transaction)
+
+    return valid_transaction
+
+@pytest.fixture
+def fraudulent_transaction_in_db(db_session, fraudulent_transaction: Transaction):
+    """
+    Create a fraudulent transaction and add it to the database
+    """
+    fraud_details = FraudDetails(
+        fraud_score=0.99,
+        model_version="v1.0",
+        notification_sent=False,
+        notification_recipients=None,
+        notification_datetime=None,
+    )
+
+    # Add the fraud details to the transaction
+    fraudulent_transaction.fraud_details = fraud_details
+
+    # Add the transaction to the database
+    db_session.add(fraudulent_transaction)
+    db_session.commit()
+    db_session.refresh(fraudulent_transaction)
+
+    return fraudulent_transaction

tests/repository/test_transaction_repo.py

@@ -0,0 +1,22 @@
+from src.entity.transaction import Transaction
+from src.repository.transaction_repo import fetch_transaction
+
+def test_fetch_transaction_valid(db_session, valid_transaction_in_db: Transaction):
+    """
+    Test finding a transaction by its ID.
+    """
+    id = valid_transaction_in_db.id
+    transaction = fetch_transaction(db_session, id)
+    assert transaction is not None
+    assert transaction.id == id
+    assert transaction.fraud_details is None, "Transaction should not have fraud details"
+
+def test_fetch_transaction_fraudulent(db_session, fraudulent_transaction_in_db: Transaction):
+    """
+    Test finding a transaction by its ID.
+    """
+    id = fraudulent_transaction_in_db.id
+    transaction = fetch_transaction(db_session, id)
+    assert transaction is not None
+    assert transaction.id == id
+    assert transaction.fraud_details is not None, "Transaction should have fraud details"