From 7423511a512df8ee8f8ab980ff9ac1a6f97b2338 Mon Sep 17 00:00:00 2001 From: Adrien Date: Sun, 22 Jan 2023 18:58:47 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20backend=20component?= =?UTF-8?q?=20(idfm=5Fmatrix=5Fbackend=20->=20backend)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/{idfm_matrix_backend => backend}/db/__init__.py | 0 backend/{idfm_matrix_backend => backend}/db/base_class.py | 0 backend/{idfm_matrix_backend => backend}/db/db.py | 0 .../idfm_interface/__init__.py | 0 .../idfm_interface/idfm_interface.py | 0 .../idfm_interface/idfm_types.py | 0 .../idfm_interface/ratp_types.py | 0 .../{idfm_matrix_backend => backend}/models/__init__.py | 0 backend/{idfm_matrix_backend => backend}/models/line.py | 0 backend/{idfm_matrix_backend => backend}/models/stop.py | 0 backend/{idfm_matrix_backend => backend}/models/user.py | 0 .../{idfm_matrix_backend => backend}/schemas/__init__.py | 0 backend/{idfm_matrix_backend => backend}/schemas/line.py | 0 .../schemas/next_passage.py | 0 backend/{idfm_matrix_backend => backend}/schemas/stop.py | 0 backend/main.py | 8 ++++---- 16 files changed, 4 insertions(+), 4 deletions(-) rename backend/{idfm_matrix_backend => backend}/db/__init__.py (100%) rename backend/{idfm_matrix_backend => backend}/db/base_class.py (100%) rename backend/{idfm_matrix_backend => backend}/db/db.py (100%) rename backend/{idfm_matrix_backend => backend}/idfm_interface/__init__.py (100%) rename backend/{idfm_matrix_backend => backend}/idfm_interface/idfm_interface.py (100%) rename backend/{idfm_matrix_backend => backend}/idfm_interface/idfm_types.py (100%) rename backend/{idfm_matrix_backend => backend}/idfm_interface/ratp_types.py (100%) rename backend/{idfm_matrix_backend => backend}/models/__init__.py (100%) rename backend/{idfm_matrix_backend => backend}/models/line.py (100%) rename backend/{idfm_matrix_backend => backend}/models/stop.py (100%) rename backend/{idfm_matrix_backend => backend}/models/user.py (100%) rename backend/{idfm_matrix_backend => backend}/schemas/__init__.py (100%) rename backend/{idfm_matrix_backend => backend}/schemas/line.py (100%) rename backend/{idfm_matrix_backend => backend}/schemas/next_passage.py (100%) rename backend/{idfm_matrix_backend => backend}/schemas/stop.py (100%) 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/main.py b/backend/main.py index f9e58a1..e06f843 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, From 76d4c8a641996f8e5342f7fa6bd73e086c002890 Mon Sep 17 00:00:00 2001 From: Adrien Date: Sun, 22 Jan 2023 19:01:15 +0100 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20backend=20project?= =?UTF-8?q?=20(idfm-matrix-widget=20->=20carrramba-encore-rate)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the pyproject.toml file. --- backend/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" From dea6b928e155295a31076591be6a5f7055b79b6c Mon Sep 17 00:00:00 2001 From: Adrien Date: Sun, 22 Jan 2023 19:02:54 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Create=20and=20use?= =?UTF-8?q?=20a=20db=20dedicated=20user=20for=20backend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rename the db name (idfm_matrix_bot -> cer_db). * Remove unused bot database. * Create a dedicated user (cer_user/cer_password). --- .../docker-entrypoint-initdb.d/init-user-db.sh | 10 +++++----- backend/main.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) 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 e06f843..d5a6f14 100644 --- a/backend/main.py +++ b/backend/main.py @@ -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()