test: setup pytest | pytest for users apis

app/engine/postgresdb.py

@@ -5,6 +5,7 @@ from typing import Any, AsyncIterator
 from sqlalchemy.ext.asyncio import (
     AsyncConnection,
     AsyncSession,
+    AsyncEngine,
     async_sessionmaker,
     create_async_engine,
 )
@@ -19,7 +20,11 @@ Base = declarative_base()
 
 class PostgresDatabase:
 
-    def __init__(self, host: str, engine_kwargs: dict[str, Any] = {}):
+    def __init__(self):
+        self._engine: AsyncEngine | None = None
+        self._sessionmaker: async_sessionmaker | None = None
+
+    def init(self, host: str, engine_kwargs: dict[str, Any] = {}):
         self._engine = create_async_engine(host, **engine_kwargs)
         self._sessionmaker = async_sessionmaker(autocommit=False, bind=self._engine)
 
@@ -60,8 +65,15 @@ class PostgresDatabase:
     def get_engine(self):
         return self._engine
 
+    # Used for testing
+    async def create_all(self, connection: AsyncConnection):
+        await connection.run_sync(Base.metadata.create_all)
+
+    async def drop_all(self, connection: AsyncConnection):
+        await connection.run_sync(Base.metadata.drop_all)
+
 
-postgresdb = PostgresDatabase(env.SQLALCHEMY_DATABASE_URL, {"echo": True, "future": True})
+postgresdb = PostgresDatabase()
 
 
 async def get_db_session():

app/model/user.py

@@ -5,6 +5,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.model.base import BaseModel
 from app.engine.postgresdb import Base
+from app.schema.index import UserCreate, UserUpdate
 
 logger = logging.getLogger(__name__)
 
@@ -20,25 +21,62 @@ class User(Base, BaseModel):
     transactions = relationship("Transaction", back_populates="user")
 
     @classmethod
-    async def create(cls: "type[User]", db: AsyncSession, **kwargs) -> "User":
-        logging.info(f"Creating user: {kwargs}")
-        query = sql.insert(cls).values(**kwargs)
-        users = await db.scalars(query)
-        user = users.first()
-        logging.info(f"User created: {users.first()}")
+    async def create(cls: "type[User]", db: AsyncSession, **kwargs: UserCreate) -> "User":
+        """
+        Creates a new user in the database.
+
+        Args:
+            cls (type[User]): The class object representing the User model.
+            db (AsyncSession): The asynchronous session object for interacting with the database.
+            **kwargs (UserCreate): The keyword arguments representing the user's attributes.
+
+        Returns:
+            User
+        """
+
+        print(f"Creating user: {kwargs}")
+        # query = sql.insert(cls).values(**kwargs)
+        user = cls(name=kwargs["name"], email=kwargs["email"], hashed_password=kwargs["hashed_password"])
+        db.add(user)
         await db.commit()
+        await db.refresh(user)
         return user
 
     @classmethod
-    async def update(cls: "type[User]", db: AsyncSession, id: int, **kwargs) -> "User":
+    async def update(cls: "type[User]", db: AsyncSession, id: int, **kwargs: UserUpdate) -> "User":
+        """
+        Updates a user in the database with the given ID and keyword arguments.
+
+        Args:
+            cls (type[User]): The class object representing the User model.
+            db (AsyncSession): The asynchronous session object for interacting with the database.
+            id (int): The ID of the user to update.
+            **kwargs (UserUpdate): The keyword arguments representing the user's attributes to update.
+
+        Returns:
+            User
+        """
+
         query = sql.update(cls).where(cls.id == id).values(**kwargs).execution_options(synchronize_session="fetch")
-        users = await db.scalars(query)
-        user = users.first()
+        results = await db.execute(query)
+        user = results.fetchone()
         await db.commit()
         return user
 
     @classmethod
     async def get(cls: "type[User]", db: AsyncSession, email: str) -> "User":
+        """
+        Retrieves a user from the database based on their email.
+
+        Args:
+            cls (type[User]): The class object representing the User model.
+            db (AsyncSession): The asynchronous session object for interacting with the database.
+            email (str): The email of the user to retrieve.
+
+        Returns:
+            User
+        """
+
         logging.info(f"Getting user: {email}")
         query = sql.select(cls).where(cls.email == email)
         logging.info(f"Query: {query}")
@@ -48,13 +86,24 @@ class User(Base, BaseModel):
 
     @classmethod
     async def delete(cls: "type[User]", db: AsyncSession, email: str) -> "User":
+        """
+        Deletes a user from the database based on their email.
+
+        Args:
+            cls (type[User]): The class object representing the User model.
+            db (AsyncSession): The asynchronous session object for interacting with the database.
+            email (str): The email of the user to delete.
+
+        Returns:
+            User
+        """
         query = (
             sql.update(cls)
             .where(cls.email == email)
             .values(is_deleted=True)
             .execution_options(synchronize_session="fetch")
         )
-        users = await db.scalars(query)
-        user = users.first()
+        result = await db.execute(query)
+        user = result.fetchone()
         await db.commit()
         return user

config/index.py

@@ -26,11 +26,9 @@ class Config:
     POSTGRES_USER = os.getenv("POSTGRES_USER")
     POSTGRES_PASSWORD = os.getenv("POSTGRES_PASSWORD")
     POSTGRES_DB_NAME = os.getenv("POSTGRES_DB_NAME")
-    POSTGRES_TEST_DB_NAME = os.getenv("POSTGRES_TEST_DB_NAME")
     POSTGRES_DB_HOST = os.getenv("POSTGRES_DB_HOST")
     POSTGRES_DB_PORT = os.getenv("POSTGRES_DB_PORT")
     SQLALCHEMY_DATABASE_URL = f"postgresql+asyncpg://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_DB_HOST}:{POSTGRES_DB_PORT}/{POSTGRES_DB_NAME}"
-    SQLALCHEMY_TEST_DATABASE_URL = f"postgresql+asyncpg://{POSTGRES_USER}:{POSTGRES_PASSWORD}@{POSTGRES_DB_HOST}:{POSTGRES_DB_PORT}/{POSTGRES_TEST_DB_NAME}"
 
 
 config = Config

main.py

@@ -15,40 +15,30 @@ from alembic import command
 
 
 from app.engine.postgresdb import postgresdb
-from config.index import config
+from config.index import config as env
 
 logger = logging.getLogger("uvicorn")
 
 
-def run_migrations(connection, cfg):
-    cfg.attributes["connection"] = connection
-    command.upgrade(cfg, "head")
-
-
-async def run_async_migrations():
-    logger.info("Running migrations...")
-    async_engine = postgresdb.get_engine()
-
-    async with async_engine.begin() as conn:
-        await conn.run_sync(run_migrations, Config("alembic.ini"))
-
-    logger.info("Finished running migrations")
-
+init_settings()
+# init_observability()
 
-@asynccontextmanager
-async def lifespan(app_: FastAPI):
-    yield
-    if postgresdb.get_engine() is not None:
-        await postgresdb.close()
 
+def init_app(init_db: bool = True) -> FastAPI:
+    lifespan = None
 
-init_settings()
-# init_observability()
+    if init_db:
+        postgresdb.init(env.SQLALCHEMY_DATABASE_URL, {"echo": True, "future": True})
 
+        @asynccontextmanager
+        async def lifespan(app: FastAPI):
+            yield
+            if postgresdb.get_engine() is not None:
+                await postgresdb.close()
 
-def init_app():
     app = FastAPI(lifespan=lifespan)
-    if config.ENVIRONMENT == "dev":
+
+    if env.ENVIRONMENT == "dev":
         logger.warning("Running in development mode - allowing CORS for all origins")
         app.add_middleware(
             CORSMiddleware,
@@ -75,4 +65,4 @@ if __name__ == "__main__":
     async def redirect_to_docs():
         return RedirectResponse(url="/docs")
 
-    uvicorn.run(app="main:app", host=config.APP_HOST, port=config.APP_PORT, reload=(config.ENVIRONMENT == "dev"))
+    uvicorn.run(app="main:app", host=env.APP_HOST, port=env.APP_PORT, reload=(env.ENVIRONMENT == "dev"))

poetry.lock

@@ -1697,6 +1697,20 @@ dev = ["marshmallow[tests]", "pre-commit (>=3.5,<4.0)", "tox"]
 docs = ["alabaster (==0.7.16)", "autodocsumm (==0.2.12)", "sphinx (==7.3.7)", "sphinx-issues (==4.1.0)", "sphinx-version-warning (==1.1.2)"]
 tests = ["pytest", "pytz", "simplejson"]
 
+[[package]]
+name = "mirakuru"
+version = "2.5.2"
+description = "Process executor (not only) for tests."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "mirakuru-2.5.2-py3-none-any.whl", hash = "sha256:90c2d90a8cf14349b2f33e6db30a16acd855499811e0312e56cf80ceacf2d3e5"},
+    {file = "mirakuru-2.5.2.tar.gz", hash = "sha256:41ca583d355eb7a6cfdc21c1aea549979d685c27b57239b88725434f115a7132"},
+]
+
+[package.dependencies]
+psutil = {version = ">=4.0.0", markers = "sys_platform != \"cygwin\""}
+
 [[package]]
 name = "monotonic"
 version = "1.6"
@@ -2699,6 +2713,17 @@ files = [
 dev = ["pre-commit", "tox"]
 testing = ["pytest", "pytest-benchmark"]
 
+[[package]]
+name = "port-for"
+version = "0.7.2"
+description = "Utility that helps with local TCP ports management. It can find an unused TCP localhost port and remember the association."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "port-for-0.7.2.tar.gz", hash = "sha256:074f29335130578aa42fef3726985e57d01c15189e509633a8a1b0b7f9226349"},
+    {file = "port_for-0.7.2-py3-none-any.whl", hash = "sha256:16b279ab4f210bad33515c45bd9af0c6e048ab24c3b6bbd9cfc7e451782617df"},
+]
+
 [[package]]
 name = "posthog"
 version = "3.5.0"
@@ -2742,6 +2767,129 @@ files = [
     {file = "protobuf-4.25.3.tar.gz", hash = "sha256:25b5d0b42fd000320bd7830b349e3b696435f3b329810427a6bcce6a5492cc5c"},
 ]
 
+[[package]]
+name = "psutil"
+version = "5.9.8"
+description = "Cross-platform lib for process and system monitoring in Python."
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+files = [
+    {file = "psutil-5.9.8-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:26bd09967ae00920df88e0352a91cff1a78f8d69b3ecabbfe733610c0af486c8"},
+    {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:05806de88103b25903dff19bb6692bd2e714ccf9e668d050d144012055cbca73"},
+    {file = "psutil-5.9.8-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:611052c4bc70432ec770d5d54f64206aa7203a101ec273a0cd82418c86503bb7"},
+    {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:50187900d73c1381ba1454cf40308c2bf6f34268518b3f36a9b663ca87e65e36"},
+    {file = "psutil-5.9.8-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:02615ed8c5ea222323408ceba16c60e99c3f91639b07da6373fb7e6539abc56d"},
+    {file = "psutil-5.9.8-cp27-none-win32.whl", hash = "sha256:36f435891adb138ed3c9e58c6af3e2e6ca9ac2f365efe1f9cfef2794e6c93b4e"},
+    {file = "psutil-5.9.8-cp27-none-win_amd64.whl", hash = "sha256:bd1184ceb3f87651a67b2708d4c3338e9b10c5df903f2e3776b62303b26cb631"},
+    {file = "psutil-5.9.8-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:aee678c8720623dc456fa20659af736241f575d79429a0e5e9cf88ae0605cc81"},
+    {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cb6403ce6d8e047495a701dc7c5bd788add903f8986d523e3e20b98b733e421"},
+    {file = "psutil-5.9.8-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d06016f7f8625a1825ba3732081d77c94589dca78b7a3fc072194851e88461a4"},
+    {file = "psutil-5.9.8-cp36-cp36m-win32.whl", hash = "sha256:7d79560ad97af658a0f6adfef8b834b53f64746d45b403f225b85c5c2c140eee"},
+    {file = "psutil-5.9.8-cp36-cp36m-win_amd64.whl", hash = "sha256:27cc40c3493bb10de1be4b3f07cae4c010ce715290a5be22b98493509c6299e2"},
+    {file = "psutil-5.9.8-cp37-abi3-win32.whl", hash = "sha256:bc56c2a1b0d15aa3eaa5a60c9f3f8e3e565303b465dbf57a1b730e7a2b9844e0"},
+    {file = "psutil-5.9.8-cp37-abi3-win_amd64.whl", hash = "sha256:8db4c1b57507eef143a15a6884ca10f7c73876cdf5d51e713151c1236a0e68cf"},
+    {file = "psutil-5.9.8-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:d16bbddf0693323b8c6123dd804100241da461e41d6e332fb0ba6058f630f8c8"},
+    {file = "psutil-5.9.8.tar.gz", hash = "sha256:6be126e3225486dff286a8fb9a06246a5253f4c7c53b475ea5f5ac934e64194c"},
+]
+
+[package.extras]
+test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"]
+
+[[package]]
+name = "psycopg"
+version = "3.1.19"
+description = "PostgreSQL database adapter for Python"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "psycopg-3.1.19-py3-none-any.whl", hash = "sha256:dca5e5521c859f6606686432ae1c94e8766d29cc91f2ee595378c510cc5b0731"},
+    {file = "psycopg-3.1.19.tar.gz", hash = "sha256:92d7b78ad82426cdcf1a0440678209faa890c6e1721361c2f8901f0dccd62961"},
+]
+
+[package.dependencies]
+typing-extensions = ">=4.1"
+tzdata = {version = "*", markers = "sys_platform == \"win32\""}
+
+[package.extras]
+binary = ["psycopg-binary (==3.1.19)"]
+c = ["psycopg-c (==3.1.19)"]
+dev = ["black (>=24.1.0)", "codespell (>=2.2)", "dnspython (>=2.1)", "flake8 (>=4.0)", "mypy (>=1.4.1)", "types-setuptools (>=57.4)", "wheel (>=0.37)"]
+docs = ["Sphinx (>=5.0)", "furo (==2022.6.21)", "sphinx-autobuild (>=2021.3.14)", "sphinx-autodoc-typehints (>=1.12)"]
+pool = ["psycopg-pool"]
+test = ["anyio (>=3.6.2,<4.0)", "mypy (>=1.4.1)", "pproxy (>=2.7)", "pytest (>=6.2.5)", "pytest-cov (>=3.0)", "pytest-randomly (>=3.5)"]
+
+[[package]]
+name = "psycopg-binary"
+version = "3.1.19"
+description = "PostgreSQL database adapter for Python -- C optimisation distribution"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "psycopg_binary-3.1.19-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:7204818f05151dd08f8f851defb01972ec9d2cc925608eb0de232563f203f354"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6d4e67fd86758dbeac85641419a54f84d74495a8683b58ad5dfad08b7fc37a8f"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e12173e34b176e93ad2da913de30f774d5119c2d4d4640c6858d2d77dfa6c9bf"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:052f5193304066318853b4b2e248f523c8f52b371fc4e95d4ef63baee3f30955"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:29008f3f8977f600b8a7fb07c2e041b01645b08121760609cc45e861a0364dc9"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7c6a9a651a08d876303ed059c9553df18b3c13c3406584a70a8f37f1a1fe2709"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:91a645e6468c4f064b7f4f3b81074bdd68fe5aa2b8c5107de15dcd85ba6141be"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5c6956808fd5cf0576de5a602243af8e04594b25b9a28675feddc71c5526410a"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:1622ca27d5a7a98f7d8f35e8b146dc7efda4a4b6241d2edf7e076bd6bcecbeb4"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a100482950a55228f648bd382bb71bfaff520002f29845274fccbbf02e28bd52"},
+    {file = "psycopg_binary-3.1.19-cp310-cp310-win_amd64.whl", hash = "sha256:955ca8905c0251fc4af7ce0a20999e824a25652f53a558ab548b60969f1f368e"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cf49e91dcf699b8a449944ed898ef1466b39b92720613838791a551bc8f587a"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:964c307e400c5f33fa762ba1e19853e048814fcfbd9679cc923431adb7a2ead2"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3433924e1b14074798331dc2bfae2af452ed7888067f2fc145835704d8981b15"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:00879d4c6be4b3afc510073f48a5e960f797200e261ab3d9bd9b7746a08c669d"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:34a6997c80f86d3dd80a4f078bb3b200079c47eeda4fd409d8899b883c90d2ac"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0106e42b481677c41caa69474fe530f786dcef88b11b70000f0e45a03534bc8f"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:81efe09ba27533e35709905c3061db4dc9fb814f637360578d065e2061fbb116"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:d312d6dddc18d9c164e1893706269c293cba1923118349d375962b1188dafb01"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:bfd2c734da9950f7afaad5f132088e0e1478f32f042881fca6651bb0c8d14206"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:8a732610a5a6b4f06dadcf9288688a8ff202fd556d971436a123b7adb85596e2"},
+    {file = "psycopg_binary-3.1.19-cp311-cp311-win_amd64.whl", hash = "sha256:321814a9a3ad785855a821b842aba08ca1b7de7dfb2979a2f0492dca9ec4ae70"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:4aa0ca13bb8a725bb6d12c13999217fd5bc8b86a12589f28a74b93e076fbb959"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:469424e354ebcec949aa6aa30e5a9edc352a899d9a68ad7a48f97df83cc914cf"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b04f5349313529ae1f1c42fe1aa0443faaf50fdf12d13866c2cc49683bfa53d0"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:959feabddc7fffac89b054d6f23f3b3c62d7d3c90cd414a02e3747495597f150"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e9da624a6ca4bc5f7fa1f03f8485446b5b81d5787b6beea2b4f8d9dbef878ad7"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1823221a6b96e38b15686170d4fc5b36073efcb87cce7d3da660440b50077f6"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:866db42f986298f0cf15d805225eb8df2228bf19f7997d7f1cb5f388cbfc6a0f"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:738c34657305b5973af6dbb6711b07b179dfdd21196d60039ca30a74bafe9648"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:fb9758473200384a04374d0e0cac6f451218ff6945a024f65a1526802c34e56e"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:0e991632777e217953ac960726158987da684086dd813ac85038c595e7382c91"},
+    {file = "psycopg_binary-3.1.19-cp312-cp312-win_amd64.whl", hash = "sha256:1d87484dd42c8783c44a30400949efb3d81ef2487eaa7d64d1c54df90cf8b97a"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d1d1723d7449c12bb61aca7eb6e0c6ab2863cd8dc0019273cc4d4a1982f84bdb"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e538a8671005641fa195eab962f85cf0504defbd3b548c4c8fc27102a59f687b"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c50592bc8517092f40979e4a5d934f96a1737a77724bb1d121eb78b614b30fc8"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:95f16ae82bc242b76cd3c3e5156441e2bd85ff9ec3a9869d750aad443e46073c"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aebd1e98e865e9a28ce0cb2c25b7dfd752f0d1f0a423165b55cd32a431dcc0f4"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:49cd7af7d49e438a39593d1dd8cab106a1912536c2b78a4d814ebdff2786094e"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:affebd61aa3b7a8880fd4ac3ee94722940125ff83ff485e1a7c76be9adaabb38"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:d1bac282f140fa092f2bbb6c36ed82270b4a21a6fc55d4b16748ed9f55e50fdb"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:1285aa54449e362b1d30d92b2dc042ad3ee80f479cc4e323448d0a0a8a1641fa"},
+    {file = "psycopg_binary-3.1.19-cp37-cp37m-win_amd64.whl", hash = "sha256:6cff31af8155dc9ee364098a328bab688c887c732c66b8d027e5b03818ca0287"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d9b689c4a17dd3130791dcbb8c30dbf05602f7c2d56c792e193fb49adc7bf5f8"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:017518bd2de4851adc826a224fb105411e148ad845e11355edd6786ba3dfedf5"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c35fd811f339a3cbe7f9b54b2d9a5e592e57426c6cc1051632a62c59c4810208"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:38ed45ec9673709bfa5bc17f140e71dd4cca56d4e58ef7fd50d5a5043a4f55c6"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:433f1c256108f9e26f480a8cd6ddb0fb37dbc87d7f5a97e4540a9da9b881f23f"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ed61e43bf5dc8d0936daf03a19fef3168d64191dbe66483f7ad08c4cea0bc36b"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:4ae8109ff9fdf1fa0cb87ab6645298693fdd2666a7f5f85660df88f6965e0bb7"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:a53809ee02e3952fae7977c19b30fd828bd117b8f5edf17a3a94212feb57faaf"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9d39d5ffc151fb33bcd55b99b0e8957299c0b1b3e5a1a5f4399c1287ef0051a9"},
+    {file = "psycopg_binary-3.1.19-cp38-cp38-win_amd64.whl", hash = "sha256:e14bc8250000921fcccd53722f86b3b3d1b57db901e206e49e2ab2afc5919c2d"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cd88c5cea4efe614d5004fb5f5dcdea3d7d59422be796689e779e03363102d24"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:621a814e60825162d38760c66351b4df679fd422c848b7c2f86ad399bff27145"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:46e50c05952b59a214e27d3606f6d510aaa429daed898e16b8a37bfbacc81acc"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:03354a9db667c27946e70162cb0042c3929154167f3678a30d23cebfe0ad55b5"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:703c2f3b79037581afec7baa2bdbcb0a1787f1758744a7662099b0eca2d721cb"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6469ebd9e93327e9f5f36dcf8692fb1e7aeaf70087c1c15d4f2c020e0be3a891"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:85bca9765c04b6be90cb46e7566ffe0faa2d7480ff5c8d5e055ac427f039fd24"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:a836610d5c75e9cff98b9fdb3559c007c785c09eaa84a60d5d10ef6f85f671e8"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ef8de7a1d9fb3518cc6b58e3c80b75a824209ad52b90c542686c912db8553dad"},
+    {file = "psycopg_binary-3.1.19-cp39-cp39-win_amd64.whl", hash = "sha256:76fcd33342f38e35cd6b5408f1bc117d55ab8b16e5019d99b6d3ce0356c51717"},
+]
+
 [[package]]
 name = "pydantic"
 version = "2.7.2"
@@ -2908,6 +3056,24 @@ pytest = ">=7.0.0,<9"
 docs = ["sphinx (>=5.3)", "sphinx-rtd-theme (>=1.0)"]
 testing = ["coverage (>=6.2)", "hypothesis (>=5.7.1)"]
 
+[[package]]
+name = "pytest-postgresql"
+version = "6.0.0"
+description = "Postgresql fixtures and fixture factories for Pytest."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "pytest-postgresql-6.0.0.tar.gz", hash = "sha256:6a4d8e600a2eef273f3c0e846cd0b2ea577282e252de29b4ca854bfb929bb682"},
+    {file = "pytest_postgresql-6.0.0-py3-none-any.whl", hash = "sha256:f14272bffad16a74d9a63f4cc828f243a12ae92995e236b68fd53154760e6a5a"},
+]
+
+[package.dependencies]
+mirakuru = "*"
+port-for = ">=0.6.0"
+psycopg = ">=3.0.0"
+pytest = ">=6.2"
+setuptools = "*"
+
 [[package]]
 name = "pytest-xdist"
 version = "3.6.1"
@@ -4210,4 +4376,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.11,<3.12"
-content-hash = "ea7579f435b0c476a57fe23453277a8e90d2815e0a86efc7ff300a5ddbd434bb"
+content-hash = "83b595a344a5db9263207b122c781f07b9cd8ac777e04fb1b743e3e3ce5016e1"

pyproject.toml

@@ -3,7 +3,7 @@
 name = "app"
 version = "0.1.0"
 description = ""
-authors = [ "Marcus Schiesser <mail@marcusschiesser.de>" ]
+authors = [ "Praneeth Yerrapragada, Patrick Alexis" ]
 readme = "README.md"
 package-mode = false
 
@@ -34,11 +34,17 @@ httpx = "^0.27.0"
 alembic = "^1.13.1"
 asyncpg = "^0.29.0"
 asyncio = "^3.4.3"
+pytest-postgresql = "^6.0.0"
+psycopg-binary = "^3.1.19"
 
 [tool.poetry.dependencies.uvicorn]
 extras = [ "standard" ]
 version = "^0.23.2"
 
+[tool.poetry.dependencies.sqlalchemy]
+extras = [ "asyncio" ]
+version = "^2.0.30"
+
 [tool.poetry.dependencies.llama-index-agent-openai]
 version = "0.2.2"
 

tests/conftest.py

@@ -10,15 +10,25 @@ from alembic.operations import Operations
 from alembic.script import ScriptDirectory
 from config.index import config as settings
 from app.engine.postgresdb import Base, get_db_session, postgresdb as sessionmanager
-from main import app as actual_app
+from main import init_app
 from asyncpg import Connection
 from fastapi.testclient import TestClient
+from pytest_postgresql import factories
+from pytest_postgresql.factories.noprocess import postgresql_noproc
+from pytest_postgresql.janitor import DatabaseJanitor
+from sqlalchemy.testing.entities import ComparableEntity
+
+from config.index import config as env
+
+test_db = factories.postgresql_proc(dbname="test_db", port=5433)
 
 
 @pytest.fixture(autouse=True)
 def app():
     with ExitStack():
-        yield actual_app
+        # Don't initialize database connection.
+        # This is because we want to initialize the database connection manually, so that we can create the test database.
+        yield init_app(init_db=False)
 
 
 @pytest.fixture
@@ -27,60 +37,39 @@ def client(app):
         yield c
 
 
-@pytest.fixture(scope="session")
+@pytest.mark.asyncio(scope="session")
 def event_loop(request):
     loop = asyncio.get_event_loop_policy().new_event_loop()
     yield loop
     loop.close()
 
 
-def run_migrations(connection: Connection):
-    config = Config("alembic.ini")
-    config.set_main_option("script_location", "app/migration")
-    config.set_main_option("sqlalchemy.url", settings.SQLALCHEMY_TEST_DATABASE_URL)
-    script = ScriptDirectory.from_config(config)
-
-    def upgrade(rev, context):
-        return script._upgrade_revs("head", rev)
-
-    context = MigrationContext.configure(connection, opts={"target_metadata": Base.metadata, "fn": upgrade})
-
-    with context.begin_transaction():
-        with Operations.context(context):
-            context.run_migrations()
-
-
-@pytest.fixture(scope="session", autouse=True)
-async def setup_database():
-    # Run alembic migrations on test DB
-    async with sessionmanager.connect() as connection:
-        await connection.run_sync(run_migrations)
-
-    yield
+@pytest.fixture(scope="function", autouse=True)
+async def connection_test(test_db, event_loop):
+    pg_host = test_db.host
+    pg_port = test_db.port
+    pg_user = test_db.user
+    pg_db = test_db.dbname
+    pg_password = test_db.password
 
-    # Teardown
-    await sessionmanager.close()
+    with DatabaseJanitor(pg_user, pg_host, pg_port, pg_db, test_db.version, pg_password):
+        connection_str = f"postgresql+asyncpg://{pg_user}:@{pg_host}:{pg_port}/{pg_db}"
+        sessionmanager.init(connection_str)
+        yield
+        await sessionmanager.close()
 
 
-# Each test function is a clean slate
 @pytest.fixture(scope="function", autouse=True)
-async def transactional_session():
-    async with sessionmanager.session() as session:
-        try:
-            await session.begin()
-            yield session
-        finally:
-            await session.rollback()  # Rolls back the outer transaction
-
-
-@pytest.fixture(scope="function")
-async def db_session(transactional_session):
-    yield transactional_session
+async def create_tables(connection_test):
+    async with sessionmanager.connect() as connection:
+        await sessionmanager.drop_all(connection)
+        await sessionmanager.create_all(connection)
 
 
 @pytest.fixture(scope="function", autouse=True)
-async def session_override(app, db_session):
+async def session_override(app, connection_test):
     async def get_db_session_override():
-        yield db_session[0]
+        async with sessionmanager.session() as session:
+            yield session
 
     app.dependency_overrides[get_db_session] = get_db_session_override

tests/pytest.ini

@@ -1,2 +1,4 @@
 [pytest]
-asyncio_mode = auto
+asyncio_mode = auto
+timeout = 60
+addopts = -vv --disable-warnings --durations=10 --durations-min=1.0

tests/test_main.py

@@ -1,9 +0,0 @@
-from main import app
-from fastapi.testclient import TestClient
-
-client = TestClient(app)
-
-
-def test_read_main():
-    response = client.get("/")
-    assert response.status_code == 200

tests/test_users.py

@@ -0,0 +1,40 @@
+from random import randint
+
+from fastapi.testclient import TestClient
+
+
+def test_users(client: TestClient) -> None:
+    rand_int = randint(0, 1000)
+    email = f"test{rand_int}@example.com"
+    response = client.get(f"/api/v1/users/{email}")
+    assert response.status_code == 404
+
+    response = client.post(
+        "/api/v1/users",
+        json={"email": email, "name": "Full Name Test", "hashed_password": "test"},
+    )
+    assert response.status_code == 200
+    assert response.json().get("email") == email
+    assert response.json().get("name") == "Full Name Test"
+    assert response.json().get("is_deleted") == False
+
+    response = client.get(f"/api/v1/users/{email}")
+    assert response.status_code == 200
+    assert response.json().get("email") == email
+    assert response.json().get("name") == "Full Name Test"
+    assert response.json().get("is_deleted") == False
+
+    response = client.put(
+        f"/api/v1/users/{email}",
+        json={"email": email, "name": "Full Name Test 2", "hashed_password": "test"},
+    )
+    assert response.status_code == 200
+    assert response.json().get("email") == email
+    assert response.json().get("name") == "Full Name Test 2"
+    assert response.json().get("is_deleted") == False
+
+    response = client.delete(f"/api/v1/users/{email}")
+    assert response.status_code == 200
+    assert response.json().get("email") == email
+    assert response.json().get("name") == "Full Name Test 2"
+    assert response.json().get("is_deleted") == True

tests/test_users_crud.py

@@ -1,49 +0,0 @@
-import json
-from httpx import AsyncClient
-import pytest
-
-from app.core.config import settings
-
-
-@pytest.mark.asyncio
-async def test_users_crud(httpx_async_client: AsyncClient):
-    # Test CREATE
-    user_data = {
-        "name": "John Doe",
-        "email": "john.doe@example.com",
-        "password": "password123",
-    }
-    response = await httpx_async_client.post(
-        f"{settings.API_V1_STR}/users/",
-        data=json.dumps(user_data),
-        headers={"Content-Type": "application/json"},
-    )
-    assert response.status_code == 200
-    user_id = response.json()["user_id"]
-
-    # Test READ
-    response = await httpx_async_client.get(f"{settings.API_V1_STR}/users/{user_id}")
-    assert response.status_code == 200
-    user = response.json()
-    assert user["name"] == user_data["name"]
-    assert user["email"] == user_data["email"]
-    assert "password" not in user
-
-    # Test UPDATE
-    updated_user_data = {
-        "name": "Jane Doe",
-    }
-    response = await httpx_async_client.put(
-        f"{settings.API_V1_STR}/users/{user_id}",
-        data=json.dumps(updated_user_data),
-        headers={"Content-Type": "application/json"},
-    )
-    assert response.status_code == 200
-    updated_user = response.json()
-    assert updated_user["name"] == updated_user_data["name"]
-    assert updated_user["email"] == user_data["email"]
-    assert "password" not in updated_user
-
-    # Test DELETE
-    response = await httpx_async_client.delete(f"{settings.API_V1_STR}/users/{user_id}")
-    assert response.status_code == 200