Fixed unexpected behaviour

Author: KevinNadar

models/users.py

@@ -14,7 +14,7 @@ class Users(Base):
     storyline = Column(Integer)
     start = Column(Time)
     end = Column(Time)
-    progress = Column(Integer)
+    progress = Column(Integer, default=1)
     hintcount = Column(Integer)
     totaltime = Column(Time)
 

routes/hintcount.py

@@ -1,7 +1,7 @@
 from models.users import Users
 from routes.login import manager
 from models.database import database
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, status
 from fastapi.responses import JSONResponse
 
 router = APIRouter(prefix="/hintcount")
@@ -11,11 +11,11 @@
 async def get_hintcount(user=Depends(manager)):
     hintcount = database.query(Users).filter_by(email=user.email).one().hintcount
     print(hintcount)
-    newhintcount = hintcount +1
+    newhintcount = hintcount + 1
     database.query(Users).filter_by(email=user.email).update({"hintcount": newhintcount})
     database.commit()
     return JSONResponse(
-        status_code=200,
+        status_code=status.HTTP_200_OK,
         content={
             "hintcount": newhintcount
         }

routes/login.py

@@ -6,7 +6,7 @@
 
 from pydantic import BaseModel
 from sqlalchemy.exc import NoResultFound
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, status
 from fastapi.responses import JSONResponse
 from fastapi.security import OAuth2PasswordRequestForm
 from fastapi_login import LoginManager
@@ -46,18 +46,8 @@ async def login(data: OAuth2PasswordRequestForm = Depends()):
         raise InvalidCredentialsException
     else:
         access_token = manager.create_access_token(data={"sub": email}, expires=timedelta(hours=3))
-        """
-        starting = Users(email=user.email).get_start()
-        if not starting:  # When starting is None
-            return JSONResponse(
-                status_code=200,
-                content={
-                    "access_token": access_token,
-                    "token_type": "bearer",
-                    "start_time": None
-            """
         return JSONResponse(
-            status_code=200,
+            status_code=status.HTTP_200_OK,
             content={
                 "access_token": access_token,
                 "token_type": "bearer",
@@ -68,6 +58,6 @@ async def login(data: OAuth2PasswordRequestForm = Depends()):
 @router.post("/verify")
 async def data(user=Depends(manager)):
     return JSONResponse(
-        status_code=200,
+        status_code=status.HTTP_200_OK,
         content="You are logged in as " + user.email
     )

routes/start.py

@@ -3,7 +3,7 @@
 from models.users import Users
 from routes.login import manager
 from datetime import datetime, date, time
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, status
 from fastapi.responses import JSONResponse
 
 router = APIRouter(prefix="/time")
@@ -13,7 +13,7 @@
 async def start(user=Depends(manager)):
     starting = Users(email=user.email).set_start()
     return JSONResponse(
-        status_code=200,
+        status_code=status.HTTP_200_OK,
         content={
             "start_time": {
                 "hours": starting.hour,
@@ -45,7 +45,7 @@ async def sendtime(user=Depends(manager)):
     database.query(Users).filter_by(email=user.email).update({"totaltime": total_time_second})
     database.commit()
     return JSONResponse(
-        status_code=200,
+        status_code=status.HTTP_200_OK,
         content={
             "total_time": total_time_second
         }

routes/storeline.py

@@ -3,7 +3,7 @@
 from models.users import Users
 from routes.login import manager
 from models.games import *
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, status
 from fastapi.responses import JSONResponse
 
 router = APIRouter(prefix="/question")
@@ -27,7 +27,7 @@ async def question_progress(user=Depends(manager)):
     progress = database.query(Users).filter_by(email=user.email).one().progress
     question = database.query(story).filter_by(qnum=progress).one().question
     return JSONResponse(
-        status_code=200,
+        status_code=status.HTTP_200_OK,
         content={
             "Question": question,
         }
@@ -47,23 +47,22 @@ async def answer_progress(progress: int, answer_data: Answer, user=Depends(manag
 
         if progress <= 7:
             next_question = database.query(story).filter_by(qnum=progress + 1).one().question
-        elif progress == 9:
-            Users(email=user.email).set_end()
-        else:
+        elif progress == 8:
             next_question = None
+            Users(email=user.email).set_end()
 
         database.commit()
 
         return JSONResponse(
-            status_code=200,
+            status_code=status.HTTP_200_OK,
             content={
                 "Correct": True,
                 "NextQuestion": next_question
             }
         )
     else:
         return JSONResponse(
-            status_code=200,
+            status_code=status.HTTP_200_OK,
             content={
                 "Correct": False
             }