Skip to content

Commit 45e1b5d

Browse files
committed
refactor routers, add test endpoint
1 parent ca00591 commit 45e1b5d

12 files changed

Lines changed: 46 additions & 12 deletions

File tree

api_v1/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from .routers import router
1+
from .routers import register_routers
22

3-
__all__ = ('router',)
3+
__all__ = ('register_routers',)

api_v1/routers.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
from fastapi import APIRouter
1+
from fastapi import FastAPI
22

3+
from config import settings
4+
from api_v1.users.views import router
35

4-
router = APIRouter(prefix='/api/v1')
6+
7+
def register_routers(app: FastAPI) -> None:
8+
app.include_router(
9+
router=router,
10+
prefix=settings.API_PREFIX,
11+
)

api_v1/users/views.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
from fastapi import APIRouter, Depends
2+
3+
from sqlalchemy.ext.asyncio import AsyncSession
4+
5+
from config import db_connection
6+
7+
8+
router = APIRouter(prefix='/users',
9+
tags=['Users'],
10+
)
11+
12+
13+
@router.get(path='/get',
14+
description='Test end point',
15+
)
16+
async def get_user(
17+
session: AsyncSession = Depends(db_connection.session_geter),
18+
):
19+
session = session
20+
return {'user': 'is_work'}

config/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from .config import settings
2-
from .rabbitmq.connection import app as celery_app
2+
from .celery.connection import app as celery_app
33
from .database.db_helper import db_helper as db_connection
4-
from .database.base import Base as BaseModel
4+
from .models.base import Base as BaseModel
55

66

77
__all__ = ('settings',

config/celery/__init__.py

Whitespace-only changes.

config/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class Settings(BaseSettings):
4646
db: DBSettings = DBSettings()
4747
rabbit: RabbitSettings = RabbitSettings()
4848
debug: bool = bool(int(config('DEBUG')))
49+
API_PREFIX: str = '/api/v1'
4950

5051

5152
settings = Settings()

docker/celery/flower/start

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -o errexit
44
set -o nounset
55

66
worker_ready() {
7-
celery -A config.rabbitmq.connection.app --broker=amqp://"${RABBITMQ_DEFAULT_USER}":"${RABBITMQ_DEFAULT_PASS}"@"${RMQ_HOST}":"${RMQ_PORT}" inspect ping
7+
celery -A config.celery.connection.app --broker=amqp://"${RABBITMQ_DEFAULT_USER}":"${RABBITMQ_DEFAULT_PASS}"@"${RMQ_HOST}":"${RMQ_PORT}" inspect ping
88
}
99

1010
until worker_ready; do
@@ -13,6 +13,6 @@ until worker_ready; do
1313
done
1414
>&2 echo 'Celery workers is available'
1515

16-
celery -A config.rabbitmq.connection.app \
16+
celery -A config.celery.connection.app \
1717
--broker=amqp://"${RABBITMQ_DEFAULT_USER}":"${RABBITMQ_DEFAULT_PASS}"@"${RMQ_HOST}":"${RMQ_PORT}" \
1818
flower

0 commit comments

Comments
 (0)