From 20e1c42815ce4808dd920c1b1c1b14a8e8cd82e6 Mon Sep 17 00:00:00 2001
From: Rykov7 <rykov7@protonmail.ch>
Date: Sat, 2 Sep 2023 19:14:04 +0300
Subject: [PATCH] Refactor models

---
 app/database.py | 13 -------------
 app/models.py   | 13 +++++++++++--
 2 files changed, 11 insertions(+), 15 deletions(-)
 delete mode 100644 app/database.py

diff --git a/app/database.py b/app/database.py
deleted file mode 100644
index ccd17f8..0000000
--- a/app/database.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import os
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-from .models import Base
-basedir = os.path.abspath(os.path.dirname(__file__))
-
-engine = create_engine('sqlite:///' + os.path.join(basedir, 'db/db.sqlite'))
-
-
-Base.metadata.create_all(engine)
-
-Session = sessionmaker(bind=engine)
-session = Session()
diff --git a/app/models.py b/app/models.py
index cf94eea..44dcd58 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1,9 +1,18 @@
+import os
 from sqlalchemy import Column, String, Integer, Boolean, ForeignKey
-from sqlalchemy.orm import relationship, declarative_base
+from sqlalchemy.orm import relationship, declarative_base, sessionmaker
 
-from .database import session
+from sqlalchemy import create_engine
 
 Base = declarative_base()
+basedir = os.path.abspath(os.path.dirname(__file__))
+
+engine = create_engine('sqlite:///' + os.path.join(basedir, 'db/db.sqlite'))
+Base.metadata.create_all(engine)
+
+Session = sessionmaker(bind=engine)
+session = Session()
+
 
 class Permission:
     USE_COMMANDS = 1     # Пользоваться обычными командами.