From d1c17389172813cf98ea85ef1a80c0e94ef363be Mon Sep 17 00:00:00 2001
From: lvrossem <lvrossem@localhost>
Date: Tue, 28 Mar 2023 15:12:11 -0600
Subject: [PATCH] Some formatting and cleanup

---
 src/crud.py     | 7 +++----
 src/database.py | 1 -
 src/main.py     | 5 +----
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/crud.py b/src/crud.py
index c6263ca..6cf1849 100644
--- a/src/crud.py
+++ b/src/crud.py
@@ -1,8 +1,7 @@
 from sqlalchemy.orm import Session
 
-import models
-import schemas
 from models import CourseProgress, HighScore, User
+from schemas.users import UserCreate
 
 
 def get_user(db: Session, user_id: int):
@@ -17,8 +16,8 @@ def get_users(db: Session):
     return db.query(User).all()
 
 
-def create_user(db: Session, user: schemas.users.UserCreate):
-    db_user = models.User(username=user.username, hashed_password=user.password)
+def create_user(db: Session, user: UserCreate):
+    db_user = User(username=user.username, hashed_password=user.password)
     db.add(db_user)
     db.commit()
     db.refresh(db_user)
diff --git a/src/database.py b/src/database.py
index 6417662..533adf5 100644
--- a/src/database.py
+++ b/src/database.py
@@ -2,7 +2,6 @@ from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
-# SQLALCHEMY_DATABASE_URL = "sqlite:///./sql_app.db"
 SQLALCHEMY_DATABASE_URL = "postgresql://admin:WeSign123!@localhost/wesigndev"
 
 engine = create_engine(SQLALCHEMY_DATABASE_URL)
diff --git a/src/main.py b/src/main.py
index 2856f02..83cc2f1 100644
--- a/src/main.py
+++ b/src/main.py
@@ -16,16 +16,13 @@ Base.metadata.create_all(bind=engine)
 def get_db():
     db = SessionLocal()
     try:
-        print("Yield")
         yield db
     finally:
-        print("Close")
         db.close()
 
 
 @app.get("/")
 async def root():
-    print("Hello world")
     return {"message": "Hello world!"}
 
 
@@ -33,7 +30,7 @@ async def root():
 async def create_user(user: users.UserCreate, db: Session = Depends(get_db)):
     db_user = crud.get_user_by_username(db, username=user.username)
     if db_user:
-        raise HTTPException(status_code=400, detail="Email already registered")
+        raise HTTPException(status_code=400, detail="Username already registered")
     return crud.create_user(db=db, user=user)