Docker compose manifest

Author: Youngestdev

app/__init__.py renamed to __init__.py

@@ -10,7 +10,7 @@
 
 @app.get("/", tags=["Root"])
 async def read_root():
-    return {"message": "Welcome to this fantastic app, sighs."}
+    return {"message": "Welcome to this fantastic app."}
 
 
 app.include_router(AdminRouter, tags=["Administrator"], prefix="/admin")

app/server/app.py renamed to app.py

@@ -2,7 +2,7 @@
 from fastapi.security import HTTPBasicCredentials, HTTPBasic
 from passlib.context import CryptContext
 
-from app.server.database.database import admin_collection
+from database.database import admin_collection
 
 security = HTTPBasic()
 hash_helper = CryptContext(schemes=["bcrypt"])

app/server/auth/admin.py renamed to auth/admin.py

@@ -1,17 +1,13 @@
-# Code copied from github.com/overrideveloper/HowAreYouApi*
 from fastapi import Request, HTTPException
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 
 from .jwt_handler import decodeJWT
-# from models.Database import Database
 
 
 class JWTBearer(HTTPBearer):
-    # db: Database = None
 
     def __init__(self, auto_error: bool = True):
         super(JWTBearer, self).__init__(auto_error=auto_error)
-        # self.db = db
 
     async def __call__(self, request: Request):
         credentials: HTTPAuthorizationCredentials = await super(JWTBearer, self).__call__(request)

app/server/auth/jwt_bearer.py renamed to auth/jwt_bearer.py

@@ -27,4 +27,4 @@ def decodeJWT(token: str) -> dict:
         decoded_token = jwt.decode(token.encode(), JWT_SECRET, algorithms=["HS256"])
         return decoded_token if decoded_token['expires'] >= time.time() else None
     except:
-        return None
+        return {}

app/server/auth/jwt_handler.py renamed to auth/jwt_handler.py

@@ -2,7 +2,7 @@
 from bson import ObjectId
 from decouple import config
 
-from app.server.database.database_helper import student_helper, admin_helper
+from database.database_helper import student_helper, admin_helper
 
 MONGO_DETAILS = config('MONGO_DETAILS')
 

app/server/database/database.py renamed to database/database.py

@@ -0,0 +1,20 @@
+version: "3"
+
+services:
+  web:
+    build: .
+    ports:
+      - 8080:8080
+    env_file:
+      - .env
+
+  mongodb:
+    image: bitnami/mongodb:latest
+    ports:
+      - 27017
+    volumes:
+      - data:/bitnami/mongodb
+
+
+volumes:
+  data:

app/server/database/database_helper.py renamed to database/database_helper.py

@@ -3,11 +3,10 @@
 from fastapi.security import HTTPBasicCredentials
 from passlib.context import CryptContext
 
-from server.database.database import admin_collection
-#from app.server.auth.admin import validate_login
-from server.auth.jwt_handler import signJWT
-from server.database.database import add_admin
-from server.models.admin import AdminModel
+from database.database import admin_collection
+from auth.jwt_handler import signJWT
+from database.database import add_admin
+from models.admin import AdminModel
 
 router = APIRouter()
 
@@ -27,14 +26,6 @@ async def admin_login(admin_credentials: HTTPBasicCredentials = Body(...)):
 
     return "Incorrect email or password"
 
-    # OLD CODE 
-    # if validate_login(admin):
-    #     return {
-    #         "email": admin.username,
-    #         "access_token": signJWT(admin.username)
-    #     }
-    # return "Invalid Login Details!"
-
 @router.post("/")
 async def admin_signup(admin: AdminModel = Body(...)):
     admin_exists = await admin_collection.find_one({"email":  admin.email}, {"_id": 0})

docker-compose.yml

@@ -1,8 +1,8 @@
 from fastapi import APIRouter, Body
 from fastapi.encoders import jsonable_encoder
 
-from app.server.database.database import *
-from app.server.models.student import *
+from database.database import *
+from models.student import *
 
 router = APIRouter()
 
@@ -21,7 +21,7 @@ async def get_student_data(id):
     student = await retrieve_student(id)
     return ResponseModel(student, "Student data retrieved successfully") \
         if student \
-        else ErrorResponseModel("An error occured.", 404, "Student doesn'exist.")
+        else ErrorResponseModel("An error occured.", 404, "Student doesn't exist.")
 
 
 @router.post("/", response_description="Student data added into the database")