From 75aed25c2f5a2e03f07a946c54741e202abbdd70 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Sat, 16 Jan 2021 22:24:04 +0100 Subject: [PATCH] refactoring: rename package databaseNew to database --- src/Dependencies.py | 2 +- src/StorageLeaf.py | 4 ++-- src/logic/{databaseNew => database}/Crud.py | 2 +- src/logic/{databaseNew => database}/Database.py | 0 src/logic/{databaseNew => database}/Models.py | 2 +- src/logic/{databaseNew => database}/Schemas.py | 0 src/logic/{databaseNew => database}/__init__.py | 0 src/logic/routers/DeviceRouter.py | 4 ++-- src/logic/routers/MeasurementRouter.py | 4 ++-- src/logic/routers/SensorRouter.py | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) rename src/logic/{databaseNew => database}/Crud.py (98%) rename src/logic/{databaseNew => database}/Database.py (100%) rename src/logic/{databaseNew => database}/Models.py (96%) rename src/logic/{databaseNew => database}/Schemas.py (100%) rename src/logic/{databaseNew => database}/__init__.py (100%) diff --git a/src/Dependencies.py b/src/Dependencies.py index 025d430..28a15d0 100644 --- a/src/Dependencies.py +++ b/src/Dependencies.py @@ -5,7 +5,7 @@ from fastapi.security import APIKeyHeader from starlette.status import HTTP_403_FORBIDDEN from Settings import SETTINGS -from logic.databaseNew.Database import SessionLocal +from logic.database.Database import SessionLocal def get_database(): diff --git a/src/StorageLeaf.py b/src/StorageLeaf.py index 8a2e7b6..2652bb3 100644 --- a/src/StorageLeaf.py +++ b/src/StorageLeaf.py @@ -7,8 +7,8 @@ from starlette.responses import RedirectResponse from Settings import SETTINGS from logic import Constants -from logic.databaseNew import Models, Schemas -from logic.databaseNew.Database import engine +from logic.database import Models, Schemas +from logic.database.Database import engine from logic.routers import DeviceRouter from logic.routers import SensorRouter, MeasurementRouter diff --git a/src/logic/databaseNew/Crud.py b/src/logic/database/Crud.py similarity index 98% rename from src/logic/databaseNew/Crud.py rename to src/logic/database/Crud.py index ecfb9c2..052f85d 100644 --- a/src/logic/databaseNew/Crud.py +++ b/src/logic/database/Crud.py @@ -5,7 +5,7 @@ from sqlalchemy.orm import Session from Settings import SETTINGS from logic.BackupService import BackupService -from logic.databaseNew import Models, Schemas +from logic.database import Models, Schemas DATE_FORMAT = '%Y-%m-%d %H:%M:%S' diff --git a/src/logic/databaseNew/Database.py b/src/logic/database/Database.py similarity index 100% rename from src/logic/databaseNew/Database.py rename to src/logic/database/Database.py diff --git a/src/logic/databaseNew/Models.py b/src/logic/database/Models.py similarity index 96% rename from src/logic/databaseNew/Models.py rename to src/logic/database/Models.py index c6fb22b..b019c58 100644 --- a/src/logic/databaseNew/Models.py +++ b/src/logic/database/Models.py @@ -1,7 +1,7 @@ from sqlalchemy import Column, ForeignKey, Integer, String from sqlalchemy.orm import relationship -from logic.databaseNew.Database import Base +from logic.database.Database import Base class Device(Base): diff --git a/src/logic/databaseNew/Schemas.py b/src/logic/database/Schemas.py similarity index 100% rename from src/logic/databaseNew/Schemas.py rename to src/logic/database/Schemas.py diff --git a/src/logic/databaseNew/__init__.py b/src/logic/database/__init__.py similarity index 100% rename from src/logic/databaseNew/__init__.py rename to src/logic/database/__init__.py diff --git a/src/logic/routers/DeviceRouter.py b/src/logic/routers/DeviceRouter.py index 29b0d41..203ebc7 100644 --- a/src/logic/routers/DeviceRouter.py +++ b/src/logic/routers/DeviceRouter.py @@ -4,8 +4,8 @@ from fastapi import APIRouter, HTTPException, Depends from sqlalchemy.orm import Session from Dependencies import get_database, check_api_key -from logic.databaseNew import Schemas, Crud -from logic.databaseNew.Schemas import Status +from logic.database import Schemas, Crud +from logic.database.Schemas import Status router = APIRouter( prefix='/device', diff --git a/src/logic/routers/MeasurementRouter.py b/src/logic/routers/MeasurementRouter.py index 6684d1f..7a0193c 100644 --- a/src/logic/routers/MeasurementRouter.py +++ b/src/logic/routers/MeasurementRouter.py @@ -4,8 +4,8 @@ from fastapi import APIRouter, HTTPException, Depends, Query from sqlalchemy.orm import Session from Dependencies import get_database, check_api_key, START_DATE_TIME, END_DATE_TIME -from logic.databaseNew import Schemas, Crud -from logic.databaseNew.Schemas import Status, MinMax +from logic.database import Schemas, Crud +from logic.database.Schemas import Status, MinMax router = APIRouter(tags=['measurement']) diff --git a/src/logic/routers/SensorRouter.py b/src/logic/routers/SensorRouter.py index 66a5375..500bfc2 100644 --- a/src/logic/routers/SensorRouter.py +++ b/src/logic/routers/SensorRouter.py @@ -4,8 +4,8 @@ from fastapi import APIRouter, HTTPException, Depends from sqlalchemy.orm import Session from Dependencies import get_database, check_api_key, START_DATE_TIME, END_DATE_TIME -from logic.databaseNew import Schemas, Crud -from logic.databaseNew.Schemas import Status +from logic.database import Schemas, Crud +from logic.database.Schemas import Status router = APIRouter( prefix='/sensor', -- GitLab