fix tests, prepare version support

rafsaf · rafsaf · commit 0ad3e6775d1d · 2021-11-09T16:32:33.000+01:00
diff --git a/{{cookiecutter.project_name}}/.env.example b/{{cookiecutter.project_name}}/.env.example
@@ -1,15 +1,20 @@
-DEBUG=true
-SECRET_KEY=string
-ACCESS_TOKEN_EXPIRE_MINUTES=11520
-REFRESH_TOKEN_EXPIRE_MINUTES=40320
+SECRET_KEY="DVnFmhwvjEhJZpuhndxjhlezxQPJmBIIkMDEmFREWQADPcUnrG"
+ENVIRONMENT="DEV"
+ACCESS_TOKEN_EXPIRE_MINUTES="11520"
+REFRESH_TOKEN_EXPIRE_MINUTES="40320"
+BACKEND_CORS_ORIGINS="http://localhost:3000,http://localhost:8001"
 
-BACKEND_CORS_ORIGINS=http://localhost:3000,http://localhost:8001
+DEFAULT_DATABASE_HOSTNAME="localhost"
+DEFAULT_DATABASE_USER="rDGJeEDqAz"
+DEFAULT_DATABASE_PASSWORD="XsPQhCoEfOQZueDjsILetLDUvbvSxAMnrVtgVZpmdcSssUgbvs"
+DEFAULT_DATABASE_PORT="5387"
+DEFAULT_DATABASE_DB="default_db"
 
-DEFAULT_DATABASE_USER=postgres
-DEFAULT_DATABASE_PASSWORD=strong_password
-POSTGRES_SERVER=db
-DEFAULT_DATABASE_DB=db
-DEFAULT_DATABASE_PORT=4999
+TEST_DATABASE_HOSTNAME="localhost"
+TEST_DATABASE_USER="test"
+TEST_DATABASE_PASSWORD="ywRCUjJijmQoBmWxIfLldOoITPzajPSNvTvHyugQoSqGwNcvQE"
+TEST_DATABASE_PORT="37270"
+TEST_DATABASE_DB="test_db"
 
-FIRST_SUPERUSER_EMAIL=example@example.com
-FIRST_SUPERUSER_PASSWORD=string_password
+FIRST_SUPERUSER_EMAIL="example@example.com"
+FIRST_SUPERUSER_PASSWORD="OdLknKQJMUwuhpAVHvRC"
diff --git a/{{cookiecutter.project_name}}/.env.template b/{{cookiecutter.project_name}}/.env.template
@@ -16,5 +16,5 @@ TEST_DATABASE_PASSWORD="{{ random_ascii_string(50) }}"
 TEST_DATABASE_PORT="{{ range(30000, 40000) | random }}"
 TEST_DATABASE_DB="test_db"
 
-FIRST_SUPERUSER_EMAIL=example@example.com
+FIRST_SUPERUSER_EMAIL="example@example.com"
 FIRST_SUPERUSER_PASSWORD="{{ random_ascii_string(20) }}"
diff --git a/{{cookiecutter.project_name}}/.gitignore b/{{cookiecutter.project_name}}/.gitignore
@@ -1,10 +1,8 @@
-# vscode
-.vscode
 
 # postgresql
 data
-data-debug
-tests_data
+default_database_data
+test_database_data
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -14,7 +12,6 @@ __pycache__/
 
 # C extensions
 *.so
-.env
 
 # Distribution / packaging
 .Python
diff --git a/{{cookiecutter.project_name}}/app/api/api.py b/{{cookiecutter.project_name}}/app/api/api.py
diff --git a/{{cookiecutter.project_name}}/app/api/api_v1/__init__.py b/{{cookiecutter.project_name}}/app/api/api_v1/__init__.py
diff --git a/{{cookiecutter.project_name}}/app/api/api_v1/auth.py b/{{cookiecutter.project_name}}/app/api/api_v1/auth.py
@@ -8,11 +8,13 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app import schemas
-from app.api import deps
+from app.api.routers import api_v1_router
+from app.api.api_v1 import deps
 from app.core import security
 from app.core.config import settings
 from app.models import User
 
+
 router = APIRouter()
 
 
@@ -88,3 +90,6 @@ async def refresh_token(
         "refresh_token": refresh_token,
         "refresh_expire_at": refresh_expire_at,
     }
+
+
+api_v1_router.include_router(router, prefix="", tags=["users"])
diff --git a/{{cookiecutter.project_name}}/app/api/api_v1/deps.py b/{{cookiecutter.project_name}}/app/api/api_v1/deps.py
@@ -13,7 +13,7 @@
 from app.models import User
 from app.session import async_session
 
-reusable_oauth2 = OAuth2PasswordBearer(tokenUrl="/auth/access-token")
+reusable_oauth2 = OAuth2PasswordBearer(tokenUrl="v1/auth/access-token")
 
 
 async def get_session() -> AsyncGenerator[AsyncSession, None]:
diff --git a/{{cookiecutter.project_name}}/app/api/api_v1/users.py b/{{cookiecutter.project_name}}/app/api/api_v1/users.py
@@ -4,7 +4,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app import models, schemas
-from app.api import deps
+from app.api.api_v1 import deps
 from app.core.security import get_password_hash
 
 router = APIRouter()
diff --git a/{{cookiecutter.project_name}}/app/api/routers.py b/{{cookiecutter.project_name}}/app/api/routers.py
@@ -0,0 +1,4 @@
+from fastapi import APIRouter
+
+
+api_v1_router = APIRouter()
diff --git a/{{cookiecutter.project_name}}/app/conftest.py b/{{cookiecutter.project_name}}/app/conftest.py
@@ -0,0 +1,8 @@
+import os
+
+# We overwrite variables from .env to hardcoded one to connect with test database
+# We don't want to mess up dev database
+#
+# Put here any pytest-specific code (it will run before app/tests/...)
+
+os.environ["ENVIRONMENT"] = "PYTEST"
diff --git a/{{cookiecutter.project_name}}/app/core/config.py b/{{cookiecutter.project_name}}/app/core/config.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Dict, List, Literal, Optional, Union
+from typing import Dict, List, Literal, Union
 
 import toml
 from pydantic import AnyHttpUrl, AnyUrl, BaseSettings, EmailStr, validator
diff --git a/{{cookiecutter.project_name}}/app/initial_data.py b/{{cookiecutter.project_name}}/app/initial_data.py
@@ -1,4 +1,3 @@
-import logging
 from asyncio import get_event_loop
 from typing import Optional
 
@@ -11,7 +10,7 @@
 
 
 async def main() -> None:
-    logging.info("Start initial data")
+    print("Start initial data")
     async with async_session() as session:
 
         result = await session.execute(
@@ -29,11 +28,11 @@ async def main() -> None:
             )
             session.add(new_superuser)
             await session.commit()
-            logging.info("Superuser was created")
+            print("Superuser was created")
         else:
-            logging.warning("Superuser already exists in database")
+            print("Superuser already exists in database")
 
-        logging.info("Initial data created")
+        print("Initial data created")
 
 
 if __name__ == "__main__":
diff --git a/{{cookiecutter.project_name}}/app/main.py b/{{cookiecutter.project_name}}/app/main.py
@@ -1,7 +1,7 @@
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 
-from app.api.api import api_router
+from app.api.routers import api_v1_router
 from app.core.config import settings
 
 app = FastAPI(
@@ -22,4 +22,4 @@
         allow_headers=["*"],
     )
 
-app.include_router(api_router)
+app.include_router(api_v1_router)
diff --git a/{{cookiecutter.project_name}}/app/tests/conftest.py b/{{cookiecutter.project_name}}/app/tests/conftest.py
@@ -1,17 +1,14 @@
-import os
 import asyncio
 from typing import AsyncGenerator
 
 import pytest
 from httpx import AsyncClient
 from sqlalchemy.ext.asyncio import AsyncSession
 
-# We overwrite variables from .env to hardcoded one to connect with test database
-os.environ["ENVIRONMENT"] = "PYTEST"
-
-from app.session import async_engine, async_session
 from app.main import app
 from app.models import Base
+from app.session import async_engine, async_session
+from app.core.config import settings
 
 
 @pytest.fixture(scope="session")
@@ -29,6 +26,9 @@ async def client():
 
 @pytest.fixture(scope="session")
 async def test_db_setup_sessionmaker():
+    assert settings.ENVIRONMENT == "PYTEST"
+    assert str(async_engine.url) == settings.TEST_SQLALCHEMY_DATABASE_URI
+
     async with async_engine.begin() as conn:
         # awalys drop and create test db tables between tests session
         await conn.run_sync(Base.metadata.drop_all)
diff --git a/{{cookiecutter.project_name}}/docker-compose.yml b/{{cookiecutter.project_name}}/docker-compose.yml
@@ -27,10 +27,10 @@ services:
     volumes:
       - ./test_database_data/db:/var/lib/postgresql/data
     environment:
-      - DEFAULT_DATABASE_DB=tests
-      - DEFAULT_DATABASE_USER=tests
-      - DEFAULT_DATABASE_PASSWORD=tests
+      - POSTGRES_DB=${TEST_DATABASE_DB}
+      - POSTGRES_USER=${TEST_DATABASE_USER}
+      - POSTGRES_PASSWORD=${TEST_DATABASE_PASSWORD}
     env_file:
       - .env
     ports:
-      - "37645:5432"
+      - "${TEST_DATABASE_PORT}:5432"

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +from fastapi import APIRouter
++
++
 +api_v1_router = APIRouter()