mirror of
https://github.com/creyD/creyPY.git
synced 2026-04-12 19:30:30 +02:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
50b444be89 | ||
| e12c86e352 | |||
|
|
0708a48301 | ||
| 34595d52f2 | |||
|
|
421725ad10 | ||
| 31c4cbb055 | |||
| 410ae12f8e | |||
| 1f224c44bc |
@@ -1,15 +1,14 @@
|
||||
from typing import AsyncGenerator
|
||||
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
|
||||
from .common import SQLALCHEMY_DATABASE_URL, name
|
||||
from .common import SQLALCHEMY_DATABASE_URL, name, ssl_mode
|
||||
|
||||
async_engine = create_async_engine(
|
||||
SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": "require"}
|
||||
SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": ssl_mode}
|
||||
)
|
||||
|
||||
AsyncSessionLocal = sessionmaker(
|
||||
AsyncSessionLocal = async_sessionmaker(
|
||||
bind=async_engine,
|
||||
class_=AsyncSession,
|
||||
expire_on_commit=False,
|
||||
|
||||
@@ -10,4 +10,6 @@ password = os.getenv("POSTGRES_PASSWORD", "root")
|
||||
port = os.getenv("POSTGRES_PORT", "5432")
|
||||
name = os.getenv("POSTGRES_DB", "fastapi")
|
||||
|
||||
ssl_mode = os.getenv("SSL_MODE", "require")
|
||||
|
||||
SQLALCHEMY_DATABASE_URL = f"postgresql+psycopg://{user}:{password}@{host}:{port}/"
|
||||
|
||||
@@ -4,10 +4,10 @@ from sqlalchemy import create_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
from sqlalchemy.orm.session import Session
|
||||
|
||||
from .common import SQLALCHEMY_DATABASE_URL, name
|
||||
from .common import SQLALCHEMY_DATABASE_URL, name, ssl_mode
|
||||
|
||||
engine = create_engine(
|
||||
SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": "require"}
|
||||
SQLALCHEMY_DATABASE_URL + name, pool_pre_ping=True, connect_args={"sslmode": ssl_mode}
|
||||
)
|
||||
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
|
||||
|
||||
|
||||
@@ -20,17 +20,21 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
transport=ASGITransport(app=app), base_url="http://testserver", follow_redirects=True
|
||||
)
|
||||
cls.default_headers = headers
|
||||
print("setting up abstract")
|
||||
|
||||
@classmethod
|
||||
def setup_database(
|
||||
cls, sync_db_url: str, async_db_url: str, base: Type[Base], btree_gist: bool = False
|
||||
cls,
|
||||
sync_db_url: str,
|
||||
async_db_url: str,
|
||||
base: Type[Base],
|
||||
btree_gist: bool = False,
|
||||
ssl_mode: str = "require",
|
||||
):
|
||||
cls.engine_s = create_engine(
|
||||
sync_db_url,
|
||||
echo=False,
|
||||
pool_pre_ping=True,
|
||||
connect_args={"sslmode": "require"},
|
||||
connect_args={"sslmode": ssl_mode},
|
||||
)
|
||||
if database_exists(cls.engine_s.url):
|
||||
drop_database(cls.engine_s.url)
|
||||
@@ -47,7 +51,7 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
async_db_url,
|
||||
echo=False,
|
||||
pool_pre_ping=True,
|
||||
connect_args={"sslmode": "require"},
|
||||
connect_args={"sslmode": ssl_mode},
|
||||
)
|
||||
|
||||
async def get(self, url: str, r_code: int = 200, parse_json=True) -> dict | bytes:
|
||||
@@ -136,6 +140,7 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
pagination: bool = True,
|
||||
id_field: str = "id",
|
||||
created_at_check: bool = True,
|
||||
patch: dict | None = None,
|
||||
):
|
||||
# GET LIST
|
||||
re = await self.get(url)
|
||||
@@ -160,6 +165,14 @@ class AbstractTestAPI(unittest.IsolatedAsyncioTestCase):
|
||||
re = await self.get(f"{url}{obj_id}/")
|
||||
self.assertEqual(re[id_field], obj_id)
|
||||
|
||||
# PATCH
|
||||
if patch:
|
||||
for key, value in patch.items():
|
||||
input_obj[key] = value
|
||||
re = await self.patch(f"{url}{obj_id}/", obj=input_obj)
|
||||
for key, value in patch.items():
|
||||
self.assertEqual(re[key], value)
|
||||
|
||||
# GET LIST
|
||||
re = await self.get(url)
|
||||
if pagination:
|
||||
|
||||
@@ -1 +1 @@
|
||||
stripe==11.4.1 # Stripe
|
||||
stripe==11.5.0 # Stripe
|
||||
|
||||
Reference in New Issue
Block a user