Skip to content

Commit dfb3edb

Browse files
committed
removed alembic dependency
1 parent f7c52d8 commit dfb3edb

File tree

13 files changed

+55
-407
lines changed

13 files changed

+55
-407
lines changed

cookiecutter.json

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

26-
"postgres_password": "changethis",
27-
"pgadmin_default_user": "{{cookiecutter.first_superuser}}",
28-
"pgadmin_default_user_password": "{{cookiecutter.first_superuser_password}}",
26+
"mongo_host": "changethis",
27+
"mongo_user": "changethis",
28+
"mongodb_password": "changethis",
29+
"mongodb_database": "changethis",
2930

3031
"neo4j_password": "changethis",
3132

@@ -48,7 +49,6 @@
4849
"frontend/**/*.vue",
4950
"frontend/.nuxt/*",
5051
"frontend/node_modules/*",
51-
"backend/app/app/email-templates/**",
52-
"backend/app/app/gdb/**"
52+
"backend/app/app/email-templates/**"
5353
]
5454
}

{{cookiecutter.project_slug}}/.env

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,17 @@ SENTRY_DSN={{cookiecutter.sentry_dsn}}
3838
# Flower
3939
FLOWER_BASIC_AUTH={{cookiecutter.flower_auth}}
4040

41-
# Postgres
42-
POSTGRES_SERVER=db
43-
POSTGRES_USER=postgres
44-
POSTGRES_PASSWORD={{cookiecutter.postgres_password}}
45-
POSTGRES_DB=app
46-
47-
# PgAdmin
48-
PGADMIN_LISTEN_PORT=5050
49-
PGADMIN_DEFAULT_EMAIL={{cookiecutter.pgadmin_default_user}}
50-
PGADMIN_DEFAULT_PASSWORD={{cookiecutter.pgadmin_default_user_password}}
41+
# Mongo
42+
MONGO_HOST={{cookiecutter.mongo_host}}
43+
MONGO_USER={{cookiecutter.mongo_user}}
44+
MONGO_PASSWORD={{cookiecutter.mongodb_password}}
45+
MONGO_DATABASE={{cookiecutter.mongodb_database}}
46+
# To override these settings, set
47+
# MONGO_DATABASE_URI=
5148

5249
# Neo4j
53-
NEO4J_SERVER=neo4j
54-
NEO4J_USERNAME=neo4j
55-
NEO4J_PASSWORD={{cookiecutter.neo4j_password}}
56-
NEO4J_AUTH=neo4j:{{cookiecutter.neo4j_password}}
57-
NEO4J_BOLT=bolt
50+
# NEO4J_SERVER=neo4j
51+
# NEO4J_USERNAME=neo4j
52+
# NEO4J_PASSWORD={{cookiecutter.neo4j_password}}
53+
# NEO4J_AUTH=neo4j:{{cookiecutter.neo4j_password}}
54+
# NEO4J_BOLT=bolt

{{cookiecutter.project_slug}}/backend/app/alembic/README

Lines changed: 0 additions & 1 deletion
This file was deleted.

{{cookiecutter.project_slug}}/backend/app/alembic/env.py

Lines changed: 0 additions & 87 deletions
This file was deleted.

{{cookiecutter.project_slug}}/backend/app/alembic/script.py.mako

Lines changed: 0 additions & 24 deletions
This file was deleted.

{{cookiecutter.project_slug}}/backend/app/alembic/versions/.keep

Whitespace-only changes.

{{cookiecutter.project_slug}}/backend/app/alembic/versions/8188d671489a_deeper_authentication.py

Lines changed: 0 additions & 40 deletions
This file was deleted.

{{cookiecutter.project_slug}}/backend/app/alembic/versions/c4f38069dc24_first_revision.py

Lines changed: 0 additions & 53 deletions
This file was deleted.

{{cookiecutter.project_slug}}/backend/app/alembic/versions/fb120f8fc198_token_remove_to_invalidate.py

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,26 @@ def sentry_dsn_can_be_blank(cls, v: str) -> Optional[str]:
4545

4646
# COMPONENT SETTINGS
4747

48-
POSTGRES_SERVER: str
49-
POSTGRES_USER: str
50-
POSTGRES_PASSWORD: str
51-
POSTGRES_DB: str
52-
SQLALCHEMY_DATABASE_URI: Optional[str] = None
53-
54-
@validator("SQLALCHEMY_DATABASE_URI", pre=True)
48+
MONGO_HOST: str
49+
MONGO_USER: str
50+
MONGO_PASSWORD: str
51+
MONGO_DATABASE: str
52+
MONGO_URI_OPTIONS: str = "retryWrites=true&w=majority"
53+
MONGO_DATABASE_URI: Optional[str] = None
54+
55+
@validator("MONGO_DATABASE_URI", pre=True)
5556
def assemble_db_connection(cls, v: Optional[str], values: Dict[str, Any]) -> Any:
5657
if isinstance(v, str):
5758
return v
58-
# TODO: Replace with MongoDsn construction
59-
# MongoDsn.build(scheme="str")
60-
return "mongodb+srv://jib:[email protected]/?retryWrites=true&w=majority"
59+
mongo_user, mongo_password, mongo_host, mongo_options = (
60+
values.get("MONGO_USER"),
61+
values.get("MONGO_PASSWORD"),
62+
values.get("MONGO_HOST"),
63+
values.get("MONGO_URI_OPTIONS"),
64+
)
65+
return (
66+
f"mongodb+srv://{mongo_user}:{mongo_password}@{mongo_host}/?{mongo_options}"
67+
)
6168

6269
SMTP_TLS: bool = True
6370
SMTP_PORT: Optional[int] = None
@@ -80,7 +87,11 @@ def get_project_name(cls, v: Optional[str], values: Dict[str, Any]) -> str:
8087

8188
@validator("EMAILS_ENABLED", pre=True)
8289
def get_emails_enabled(cls, v: bool, values: Dict[str, Any]) -> bool:
83-
return bool(values.get("SMTP_HOST") and values.get("SMTP_PORT") and values.get("EMAILS_FROM_EMAIL"))
90+
return bool(
91+
values.get("SMTP_HOST")
92+
and values.get("SMTP_PORT")
93+
and values.get("EMAILS_FROM_EMAIL")
94+
)
8495

8596
EMAIL_TEST_USER: EmailStr = "[email protected]" # type: ignore
8697
FIRST_SUPERUSER: EmailStr

0 commit comments

Comments
 (0)