Unittest

.gitignore

@@ -68,6 +68,7 @@ Thumbs.db
 !.gitignore
 !.nvmrc
 !.phpcs.xml.dist
+!.github/
 
 # dependencies
 /.pnp

backend/app.py

@@ -1,12 +1,13 @@
 from flask import request, jsonify, make_response
-from config import app, db
-from auth import (
+from backend.config import app, db
+from backend.auth import (
     user_auth_register,
     user_auth_login,
     user_auth_logout,
     user_auth_validate_session_token,
     user_auth_validate_csrf_token,
 )
+from backend.classes.user import User
 import re
 
 
@@ -160,6 +161,7 @@ async def validate_token():
 if __name__ == "__main__":
     with app.app_context():
         db.create_all()
+        User.backup()
 
     # Run Flask server in debug mode on port 4000 for local testing
     app.run(host="0.0.0.0", port=4000, debug=True)

backend/auth.py

@@ -1,7 +1,7 @@
-from classes.user import User
+from backend.classes.user import User
 from flask import abort
 import re
-from data import users
+from backend.data import users
 
 
 def name_auth(name: str) -> bool:
@@ -67,13 +67,13 @@ def email_auth(email: str) -> bool:
         400 Error: If email does not meet required format.
     """
     # Regular expression for basic email validation.
-    email_pattern = r"^[0-9a-z]+([0-9a-z]*[-._+])*[0-9a-z]+@[0-9a-z]+([-.][0-9a-z]+)*([0-9a-z]*[.])[a-z]{2,6}$"
+    email_pattern = r"^[0-9a-z]+([0-9a-z]*[-._+])*[0-9a-z]+@[0-9a-z]+([-.][0-9a-z]+)*([0-9a-z]*[.])[a-z]{2,8}$"
 
-    if re.match(email_pattern, email) and 3 <= len(email) <= 255:
+    if re.match(email_pattern, email) and 3 <= len(email) <= 320:
         return True
     abort(
         400,
-        description="Email must start with letters or numbers, include @ and a valid domain, have a 2-6 character extension, and be 3-320 characters long.",
+        description="Email must start with letters or numbers, include @ and a valid domain, have a 2-8 character extension, and be 3-320 characters long.",
     )
 
 
@@ -146,11 +146,7 @@ async def user_auth_login(email: str, pwd_input: str) -> str:
     safe_pwd = re.escape(pwd_input)
 
     if safe_email not in users:
-        potential_user = User.from_email(safe_email)
-        if not potential_user:
-            abort(401, description="Email does not exist")
-        else:
-            users[safe_email] = potential_user
+        abort(401, description="Email does not exist")
 
     user: User = users[safe_email]
 

backend/classes/user.py

@@ -2,8 +2,8 @@
 from cryptography.fernet import Fernet
 import secrets
 import re
-from db.user_db import UserDB
-from config import db
+from backend.db.user_db import UserDB
+from backend.config import db
 import os
 from typing import Optional
 
@@ -55,18 +55,21 @@ def __init__(
         self.set_csrf_token(self.generate_csrf_token())
 
     @classmethod
-    def from_email(cls, user_email: str) -> Optional["User"]:
+    def backup(cls) -> dict["User"]:
         """
-        Loads an existing user from UserDB by user email.
+        Return a dictionary of existing user from UserDB.
         """
-        user_record = UserDB.query.filter_by(email=user_email).first()
+        user_record = UserDB.query.all()
         if not user_record:
             return None
 
-        user_obj = cls.__new__(cls)  # Avoid calling __init__
-        user_obj.set_user_pk(user_record.id)
-        user_obj.set_session_token(user_obj.generate_session_token())
-        user_obj.set_csrf_token(user_obj.generate_csrf_token())
+        user_dict = {}
+        for user in user_record:
+            user_obj = cls.__new__(cls)
+            user_obj.set_user_pk(user.id)
+            user_obj.set_session_token(user_obj.generate_session_token())
+            user_obj.set_csrf_token(user_obj.generate_csrf_token())
+            user_dict[user.email] = user_obj
 
         return user_obj
 
@@ -248,3 +251,45 @@ def get_last_name(self) -> str:
         Returns the user's last name.
         """
         return UserDB.query.filter_by(id=self.get_user_pk()).first().last_name
+
+    def get_email(self) -> str:
+        """
+        Returns the user's email.
+        """
+        return UserDB.query.filter_by(id=self.get_user_pk()).first().email
+
+    def get_password(self) -> str:
+        """
+        Returns the user's password.
+        """
+        return UserDB.query.filter_by(id=self.get_user_pk()).first().password
+
+    def set_password(self, new_pwd: str) -> None:
+        """
+        Sets the user's password.
+        """
+        UserDB.query.filter_by(id=self.get_user_pk()).first().password = new_pwd
+        db.session.commit()
+
+    def set_first_name(self, new_first_name: str) -> None:
+        """
+        Sets the user's first name.
+        """
+        UserDB.query.filter_by(id=self.get_user_pk()).first().first_name = (
+            new_first_name
+        )
+        db.session.commit()
+
+    def set_last_name(self, new_last_name: str) -> None:
+        """
+        Sets the user's last name.
+        """
+        UserDB.query.filter_by(id=self.get_user_pk()).first().last_name = new_last_name
+        db.session.commit()
+
+    def set_email(self, new_email: str) -> None:
+        """
+        Sets the user's email.
+        """
+        UserDB.query.filter_by(id=self.get_user_pk()).first().email = new_email
+        db.session.commit()

backend/db/user_db.py

@@ -1,4 +1,4 @@
-from config import db
+from backend.config import db
 
 
 class UserDB(db.Model):

backend/flask.dockerfile

@@ -4,7 +4,7 @@ WORKDIR /app
 
 COPY requirements.txt ./
 
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --upgrade pip && pip install --no-cache-dir -r requirements.txt
 
 COPY . .
 
@@ -14,7 +14,8 @@ ENV FLASK_RUN_HOST=0.0.0.0
 ENV FLASK_RUN_PORT=4000
 ENV FLASK_DEBUG=1
 ENV PYTHONUNBUFFERED=1
+ENV PYTHONPATH=/app
 
 EXPOSE 4000
 
-CMD [ "python","-u","app.py" ]
+CMD [ "python","-u","backend/app.py" ]

backend/requirements.txt

@@ -3,4 +3,5 @@ psycopg2-binary
 Flask-SQLAlchemy
 Flask-CORS
 cryptography
-asgiref
+asgiref
+pytest-asyncio

compose.yml

@@ -11,7 +11,7 @@ services:
     environment:
       - NEXT_PUBLIC_API_URL=http://localhost:4000/
     volumes:
-      - ./frontend:/app
+      - ./frontend:/app/frontend
       - /app/node_modules
     depends_on:
       - flaskapp
@@ -30,9 +30,9 @@ services:
       - FLASK_ENV=development
       - USER_FERNET_KEY=${USER_FERNET_KEY}
       - SECRET_KEY=${SECRET_KEY}
-    command: ["python","app.py"]
+    command: ["python","-u", "backend/app.py"]
     volumes:
-      - ./backend:/app
+      - ./backend:/app/backend
     depends_on:
       - db
 
@@ -49,5 +49,26 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
 
+  # Test service to run pytest in the full environment
+  tests:
+    container_name: tests
+    build:
+      context: ./tests
+      dockerfile: tests.dockerfile
+    environment:
+      # Ensure absolute imports work by pointing PYTHONPATH to /app (the project root)
+      - PYTHONPATH=/app
+      - DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@db:5432/${DB_NAME}
+      - USER_FERNET_KEY=${USER_FERNET_KEY}
+      - SECRET_KEY=${SECRET_KEY}
+    volumes:
+      - ./backend:/app/backend
+      - ./tests:/app/tests
+      - ./.env:/app/.env
+    command: ["pytest", "tests"]
+    depends_on:
+      - db
+      - flaskapp
+
 volumes:
   pgdata: {}

tests/requirements.txt

@@ -0,0 +1,7 @@
+flask
+psycopg2-binary
+Flask-SQLAlchemy
+Flask-CORS
+cryptography
+asgiref
+pytest-asyncio