Added routers, project finalized

.dockerignore

@@ -2,8 +2,6 @@ __pycache__/
 *.py[cod]
 *$py.class
 
-.venv/
+venv
-venv/
-ENV/
 
 .gitignore

docker-compose.yml

@@ -1,6 +1,19 @@
 version: "3.8"
+
 services:
     api:
         build: .
         ports: 
             - 80:80
+        environment:
+            - DB_URL=mongodb://db/myTestDB
+        volumes:
+            - .:/app
+    db:
+        image: mongo
+        ports:
+            - 27017:27017
+        volumes:
+            - taskdb:/data/db
+volumes:
+    taskdb:

main.py

@@ -3,32 +3,12 @@ from fastapi import (
     FastAPI,
     HTTPException,
     status,
-    Depends,
     Request,
 )
-from fastapi.responses import JSONResponse
-from fastapi.encoders import jsonable_encoder
-from fastapi.security import OAuth2PasswordRequestForm
 
-#=============== Importing modules and other dependecies from /src map =============
+from src.dependecies import authenticate_user
-from src.models import (
+from src.routers import router
-    UserModel,
-    ShowUserModel,
-    UpdateUserModel
-)
-from src.dependecies import (
-    get_current_user,
-    authenticate_user,
-    create_access_token,
-    get_password_hash
-)
-from src.settings import db, ACCESS_TOKEN_EXPIRE_MINUTES
 
-#=============== Importing other python packeges =================================
-from typing import List
-from datetime import datetime, timedelta
-
-import re
 import base64
 import binascii
 
@@ -62,117 +42,4 @@ async def authenticate(request: Request, call_next):
     response = await call_next(request)
     return response
 
-
+app.include_router(router)
-# ============= Creating path operation ==============
-
-@app.post("/token")
-async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends()):
-    user = await authenticate_user(form_data.username, form_data.password)
-    if not user:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorect ID or password",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-    access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
-    access_token = create_access_token(
-        data={"sub": user["_id"]}, expires_delta=access_token_expires
-    )
-    await db["users"].update_one({"_id": form_data.username}, {"$set": {
-        "last_login": datetime.now().strftime("%m/%d/%y %H:%M:%S"),
-        "is_active": "true"
-    }})
-
-    return {"access_token": access_token, "token_type": "bearer"}
-
-
-@app.get("/current", response_description="Current User", response_model=ShowUserModel)
-async def current_user(current_user: ShowUserModel = Depends(get_current_user)):
-    return current_user
-
-
-@app.post("/", response_description="Add new user", response_model=UserModel)
-async def create_user(user: UserModel):
-    if re.match("admin|dev|simple mortal", user.role):
-        datetime_now = datetime.now()
-        user.created_at = datetime_now.strftime("%m/%d/%y %H:%M:%S")
-        user.password = get_password_hash(user.password)
-        user = jsonable_encoder(user)
-        new_user = await db["users"].insert_one(user)
-        await db["users"].update_one({"_id": new_user.inserted_id}, {
-                                     "$rename": {"password": "hashed_pass"}})
-
-        created_user = await db["users"].find_one({"_id": new_user.inserted_id})
-        return JSONResponse(status_code=status.HTTP_201_CREATED, content=created_user)
-
-    raise HTTPException(status_code=406, detail="User role not acceptable")
-
-
-@app.get(
-    "/", response_description="List all users", response_model=List[ShowUserModel]
-)
-async def list_users():
-    users = await db["users"].find().to_list(1000)
-    for user in users:
-        user["is_active"] = "false"
-        try:
-            last_login = datetime.strptime(user["last_login"], "%m/%d/%y %H:%M:%S")
-            my_delta = datetime.now() - last_login
-            if my_delta <= timedelta(days=30):
-                user["is_active"] = "true"
-        except ValueError:
-            pass
-
-    return users
-
-
-@app.get(
-    "/{id}", response_description="Get a single user", response_model=ShowUserModel
-)
-async def show_user(id: str):
-    if (user := await db["users"].find_one({"_id": id})) is not None:
-        user["is_active"] = "false"
-        try:
-            last_login = datetime.strptime(user["last_login"], "%m/%d/%y %H:%M:%S")
-            my_delta = datetime.now() - last_login
-            if my_delta <= timedelta(days=30):
-                user["is_active"] = "true"
-        except ValueError:
-            pass
-        return user
-
-    raise HTTPException(status_code=404, detail=f"User {id} not found")
-
-
-@app.put("/{id}", response_description="Update a user", response_model=UpdateUserModel)
-async def update_user(id: str, user: UpdateUserModel, current_user: UserModel = Depends(get_current_user)):
-    if current_user["role"] == "admin":
-        user = {k: v for k, v in user.dict().items() if v is not None}
-
-
-        if len(user) >= 1:
-            update_result = await db["users"].update_one({"_id": id}, {"$set": user})
-
-            if update_result.modified_count == 1:
-                if (
-                    updated_user := await db["users"].find_one({"_id": id})
-                ) is not None:
-                    return updated_user
-
-        if (existing_user := await db["users"].find_one({"_id": id})) is not None:
-            return existing_user
-
-        raise HTTPException(status_code=404, detail=f"User {id} not found")
-    else:
-        raise HTTPException(status_code=403, detail=f"Not having sufficient rights to modify the content")
-
-
-
-@app.delete("/{id}", response_description="Delete a user")
-async def delete_user(id: str):
-    delete_result = await db["users"].delete_one({"_id": id})
-
-    if delete_result.deleted_count == 1:
-        return JSONResponse(status_code=status.HTTP_204_NO_CONTENT)
-
-    raise HTTPException(status_code=404, detail=f"User {id} not found")

src/routers.py

@@ -0,0 +1,129 @@
+from fastapi import (
+    APIRouter,
+    Depends,
+    status,
+    HTTPException
+)
+from fastapi.responses import JSONResponse
+from fastapi.encoders import jsonable_encoder
+from fastapi.security import OAuth2PasswordRequestForm
+
+from .models import (
+    UserModel,
+    ShowUserModel,
+    UpdateUserModel
+)
+from .dependecies import (
+    get_current_user,
+    authenticate_user,
+    create_access_token,
+    get_password_hash
+)
+from src.settings import db, ACCESS_TOKEN_EXPIRE_MINUTES
+
+from typing import List
+from datetime import datetime, timedelta
+
+import re
+
+router = APIRouter()
+
+# ============= Creating path operation ==============
+@router.post("/", response_description="Add new user", response_model=UserModel)
+async def create_user(user: UserModel):
+    if re.match("admin|dev|simple mortal", user.role):
+        datetime_now = datetime.now()
+        user.created_at = datetime_now.strftime("%m/%d/%y %H:%M:%S")
+        user.password = get_password_hash(user.password)
+        user = jsonable_encoder(user)
+        new_user = await db["users"].insert_one(user)
+        await db["users"].update_one({"_id": new_user.inserted_id}, {
+                                     "$rename": {"password": "hashed_pass"}})
+
+        created_user = await db["users"].find_one({"_id": new_user.inserted_id})
+        return JSONResponse(status_code=status.HTTP_201_CREATED, content=created_user)
+
+    raise HTTPException(status_code=406, detail="User role not acceptable")
+
+
+
+@router.post("/token")
+async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends()):
+    user = await authenticate_user(form_data.username, form_data.password)
+    if not user:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Incorect ID or password",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+    access_token_expires = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
+    access_token = create_access_token(
+        data={"sub": user["_id"]}, expires_delta=access_token_expires
+    )
+    await db["users"].update_one({"_id": form_data.username}, {"$set": {
+        "last_login": datetime.now().strftime("%m/%d/%y %H:%M:%S"),
+        "is_active": "true"
+    }})
+
+    return {"access_token": access_token, "token_type": "bearer"}
+
+
+
+@router.get(
+    "/list", response_description="List all users", response_model=List[ShowUserModel]
+)
+async def list_users():
+    users = await db["users"].find().to_list(1000)
+    for user in users:
+        user["is_active"] = "false"
+        try:
+            last_login = datetime.strptime(user["last_login"], "%m/%d/%y %H:%M:%S")
+            my_delta = datetime.now() - last_login
+            if my_delta <= timedelta(days=30):
+                user["is_active"] = "true"
+        except ValueError:
+            pass
+
+    return users
+
+
+
+@router.get("/current", response_description="Current User", response_model=ShowUserModel)
+async def current_user(current_user: ShowUserModel = Depends(get_current_user)):
+    return current_user
+
+
+
+
+@router.put("/admin/{user_id}", response_description="Update a user", response_model=UpdateUserModel)
+async def update_user(user_id: str, user: UpdateUserModel, current_user: UserModel = Depends(get_current_user)):
+    if current_user["role"] == "admin":
+        user = {k: v for k, v in user.dict().items() if v is not None}
+
+
+        if len(user) >= 1:
+            update_result = await db["users"].update_one({"_id": user_id}, {"$set": user})
+
+            if update_result.modified_count == 1:
+                if (
+                    updated_user := await db["users"].find_one({"_id": user_id})
+                ) is not None:
+                    return updated_user
+
+        if (existing_user := await db["users"].find_one({"_id": user_id})) is not None:
+            return existing_user
+
+        raise HTTPException(status_code=404, detail=f"User {user_id} not found")
+    else:
+        raise HTTPException(status_code=403, detail=f"Not having sufficient rights to modify the content")
+
+
+
+@router.delete("/{user_id}", response_description="Delete a user")
+async def delete_user(user_id: str):
+    delete_result = await db["users"].delete_one({"_id": user_id})
+
+    if delete_result.deleted_count == 1:
+        return JSONResponse(status_code=status.HTTP_204_NO_CONTENT)
+
+    raise HTTPException(status_code=404, detail=f"User {user_id} not found")

src/settings.py

@@ -1,6 +1,7 @@
 from fastapi.security import OAuth2PasswordBearer
 from passlib.context import CryptContext
 
+import os
 import motor.motor_asyncio
 
 # ================= Creating necessary variables ========================
@@ -15,5 +16,5 @@ oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
 
 
 #----------------- Database variables (MongoDB) --------------------------
-client = motor.motor_asyncio.AsyncIOMotorClient("mongodb+srv://Fortask:fortask@cluster0.2mvpj.mongodb.net/DarqubeTask?retryWrites=true&w=majority")
+client = motor.motor_asyncio.AsyncIOMotorClient(os.environ["DB_URL"])
-db = client.DarqubeTask
+db = client.myTestDB