diff --git a/backend/idfm_matrix_backend/db/__init__.py b/backend/backend/db/__init__.py similarity index 100% rename from backend/idfm_matrix_backend/db/__init__.py rename to backend/backend/db/__init__.py diff --git a/backend/idfm_matrix_backend/db/base_class.py b/backend/backend/db/base_class.py similarity index 100% rename from backend/idfm_matrix_backend/db/base_class.py rename to backend/backend/db/base_class.py diff --git a/backend/idfm_matrix_backend/db/db.py b/backend/backend/db/db.py similarity index 100% rename from backend/idfm_matrix_backend/db/db.py rename to backend/backend/db/db.py diff --git a/backend/idfm_matrix_backend/idfm_interface/__init__.py b/backend/backend/idfm_interface/__init__.py similarity index 100% rename from backend/idfm_matrix_backend/idfm_interface/__init__.py rename to backend/backend/idfm_interface/__init__.py diff --git a/backend/idfm_matrix_backend/idfm_interface/idfm_interface.py b/backend/backend/idfm_interface/idfm_interface.py similarity index 100% rename from backend/idfm_matrix_backend/idfm_interface/idfm_interface.py rename to backend/backend/idfm_interface/idfm_interface.py diff --git a/backend/idfm_matrix_backend/idfm_interface/idfm_types.py b/backend/backend/idfm_interface/idfm_types.py similarity index 100% rename from backend/idfm_matrix_backend/idfm_interface/idfm_types.py rename to backend/backend/idfm_interface/idfm_types.py diff --git a/backend/idfm_matrix_backend/idfm_interface/ratp_types.py b/backend/backend/idfm_interface/ratp_types.py similarity index 100% rename from backend/idfm_matrix_backend/idfm_interface/ratp_types.py rename to backend/backend/idfm_interface/ratp_types.py diff --git a/backend/idfm_matrix_backend/models/__init__.py b/backend/backend/models/__init__.py similarity index 100% rename from backend/idfm_matrix_backend/models/__init__.py rename to backend/backend/models/__init__.py diff --git a/backend/idfm_matrix_backend/models/line.py b/backend/backend/models/line.py similarity index 100% rename from backend/idfm_matrix_backend/models/line.py rename to backend/backend/models/line.py diff --git a/backend/idfm_matrix_backend/models/stop.py b/backend/backend/models/stop.py similarity index 100% rename from backend/idfm_matrix_backend/models/stop.py rename to backend/backend/models/stop.py diff --git a/backend/idfm_matrix_backend/models/user.py b/backend/backend/models/user.py similarity index 100% rename from backend/idfm_matrix_backend/models/user.py rename to backend/backend/models/user.py diff --git a/backend/idfm_matrix_backend/schemas/__init__.py b/backend/backend/schemas/__init__.py similarity index 100% rename from backend/idfm_matrix_backend/schemas/__init__.py rename to backend/backend/schemas/__init__.py diff --git a/backend/idfm_matrix_backend/schemas/line.py b/backend/backend/schemas/line.py similarity index 100% rename from backend/idfm_matrix_backend/schemas/line.py rename to backend/backend/schemas/line.py diff --git a/backend/idfm_matrix_backend/schemas/next_passage.py b/backend/backend/schemas/next_passage.py similarity index 100% rename from backend/idfm_matrix_backend/schemas/next_passage.py rename to backend/backend/schemas/next_passage.py diff --git a/backend/idfm_matrix_backend/schemas/stop.py b/backend/backend/schemas/stop.py similarity index 100% rename from backend/idfm_matrix_backend/schemas/stop.py rename to backend/backend/schemas/stop.py diff --git a/backend/docker/database/docker-entrypoint-initdb.d/init-user-db.sh b/backend/docker/database/docker-entrypoint-initdb.d/init-user-db.sh index 9b9f4ef..ca03242 100755 --- a/backend/docker/database/docker-entrypoint-initdb.d/init-user-db.sh +++ b/backend/docker/database/docker-entrypoint-initdb.d/init-user-db.sh @@ -2,10 +2,10 @@ set -e psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL - CREATE USER idfm_matrix_bot; - CREATE DATABASE bot; - CREATE DATABASE idfm; - GRANT ALL PRIVILEGES ON DATABASE bot TO idfm_matrix_bot; - GRANT ALL PRIVILEGES ON DATABASE idfm TO idfm_matrix_bot; + CREATE USER cer_user WITH ENCRYPTED password 'cer_password'; + CREATE DATABASE cer_db; + \c cer_db; + CREATE EXTENSION IF NOT EXISTS pg_trgm SCHEMA "public"; + GRANT CREATE ON SCHEMA public to cer_user; EOSQL diff --git a/backend/main.py b/backend/main.py index f9e58a1..d5a6f14 100644 --- a/backend/main.py +++ b/backend/main.py @@ -8,10 +8,10 @@ from fastapi.responses import JSONResponse from fastapi.staticfiles import StaticFiles from rich import print -from idfm_matrix_backend.db import db -from idfm_matrix_backend.idfm_interface import IdfmInterface -from idfm_matrix_backend.models import Line, Stop, StopArea -from idfm_matrix_backend.schemas import ( +from backend.db import db +from backend.idfm_interface import IdfmInterface +from backend.models import Line, Stop, StopArea +from backend.schemas import ( Line as LineSchema, TransportMode, NextPassage as NextPassageSchema, @@ -24,7 +24,7 @@ API_KEY = environ.get("API_KEY") # TODO: Add error message if no key is given. # TODO: Remove postgresql+asyncpg from environ variable -DB_PATH = "postgresql+asyncpg://postgres:postgres@127.0.0.1:5438/idfm" +DB_PATH = "postgresql+asyncpg://cer_user:cer_password@127.0.0.1:5438/cer_db" app = FastAPI() diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 06dcbcf..e7d55af 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -1,10 +1,10 @@ [tool.poetry] -name = "idfm-matrix-widget" +name = "carrramba-encore-rate" version = "0.1.0" description = "" authors = ["Adrien SUEUR "] readme = "README.md" -packages = [{include = "idfm_matrix_backend"}] +packages = [{include = "backend"}] [tool.poetry.dependencies] python = "^3.11"