From 12432286bf7ffabd7ac3a4f6e8854a129b7d1747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?=
 <40151420+ldericher@users.noreply.github.com>
Date: Mon, 28 Mar 2022 01:34:52 +0000
Subject: [PATCH] rename db_new -> db

---
 api/kiwi_vpn_api/{db_new => db}/__init__.py   | 0
 api/kiwi_vpn_api/{db_new => db}/capability.py | 0
 api/kiwi_vpn_api/{db_new => db}/connection.py | 0
 api/kiwi_vpn_api/{db_new => db}/device.py     | 0
 api/kiwi_vpn_api/{db_new => db}/user.py       | 0
 api/kiwi_vpn_api/main.py                      | 2 +-
 api/kiwi_vpn_api/routers/_common.py           | 2 +-
 api/kiwi_vpn_api/routers/admin.py             | 2 +-
 8 files changed, 3 insertions(+), 3 deletions(-)
 rename api/kiwi_vpn_api/{db_new => db}/__init__.py (100%)
 rename api/kiwi_vpn_api/{db_new => db}/capability.py (100%)
 rename api/kiwi_vpn_api/{db_new => db}/connection.py (100%)
 rename api/kiwi_vpn_api/{db_new => db}/device.py (100%)
 rename api/kiwi_vpn_api/{db_new => db}/user.py (100%)

diff --git a/api/kiwi_vpn_api/db_new/__init__.py b/api/kiwi_vpn_api/db/__init__.py
similarity index 100%
rename from api/kiwi_vpn_api/db_new/__init__.py
rename to api/kiwi_vpn_api/db/__init__.py
diff --git a/api/kiwi_vpn_api/db_new/capability.py b/api/kiwi_vpn_api/db/capability.py
similarity index 100%
rename from api/kiwi_vpn_api/db_new/capability.py
rename to api/kiwi_vpn_api/db/capability.py
diff --git a/api/kiwi_vpn_api/db_new/connection.py b/api/kiwi_vpn_api/db/connection.py
similarity index 100%
rename from api/kiwi_vpn_api/db_new/connection.py
rename to api/kiwi_vpn_api/db/connection.py
diff --git a/api/kiwi_vpn_api/db_new/device.py b/api/kiwi_vpn_api/db/device.py
similarity index 100%
rename from api/kiwi_vpn_api/db_new/device.py
rename to api/kiwi_vpn_api/db/device.py
diff --git a/api/kiwi_vpn_api/db_new/user.py b/api/kiwi_vpn_api/db/user.py
similarity index 100%
rename from api/kiwi_vpn_api/db_new/user.py
rename to api/kiwi_vpn_api/db/user.py
diff --git a/api/kiwi_vpn_api/main.py b/api/kiwi_vpn_api/main.py
index 4730d7e..887f52e 100755
--- a/api/kiwi_vpn_api/main.py
+++ b/api/kiwi_vpn_api/main.py
@@ -14,7 +14,7 @@ from fastapi import FastAPI
 
 from .config import Config, Settings
 # from .db.schemata import User
-from .db_new import Connection
+from .db import Connection
 from .routers import main_router
 
 settings = Settings.get()
diff --git a/api/kiwi_vpn_api/routers/_common.py b/api/kiwi_vpn_api/routers/_common.py
index 7420ce0..295e404 100644
--- a/api/kiwi_vpn_api/routers/_common.py
+++ b/api/kiwi_vpn_api/routers/_common.py
@@ -7,7 +7,7 @@ from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
 
 from ..config import Config
-from ..db_new import Capability, User
+from ..db import Capability, User
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="user/authenticate")
 
diff --git a/api/kiwi_vpn_api/routers/admin.py b/api/kiwi_vpn_api/routers/admin.py
index 6b6f3fa..866f6a4 100644
--- a/api/kiwi_vpn_api/routers/admin.py
+++ b/api/kiwi_vpn_api/routers/admin.py
@@ -6,7 +6,7 @@
 from fastapi import APIRouter, Depends, HTTPException, status
 
 from ..config import Config
-from ..db_new import Capability, Connection, User, UserCreate
+from ..db import Capability, Connection, User, UserCreate
 from ._common import Responses, get_current_user_if_admin
 
 router = APIRouter(prefix="/admin", tags=["admin"])