Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.github/workflows/run-tests.yml

.github/workflows/deploy-pr.yaml

@@ -12,25 +12,7 @@ jobs:
   test:
     name: Run Python Tests
     if: github.event.action != 'closed'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Run tests with pytest
-        run: pytest
-        working-directory: ./7project/backend
+    uses: ./.github/workflows/run-tests.yml
 
   build:
     if: github.event.action != 'closed'

.github/workflows/deploy-prod.yaml

@@ -23,26 +23,7 @@ concurrency:
 jobs:
   test:
     name: Run Python Tests
-    if: github.event.action != 'closed'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-
-      - name: Set up Python 3.11
-        uses: actions/setup-python@v5
-        with:
-          python-version: '3.11'
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-
-      - name: Run tests with pytest
-        run: pytest
-        working-directory: ./7project/backend
+    uses: ./.github/workflows/run-tests.yml
 
   build:
     name: Build and push image (reusable)

.github/workflows/run-tests.yml

@@ -2,47 +2,45 @@ name: Run Python Tests
 permissions:
   contents: read
 
-# -----------------
-# --- Triggers ----
-# -----------------
-# This section defines when the workflow will run.
 on:
-  # Run on every push to the 'main' branch
-  push:
-    branches: [ "main", "30-create-tests-and-set-up-a-github-pipeline" ]
-  # Also run on every pull request that targets the 'main' branch
-  pull_request:
-    branches: [ "main" ]
+  workflow_call:
 
-# -----------------
-# ------ Jobs -----
-# -----------------
-# A workflow is made up of one or more jobs that can run in parallel or sequentially.
 jobs:
-  # A descriptive name for your job
   build-and-test:
-    # Specifies the virtual machine to run the job on. 'ubuntu-latest' is a common and cost-effective choice.
     runs-on: ubuntu-latest
 
-    # -----------------
-    # ----- Steps -----
-    # -----------------
-    # A sequence of tasks that will be executed as part of the job.
+    services:
+      mariadb:
+        image: mariadb:11.4
+        env:
+          MARIADB_ROOT_PASSWORD: rootpw
+          MARIADB_DATABASE: group_project
+          MARIADB_USER: appuser
+          MARIADB_PASSWORD: apppass
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="mariadb-admin ping -h 127.0.0.1 -u root -prootpw --silent"
+          --health-interval=5s
+          --health-timeout=2s
+          --health-retries=20
+
+    env:
+      MARIADB_HOST: 127.0.0.1
+      MARIADB_PORT: "3306"
+      MARIADB_DB: group_project
+      MARIADB_USER: appuser
+      MARIADB_PASSWORD: apppass
+
     steps:
-      # Step 1: Check out your repository's code
-      # This action allows the workflow to access your code.
       - name: Check out repository code
         uses: actions/checkout@v4
 
-      # Step 2: Set up the Python environment
-      # This action installs a specific version of Python on the runner.
       - name: Set up Python 3.11
         uses: actions/setup-python@v5
         with:
-          python-version: '3.11' # Use the Python version that matches your project
+          python-version: '3.11'
 
-      # Step 3: Install project dependencies
-      # Runs shell commands to install the libraries listed in your requirements.txt.
       - name: Add test dependencies to requirements
         run: |
           echo "pytest==8.4.2" >> ./7project/backend/requirements.txt
@@ -52,9 +50,12 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r ./7project/backend/requirements.txt
-      
-      # Step 4: Run your tests!
-      # Executes the pytest command to run your test suite.
+
+      - name: Run Alembic migrations
+        run: |
+          alembic upgrade head
+        working-directory: ./7project/backend
+
       - name: Run tests with pytest
         run: pytest
         working-directory: ./7project/backend

7project/backend/alembic/env.py

@@ -25,7 +25,8 @@ if not DATABASE_URL:
 
 SYNC_DATABASE_URL = DATABASE_URL.replace("+asyncmy", "+pymysql")
 
-ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
+host_env = os.getenv("MARIADB_HOST", "localhost")
+ssl_enabled = host_env not in {"localhost", "127.0.0.1"}
 connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
 
 def run_migrations_offline() -> None:

7project/backend/app/api/auth.py

@@ -24,6 +24,23 @@ async def delete_me(
     await user_manager.delete(user)
 
 # Keep existing paths as-is under /auth/* and /users/*
+from fastapi import Request, Response
+from app.core.security import revoke_token, extract_bearer_token
+
+
+@router.post(
+    "/auth/jwt/logout",
+    status_code=status.HTTP_204_NO_CONTENT,
+    tags=["auth"],
+    summary="Log out and revoke current token",
+)
+async def custom_logout(request: Request) -> Response:
+    """Revoke the current bearer token so it cannot be used anymore."""
+    token = extract_bearer_token(request)
+    if token:
+        revoke_token(token)
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
+
 router.include_router(
     fastapi_users.get_auth_router(auth_backend), prefix="/auth/jwt", tags=["auth"]
 )

7project/backend/app/app.py

@@ -16,6 +16,8 @@ from app.api.csas import router as csas_router
 from app.api.categories import router as categories_router
 from app.api.transactions import router as transactions_router
 from app.services.user_service import auth_backend, current_active_verified_user, fastapi_users, get_oauth_provider, UserManager, get_jwt_strategy
+from app.core.security import extract_bearer_token, is_token_revoked, decode_and_verify_jwt
+from app.services.user_service import SECRET
 
 
 from fastapi import FastAPI
@@ -49,6 +51,23 @@ fastApi.include_router(categories_router)
 fastApi.include_router(transactions_router)
 
 logging.basicConfig(filename='app.log', level=logging.INFO, format='%(asctime)s %(message)s')
+@fastApi.middleware("http")
+async def auth_guard(request: Request, call_next):
+    # Enforce revoked/expired JWTs are rejected globally
+    token = extract_bearer_token(request)
+    if token:
+        from fastapi import Response, status as _status
+        # Deny if token is revoked
+        if is_token_revoked(token):
+            return Response(status_code=_status.HTTP_401_UNAUTHORIZED)
+        # Deny if token is expired or invalid
+        try:
+            decode_and_verify_jwt(token, SECRET)
+        except Exception:
+            return Response(status_code=_status.HTTP_401_UNAUTHORIZED)
+    return await call_next(request)
+
+
 @fastApi.middleware("http")
 async def log_traffic(request: Request, call_next):
     start_time = datetime.now()

7project/backend/app/core/db.py

@@ -19,7 +19,8 @@ from app.models.user import User
 from app.models.transaction import Transaction
 from app.models.categories import Category
 
-ssl_enabled = os.getenv("MARIADB_HOST", "localhost") != "localhost"
+host_env = os.getenv("MARIADB_HOST", "localhost")
+ssl_enabled = host_env not in {"localhost", "127.0.0.1"}
 connect_args = {"ssl": {"ssl": True}} if ssl_enabled else {}
 
 engine = create_async_engine(

7project/backend/app/core/security.py

@@ -0,0 +1,52 @@
+from typing import Optional
+import re
+import jwt
+from fastapi import Request
+
+# Simple in-memory revocation store for revoked JWT tokens.
+# 
+# Limitations:
+# - All revoked tokens will be lost if the process restarts (data loss on restart).
+# - Not suitable for multi-instance deployments: the revocation list is not shared between instances.
+#   A token revoked in one instance will not be recognized as revoked in others.
+# 
+# For production, use a persistent and shared store (e.g., Redis or a database).
+_REVOKED_TOKENS: set[str] = set()
+
+# Bearer token regex
+_BEARER_RE = re.compile(r"^[Bb]earer\s+(.+)$")
+
+
+def extract_bearer_token(request: Request) -> Optional[str]:
+    auth = request.headers.get("authorization")
+    if not auth:
+        return None
+    m = _BEARER_RE.match(auth)
+    if not m:
+        return None
+    return m.group(1).strip()
+
+
+def revoke_token(token: str) -> None:
+    if token:
+        _REVOKED_TOKENS.add(token)
+
+
+def is_token_revoked(token: str) -> bool:
+    return token in _REVOKED_TOKENS
+
+
+def decode_and_verify_jwt(token: str, secret: str) -> dict:
+    """
+    Decode the JWT using the shared secret, verifying expiration and signature.
+    Audience is not verified here to be compatible with fastapi-users default tokens.
+    Raises jwt.ExpiredSignatureError if expired.
+    Raises jwt.InvalidTokenError for other issues.
+    Returns the decoded payload dict on success.
+    """
+    return jwt.decode(
+        token,
+        secret,
+        algorithms=["HS256"],
+        options={"verify_aud": False},
+    )  # verify_exp is True by default

7project/backend/app/services/bank_scraper.py

@@ -1,18 +1,17 @@
 import json
 import logging
 from os.path import dirname, join
-from time import strptime
 from uuid import UUID
 
 import httpx
 from sqlalchemy import select
 
 from app.core.db import async_session_maker
-from app.models.transaction import Transaction
 from app.models.user import User
 
 logger = logging.getLogger(__name__)
 
+# Reuse CSAS mTLS certs used by OAuth profile calls
 OAUTH_DIR = join(dirname(__file__), "..", "oauth")
 CERTS = (
     join(OAUTH_DIR, "public_key.pem"),
@@ -21,6 +20,10 @@ CERTS = (
 
 
 async def aload_ceska_sporitelna_transactions(user_id: str) -> None:
+    """
+    Async entry point to load Česká spořitelna transactions for a single user.
+    Validates the user_id and performs a minimal placeholder action.
+    """
     try:
         uid = UUID(str(user_id))
     except Exception:
@@ -31,6 +34,9 @@ async def aload_ceska_sporitelna_transactions(user_id: str) -> None:
 
 
 async def aload_all_ceska_sporitelna_transactions() -> None:
+    """
+    Async entry point to load Česká spořitelna transactions for all users.
+    """
     async with async_session_maker() as session:
         result = await session.execute(select(User))
         users = result.unique().scalars().all()
@@ -48,7 +54,7 @@ async def aload_all_ceska_sporitelna_transactions() -> None:
 
 
 async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
-    async with (async_session_maker() as session):
+    async with async_session_maker() as session:
         result = await session.execute(select(User).where(User.id == user_id))
         user: User = result.unique().scalar_one_or_none()
         if user is None:
@@ -100,22 +106,16 @@ async def _aload_ceska_sporitelna_transactions(user_id: UUID) -> None:
                 if response.status_code != httpx.codes.OK:
                     continue
 
+                # Placeholder: just print the account transactions
+
                 transactions = response.json()["transactions"]
+                pass
 
             for transaction in transactions:
-                description = transaction.get("entryDetails", {}).get("transactionDetails", {}).get(
-                    "additionalRemittanceInformation")
-                date_str = transaction.get("bookingDate", {}).get("date")
-                date = strptime(date_str, "%Y-%m-%d") if date_str else None
+                #parse and store transaction to database
+                #create Transaction object and save to DB
+                #obj =
 
-                obj = Transaction(
-                    amount=transaction['amount']['value'],
-                    description=description,
-                    date=date,
-                    user_id=user_id,
-                )
-                session.add(obj)
-                await session.commit()
 
                 pass
             pass

7project/backend/pyproject.toml

@@ -1,2 +1,5 @@
 [tool.pytest.ini_options]
-pythonpath = "."
+pythonpath = "."
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "session"
+asyncio_default_test_loop_scope = "session"

7project/backend/tests/conftest.py

@@ -1,7 +1,9 @@
 import sys
+import uuid
 import types
 import pytest
 from fastapi.testclient import TestClient
+from httpx import AsyncClient, ASGITransport
 
 # Stub sentry_sdk to avoid optional dependency issues during import of app
 stub = types.ModuleType("sentry_sdk")
@@ -20,3 +22,23 @@ def fastapi_app():
 @pytest.fixture(scope="session")
 def client(fastapi_app):
     return TestClient(fastapi_app, raise_server_exceptions=True)
+
+
+@pytest.fixture(scope="function")
+async def test_user(fastapi_app):
+    """
+    Creates a new user asynchronously and returns their credentials.
+    Does NOT log them in.
+    Using AsyncClient with ASGITransport avoids event loop conflicts with DB connections.
+    """
+    unique_email = f"testuser_{uuid.uuid4()}@example.com"
+    password = "a_strong_password"
+    user_payload = {"email": unique_email, "password": password}
+
+    transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        response = await ac.post("/auth/register", json=user_payload)
+        assert response.status_code == 201
+
+    return {"username": unique_email, "password": password}
+

7project/backend/tests/test_e2e_auth_flow.py

@@ -1,3 +1,6 @@
+import pytest
+import uuid
+from httpx import AsyncClient, ASGITransport
 from fastapi import status
 
 
@@ -13,3 +16,83 @@ def test_e2e_minimal_auth_flow(client):
     # 3) Protected endpoint should not be accessible without token
     me = client.get("/users/me")
     assert me.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)
+
+
+@pytest.mark.asyncio
+async def test_e2e_full_user_lifecycle(fastapi_app, test_user):
+    # Use an AsyncClient with ASGITransport for async tests
+    transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        login_payload = test_user
+
+        # 1. Log in with the new credentials
+        login_resp = await ac.post("/auth/jwt/login", data=login_payload)
+        assert login_resp.status_code == status.HTTP_200_OK
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # 2. Access a protected endpoint
+        me_resp = await ac.get("/users/me", headers=headers)
+        assert me_resp.status_code == status.HTTP_200_OK
+        assert me_resp.json()["email"] == test_user["username"]
+
+        # 3. Update the user's profile
+        update_payload = {"first_name": "Test"}
+        patch_resp = await ac.patch("/users/me", json=update_payload, headers=headers)
+        assert patch_resp.status_code == status.HTTP_200_OK
+        assert patch_resp.json()["first_name"] == "Test"
+
+        # 4. Log out
+        logout_resp = await ac.post("/auth/jwt/logout", headers=headers)
+        assert logout_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)
+
+        # 5. Verify token is invalid
+        me_again_resp = await ac.get("/users/me", headers=headers)
+        assert me_again_resp.status_code == status.HTTP_401_UNAUTHORIZED
+
+
+@pytest.mark.asyncio
+async def test_e2e_transaction_workflow(fastapi_app, test_user):
+    transport = ASGITransport(app=fastapi_app, raise_app_exceptions=True)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        # 1. Log in to get the token
+        login_resp = await ac.post("/auth/jwt/login", data=test_user)
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # NEW STEP: Create a category first to get a valid ID
+        category_payload = {"name": "Test Category for E2E"}
+        create_category_resp = await ac.post("/categories/create", json=category_payload, headers=headers)
+        assert create_category_resp.status_code == status.HTTP_201_CREATED
+        category_id = create_category_resp.json()["id"]
+
+        # 2. Create a new transaction
+        tx_payload = {"amount": -55.40, "description": "Milk and eggs"}
+        tx_resp = await ac.post("/transactions/create", json=tx_payload, headers=headers)
+        assert tx_resp.status_code == status.HTTP_201_CREATED
+        tx_id = tx_resp.json()["id"]
+
+        # 3. Assign the category
+        assign_resp = await ac.post(f"/transactions/{tx_id}/categories/{category_id}", headers=headers)
+        assert assign_resp.status_code == status.HTTP_200_OK
+
+        # 4. Verify assignment
+        get_tx_resp = await ac.get(f"/transactions/{tx_id}", headers=headers)
+        assert category_id in get_tx_resp.json()["category_ids"]
+
+        # 5. Unassign the category
+        unassign_resp = await ac.delete(f"/transactions/{tx_id}/categories/{category_id}", headers=headers)
+        assert unassign_resp.status_code == status.HTTP_200_OK
+
+        # 6. Get the transaction again and verify the category is gone
+        get_tx_again_resp = await ac.get(f"/transactions/{tx_id}", headers=headers)
+        final_tx_data = get_tx_again_resp.json()
+        assert category_id not in final_tx_data["category_ids"]
+
+        # 7. Delete the transaction for cleanup
+        delete_resp = await ac.delete(f"/transactions/{tx_id}/delete", headers=headers)
+        assert delete_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)
+
+        # NEW STEP: Clean up the created category
+        delete_category_resp = await ac.delete(f"/categories/{category_id}", headers=headers)
+        assert delete_category_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)

7project/backend/tests/test_integration_app.py

@@ -1,5 +1,6 @@
 from fastapi import status
 import pytest
+from httpx import AsyncClient, ASGITransport
 
 
 def test_root_ok(client):
@@ -13,6 +14,53 @@ def test_authenticated_route_requires_auth(client):
     assert resp.status_code in (status.HTTP_401_UNAUTHORIZED, status.HTTP_403_FORBIDDEN)
 
 
-def test_sentry_debug_raises_exception(client):
-    with pytest.raises(ZeroDivisionError):
-        client.get("/sentry-debug")
+@pytest.mark.asyncio
+async def test_create_and_get_category(fastapi_app, test_user):
+    # Use AsyncClient for async tests
+    transport = ASGITransport(app=fastapi_app)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        # 1. Log in to get an auth token
+        login_resp = await ac.post("/auth/jwt/login", data=test_user)
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # 2. Define and create the new category
+        category_name = "Async Integration Test"
+        category_payload = {"name": category_name}
+        create_resp = await ac.post("/categories/create", json=category_payload, headers=headers)
+
+        # 3. Assert creation was successful
+        assert create_resp.status_code == status.HTTP_201_CREATED
+        created_data = create_resp.json()
+        category_id = created_data["id"]
+        assert created_data["name"] == category_name
+
+        # 4. GET the list of categories to verify
+        list_resp = await ac.get("/categories/", headers=headers)
+        assert list_resp.status_code == status.HTTP_200_OK
+
+        # 5. Check that our new category is in the list
+        categories_list = list_resp.json()
+        assert any(cat["name"] == category_name for cat in categories_list)
+
+        delete_resp = await ac.delete(f"/categories/{category_id}", headers=headers)
+        assert delete_resp.status_code in (status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)
+
+
+@pytest.mark.asyncio
+async def test_create_transaction_missing_amount_fails(fastapi_app, test_user):
+    transport = ASGITransport(app=fastapi_app)
+    async with AsyncClient(transport=transport, base_url="http://testserver") as ac:
+        # 1. Log in to get an auth token
+        login_resp = await ac.post("/auth/jwt/login", data=test_user)
+        token = login_resp.json()["access_token"]
+        headers = {"Authorization": f"Bearer {token}"}
+
+        # 2. Define an invalid payload
+        invalid_payload = {"description": "This should fail"}
+
+        # 3. Attempt to create the transaction
+        resp = await ac.post("/transactions/create", json=invalid_payload, headers=headers)
+
+        # 4. Assert the expected validation error
+        assert resp.status_code == status.HTTP_422_UNPROCESSABLE_ENTITY

7project/backend/tests/test_unit_user_service.py

@@ -19,7 +19,7 @@ def test_get_oauth_provider_known_unknown():
 def test_get_jwt_strategy_lifetime():
     strategy = user_service.get_jwt_strategy()
     assert strategy is not None
-    # Basic smoke check: strategy has a lifetime set to 3600
+    # Basic smoke check: strategy has a lifetime set to 604800
     assert getattr(strategy, "lifetime_seconds", None) in (604800,)
 
 

7project/checklist.md

@@ -7,64 +7,64 @@ Focus on areas that align with your project goals and interests.
 The core deliverables are required.
 This means that you must get at least 2 points for each item in this category.
 
-| **Category**                     | **Item**                                | **Max Points** | **Points**       |
-| -------------------------------- | --------------------------------------- | -------------- | ---------------- |
-| **Core Deliverables (Required)** |                                         |                |                  |
-| Codebase & Organization          | Well-organized project structure        | 5              |                  |
-|                                  | Clean, readable code                    | 5              |                  |
-|                                  | Use planning tool (e.g., GitHub issues) | 5              |                  |
-|                                  | Proper version control usage            | 5              |                  |
-|                                  | Complete source code                    | 5              |                  |
-| Documentation                    | Comprehensive reproducibility report    | 10             |                  |
-|                                  | Updated design document                 | 5              |                  |
-|                                  | Clear build/deployment instructions     | 5              |                  |
-|                                  | Troubleshooting guide                   | 5              |                  |
-|                                  | Completed self-assessment table         | 5              |                  |
-|                                  | Hour sheets for all members             | 5              |                  |
-| Presentation Video               | Project demonstration                   | 5              |                  |
-|                                  | Code walk-through                       | 5              |                  |
-|                                  | Deployment showcase                     | 5              |                  |
-| **Technical Implementation**     |                                         |                |                  |
-| Application Functionality        | Basic functionality works               | 10             |                  |
-|                                  | Advanced features implemented           | 10             |                  |
-|                                  | Error handling & robustness             | 10             |                  |
-|                                  | User-friendly interface                 | 5              |                  |
-| Backend & Architecture           | Stateless web server                    | 5              |                  |
-|                                  | Stateful application                    | 10             |                  |
-|                                  | Database integration                    | 10             |                  |
-|                                  | API design                              | 5              |                  |
-|                                  | Microservices architecture              | 10             |                  |
-| Cloud Integration                | Basic cloud deployment                  | 10             |                  |
-|                                  | Cloud APIs usage                        | 10             |                  |
-|                                  | Serverless components                   | 10             |                  |
-|                                  | Advanced cloud services                 | 5              |                  |
-| **DevOps & Deployment**          |                                         |                |                  |
-| Containerization                 | Basic Dockerfile                        | 5              |                  |
-|                                  | Optimized Dockerfile                    | 5              |                  |
-|                                  | Docker Compose                          | 5              |                  |
-|                                  | Persistent storage                      | 5              |                  |
-| Deployment & Scaling             | Manual deployment                       | 5              |                  |
-|                                  | Automated deployment                    | 5              |                  |
-|                                  | Multiple replicas                       | 5              |                  |
-|                                  | Kubernetes deployment                   | 10             |                  |
-| **Quality Assurance**            |                                         |                |                  |
-| Testing                          | Unit tests                              | 5              |                  |
-|                                  | Integration tests                       | 5              |                  |
-|                                  | End-to-end tests                        | 5              |                  |
-|                                  | Performance testing                     | 5              |                  |
-| Monitoring & Operations          | Health checks                           | 5              |                  |
-|                                  | Logging                                 | 5              |                  |
-|                                  | Metrics/Monitoring                      | 5              |                  |
-| Security                         | HTTPS/TLS                               | 5              |                  |
-|                                  | Authentication                          | 5              |                  |
-|                                  | Authorization                           | 5              |                  |
-| **Innovation & Excellence**      |                                         |                |                  |
-| Advanced Features and            | AI/ML Integration                       | 10             |                  |
-| Technical Excellence             | Real-time features                      | 10             |                  |
-|                                  | Creative problem solving                | 10             |                  |
-|                                  | Performance optimization                | 5              |                  |
-|                                  | Exceptional user experience             | 5              |                  |
-| **Total**                        |                                         | **255**        | **[Your Total]** |
+| **Category**                     | **Item**                                | **Max Points** | **Points**                                      |
+|----------------------------------| --------------------------------------- | -------------- |-------------------------------------------------|
+| **Core Deliverables (Required)** |                                         |                |                                                 |
+| Codebase & Organization          | Well-organized project structure        | 5              | 5                                               |
+|                                  | Clean, readable code                    | 5              | 4                                               |
+|                                  | Use planning tool (e.g., GitHub issues) | 5              | 4                                               |
+|                                  | Proper version control usage            | 5              | 5                                               |
+| 23                               | Complete source code                    | 5              | 5                                               |
+| Documentation                    | Comprehensive reproducibility report    | 10             | 4-5                                             |
+|                                  | Updated design document                 | 5              | 2                                               |
+|                                  | Clear build/deployment instructions     | 5              | 2                                               |
+|                                  | Troubleshooting guide                   | 5              | 1                                               |
+|                                  | Completed self-assessment table         | 5              | 2                                               |
+| 14                               | Hour sheets for all members             | 5              | 3                                               |
+| Presentation Video               | Project demonstration                   | 5              | 0                                               |
+|                                  | Code walk-through                       | 5              | 0                                               |
+| 0                                | Deployment showcase                     | 5              | 0                                               |
+| **Technical Implementation**     |                                         |                |                                                 |
+| Application Functionality        | Basic functionality works               | 10             | 8                                               |
+|                                  | Advanced features implemented           | 10             | 0                                               |
+|                                  | Error handling & robustness             | 10             | 4                                               |
+| 16                               | User-friendly interface                 | 5              | 4                                               |
+| Backend & Architecture           | Stateless web server                    | 5              | 5                                               |
+|                                  | Stateful application                    | 10             | ? WHAT DOES THIS MEAN                           |
+|                                  | Database integration                    | 10             | 10                                              |
+|                                  | API design                              | 5              | 5                                               |
+| 20                               | Microservices architecture              | 10             | 0                                               |
+| Cloud Integration                | Basic cloud deployment                  | 10             | 10                                              |
+|                                  | Cloud APIs usage                        | 10             | ? WHAT DOES THIS MEAN                           |
+|                                  | Serverless components                   | 10             | 0                                               |
+| 10                               | Advanced cloud services                 | 5              | 0                                               |
+| **DevOps & Deployment**          |                                         |                |                                                 |
+| Containerization                 | Basic Dockerfile                        | 5              | 5                                               |
+|                                  | Optimized Dockerfile                    | 5              | 0                                               |
+|                                  | Docker Compose                          | 5              | 5 - dev only                                    |
+| 15                               | Persistent storage                      | 5              | 5                                               |
+| Deployment & Scaling             | Manual deployment                       | 5              | 5                                               |
+|                                  | Automated deployment                    | 5              | 5                                               |
+|                                  | Multiple replicas                       | 5              | 5                                               |
+| 20                               | Kubernetes deployment                   | 10             | 10                                              |
+| **Quality Assurance**            |                                         |                |                                                 |
+| Testing                          | Unit tests                              | 5              | 2                                               |
+|                                  | Integration tests                       | 5              | 2                                               |
+|                                  | End-to-end tests                        | 5              | 5                                               |
+| 9                                | Performance testing                     | 5              | 0                                               |
+| Monitoring & Operations          | Health checks                           | 5              | 5                                               |
+|                                  | Logging                                 | 5              | 2 - only to terminal add logstash               |
+| 9                                | Metrics/Monitoring                      | 5              | 2 - only DB, need to create Prometheus endpoint |
+| Security                         | HTTPS/TLS                               | 5              | 5                                               |
+|                                  | Authentication                          | 5              | 5                                               |
+| 15                               | Authorization                           | 5              | 5                                               |
+| **Innovation & Excellence**      |                                         |                |                                                 |
+| Advanced Features and            | AI/ML Integration                       | 10             | 0                                               |
+| Technical Excellence             | Real-time features                      | 10             | 0                                               |
+|                                  | Creative problem solving                | 10             | ?                                               |
+|                                  | Performance optimization                | 5              | 2                                               |
+| 2                                | Exceptional user experience             | 5              | 0                                               |
+| **Total**                        |                                         | **255**        | **153**                                         |
 
 ## Grading Scale