refactoring: rename package databaseNew to database

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():

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
 

src/logic/databaseNew/Crud.py → 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'
 

src/logic/databaseNew/Models.py → src/logic/database/Models.py

 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):

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',

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'])
 

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',