Skip to content

Commit f06f59b

Browse files
committed
change settings on generator
1 parent 9402d58 commit f06f59b

File tree

7 files changed

+21
-15
lines changed

7 files changed

+21
-15
lines changed

cookiecutter.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"smtp_emails_from_name": "Symona Adaro",
2424
"smtp_emails_to_email": "info@{{cookiecutter.domain_main}}",
2525

26-
"mongodb_uri": "changethis",
27-
"mongodb_database": "changethis",
26+
"mongodb_uri": "mongodb",
27+
"mongodb_database": "app",
2828

2929
"traefik_constraint_tag": "{{cookiecutter.domain_main}}",
3030
"traefik_constraint_tag_staging": "{{cookiecutter.domain_staging}}",

{{cookiecutter.project_slug}}/backend/app/app/core/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def sentry_dsn_can_be_blank(cls, v: str) -> Optional[str]:
4646

4747
# COMPONENT SETTINGS
4848
MONGO_DATABASE: str
49-
MONGO_DATABASE_URI: str = ""
49+
MONGO_DATABASE_URI: str
5050

5151
SMTP_TLS: bool = True
5252
SMTP_PORT: Optional[int] = None

{{cookiecutter.project_slug}}/backend/app/app/db/session.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def __new__(cls):
1414
return cls.instance
1515

1616

17-
def MongoDatabase(test=False) -> core.AgnosticDatabase:
17+
def MongoDatabase() -> core.AgnosticDatabase:
1818
return _MongoClientSingleton().mongo_client[settings.MONGO_DATABASE]
1919

2020

{{cookiecutter.project_slug}}/backend/app/app/main.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,33 @@
11
from fastapi import FastAPI
22
from starlette.middleware.cors import CORSMiddleware
33
from beanie import init_beanie
4+
from contextlib import asynccontextmanager
45

56
from app.api.api_v1.api import api_router
67
from app.core.config import settings
78
from app.db.session import MongoDatabase
89
from app.models import MODELS
910

1011

12+
@asynccontextmanager
13+
async def app_init(app: FastAPI):
14+
await init_beanie(MongoDatabase(), document_models=MODELS)
15+
app.include_router(api_router, prefix=settings.API_V1_STR)
16+
yield
17+
18+
1119
app = FastAPI(
12-
title=settings.PROJECT_NAME, openapi_url=f"{settings.API_V1_STR}/openapi.json"
20+
title=settings.PROJECT_NAME,
21+
openapi_url=f"{settings.API_V1_STR}/openapi.json",
22+
lifespan=app_init,
1323
)
1424

1525
# Set all CORS enabled origins
1626
if settings.BACKEND_CORS_ORIGINS:
1727
app.add_middleware(
1828
CORSMiddleware,
19-
allow_origins=[str(origin) for origin in settings.BACKEND_CORS_ORIGINS],
29+
allow_origins=[str(origin).rstrip("/") for origin in settings.BACKEND_CORS_ORIGINS],
2030
allow_credentials=True,
2131
allow_methods=["*"],
2232
allow_headers=["*"],
2333
)
24-
25-
26-
@app.on_event("startup")
27-
async def app_init():
28-
await init_beanie(MongoDatabase(), document_models=MODELS)
29-
app.include_router(api_router, prefix=settings.API_V1_STR)

{{cookiecutter.project_slug}}/backend/app/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ dependencies = [
3838
"beanie==1.22.6",
3939
"motor==3.3.1",
4040
"pytest==7.4.2",
41-
"pytest-asyncio==0.22.0",
41+
"pytest-cov==4.1.0",
42+
"pytest-asyncio==0.21.0",
4243
"argon2-cffi==23.1.0",
4344
"argon2-cffi-bindings==21.2.0",
4445
]

{{cookiecutter.project_slug}}/cookiecutter-config-file.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ default_context:
1919
smtp_emails_from_email: '{{ cookiecutter.smtp_emails_from_email }}'
2020
smtp_emails_from_name: '{{cookiecutter.smtp_emails_from_name}}'
2121
smtp_emails_to_email: '{{cookiecutter.smtp_emails_to_email}}'
22-
mongodb_password: '{{ cookiecutter.mongodb_password }}'
22+
mongodb_uri: '{{cookiecutter.mongodb_uri}}'
23+
mongodb_database: '{{cookiecutter.mongodb_database}}'
2324
traefik_constraint_tag: '{{ cookiecutter.traefik_constraint_tag }}'
2425
traefik_constraint_tag_staging: '{{ cookiecutter.traefik_constraint_tag_staging }}'
2526
traefik_public_constraint_tag: '{{ cookiecutter.traefik_public_constraint_tag }}'

{{cookiecutter.project_slug}}/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ services:
166166
- traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
167167
- traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
168168

169-
local-mongodb:
169+
mongodb:
170170
image: mongo
171171
ports:
172172
- 27017:27017

0 commit comments

Comments
 (0)