초기 세팅

-

.github/workflows/deploy.yml

@@ -50,10 +50,10 @@ jobs:
               sudo pip install -r requirements.txt
             
               echo "############# Server Stop #############"
-              sudo pkill uvicorn
+              sudo fuser -k 80/tcp
               
               echo "############# Server Start #############"
-              sudo python3 -m uvicorn main:app 
+              sudo python3 main.py
             else
               echo "############## git pull: Error ##############"
               exit 1;

core/database.py

@@ -4,11 +4,11 @@
 from starlette.config import Config
 
 config = Config('.env')
-SQLALCHEMY_DATABASE_URL = config('SQLALCHEMY_DATABASE_URL')
+DATABASE_URL = f"mariadb:///?User={config.get('USER')}&Password={config.get('PASSWORD')}&Database={config.get('DATABASE')}&Server={config.get('HOST')}&Port={config.get('PORT')}"
+
+# Craate Engin for mariadb
+engine = create_engine(DATABASE_URL, echo=False)
 
-engine = create_engine(
-    SQLALCHEMY_DATABASE_URL, connect_args={"check_same_thread": False}
-)
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
 Base = declarative_base()

core/models/models.py

@@ -5,7 +5,7 @@
 
 
 class User(Base):
-    __tablename__ = "user"
+    __tablename__ = "Users"
 
     id = Column(Integer, primary_key=True, autoincrement=True)
     stdId = Column(String, unique=True, nullable=False)

core/schemas/__init__.py

@@ -1,4 +1,2 @@
-from core.schemas import playlist_info
-from core.schemas import song
 from core.schemas import user
 

dependencies.py

@@ -11,7 +11,6 @@
 from core.database import get_db
 
 config = Config('.env')
-SQLALCHEMY_DATABASE_URL = config('SQLALCHEMY_DATABASE_URL')
 
 ACCESS_TOKEN_EXPIRE_MINUTES = float(config('ACCESS_TOKEN_EXPIRE_MINUTES'))
 SECRET_KEY = config('SECRET_KEY')

internal/admin_crud.py

@@ -1,5 +1,4 @@
 from sqlalchemy.orm import Session
-
 from core.models.models import User
 
 

routers/user/users_router.py

@@ -15,7 +15,6 @@
 from routers.user.user_crud import pwd_context
 
 config = Config('.env')
-SQLALCHEMY_DATABASE_URL = config('SQLALCHEMY_DATABASE_URL')
 
 ACCESS_TOKEN_EXPIRE_MINUTES = float(config('ACCESS_TOKEN_EXPIRE_MINUTES'))
 SECRET_KEY = config('SECRET_KEY')
@@ -27,7 +26,6 @@
     tags=["user"]
 )
 
-
 # User
 # Create
 @router.post("/register", status_code=status.HTTP_204_NO_CONTENT)