user enpoint created and tested

README.md

@@ -69,6 +69,21 @@ The project structure is organized as follows:
 - `README.md`: this file.
 - `.vscode`: contains Visual Studio Code configuration files.
 
+## Active Paths
+| Path                     | Name                 | Methods     |
+| ------------------------|----------------------|-------------|
+| /api/v1/openapi.json     | openapi              | GET, HEAD   |
+| /docs                    | swagger_ui_html      | GET, HEAD   |
+| /docs/oauth2-redirect    | swagger_ui_redirect  | GET, HEAD   |
+| /redoc                   | redoc_html           | GET, HEAD   |
+| /api/v1/items/           | read_items           | GET         |
+| /api/v1/items/{item_id}  | read_item            | GET         |
+| /api/v1/users/           | create_user          | POST        |
+| /api/v1/users/{user_id}/ | read_user            | GET         |
+| /api/v1/users/{user_id}/ | update_user          | PUT         |
+| /api/v1/users/{user_id}/ | delete_user          | DELETE      |
+| /api/v1/transcribe/      | post_audio           | POST        |
+
 
 ## Run this Project
 

app/api/__init__.py

@@ -1,10 +1,9 @@
 # File: whisper.api/app/api/__init__.py
 
 from fastapi import APIRouter
-from .endpoints import items, users, transcribe
+from .endpoints import users, transcribe
 
 api_router = APIRouter()
 
-api_router.include_router(items.router, prefix="/items", tags=["items"])
 api_router.include_router(users.router, prefix="/users", tags=["users"])
 api_router.include_router(transcribe.router, prefix="/transcribe", tags=["transcribe"])

app/api/endpoints/__init__.py

@@ -2,10 +2,9 @@
 
 from fastapi import APIRouter
 
-from . import items, users, transcribe
+from . import users, transcribe
 
 router = APIRouter()
 
-router.include_router(items.router, prefix="/items", tags=["items"])
 router.include_router(users.router, prefix="/users", tags=["users"])
 router.include_router(transcribe.router, prefix="/transcribe", tags=["transcribe"])

app/api/endpoints/items.py

@@ -1,13 +0,0 @@
-from fastapi import APIRouter
-
-router = APIRouter()
-
-
-@router.get("/")
-async def read_items():
-    return [{"name": "Item Foo"}, {"name": "item Bar"}]
-
-
-@router.get("/{item_id}")
-async def read_item(item_id: int, q: str = None):
-    return {"item_id": item_id, "q": q}

app/api/endpoints/users.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, HTTPException
 from uuid import UUID
 
-from app.api.models.user import User, UpdateUser, UserResponse
+from app.api.models.user import User, UpdateUser, UserResponse, PasswordUpdate
 from app.core.database import SessionLocal
 from app.core.security import get_password_hash, verify_password
 from app.core.models import UserInDB
@@ -28,29 +28,23 @@ async def create_user(user: User):
 
 @router.get("/{user_id}/", response_model=UserResponse)
 async def read_user(user_id: UUID):
-    db_user = database.query(UserInDB).filter(UserInDB.id == user_id).first()
-    if not db_user:
-        raise HTTPException(status_code=404, detail="User not found")
-    return UserResponse.from_orm(db_user)
+    try:
+        USER = UserController(database)
+        USER.read(user_id)
+        return UserResponse.from_orm(USER.details())
+    except Exception as e:
+        raise HTTPException(status_code=400, detail=e.__str__())
 
 
-@router.put("/{user_id}/", response_model=User)
-async def update_user(user_id: UUID, user: UpdateUser):
-    db_user = database.query(UserInDB).filter(UserInDB.id == user_id).first()
-    if not db_user:
-        raise HTTPException(status_code=404, detail="User not found")
-    if not verify_password(user.current_password, db_user.hashed_password):
-        raise HTTPException(status_code=400, detail="Incorrect password")
-    if user.email != db_user.email:
-        raise HTTPException(status_code=400, detail="Email cannot be changed")
-    if user.username is None:
-        user.username = db_user.username
-    else:
-        db_user.username = user.username
-    db_user.hashed_password = get_password_hash(user.password)
-    database.commit()
-    database.refresh(db_user)
-    return {**user.dict(), "id": db_user.id, "hashed_password": None}
+@router.put("/{user_id}/update_password/", response_model=UserResponse)
+async def update_password(user_id: UUID, password: PasswordUpdate):
+    try:
+        USER = UserController(database)
+        USER.update_password(user_id, password.current_password, password.new_password)
+        return UserResponse.from_orm(USER.details())
+
+    except Exception as e:
+        raise HTTPException(status_code=400, detail=e.__str__())
 
 
 @router.delete("/{user_id}/")

app/api/models/__init__.py

@@ -1,2 +1,2 @@
-from .item import Item
 from .user import User
+from .transcribe import Transcribe

app/api/models/item.py

@@ -1,16 +0,0 @@
-from typing import Optional
-from pydantic import BaseModel
-
-
-class ItemBase(BaseModel):
-    title: str
-    description: Optional[str] = None
-
-
-class ItemCreate(ItemBase):
-    pass
-
-
-class Item(ItemBase):
-    id: int
-    owner_id: int

app/api/models/transcribe.py

@@ -9,3 +9,7 @@ from sqlalchemy import Column, Integer, String, Boolean, ForeignKey
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 from app.core.database import Base
+
+
+class Transcribe(BaseModel):
+    ...

app/api/models/user.py

@@ -29,6 +29,11 @@ class UserResponse(UserBase):
         }
 
 
+class PasswordUpdate(BaseModel):
+    current_password: str
+    new_password: str
+
+
 class User(UserBase):
     password: str
 

app/core/models/User.py

@@ -75,6 +75,24 @@ class UserController:
             return True
         return False
 
+    def read(self, user_id: uuid.UUID):
+        self.db_user = self.db.query(UserInDB).filter(UserInDB.id == user_id).first()
+        if not self.db_user:
+            raise Exception("User not found")
+        self.user = self.db_user.data()
+
+    def update_password(
+        self, user_id: uuid.UUID, current_password: str, new_password: str
+    ):
+        self.read(user_id)
+        if verify_password(current_password, self.db_user.hashed_password):
+            self.db_user.hashed_password = get_password_hash(new_password)
+            self.db.commit()
+            self.db.refresh(self.db_user)
+            self.user = self.db_user.data()
+        else:
+            raise Exception("Current password is incorrect")
+
     def details(self):
         return self.db_user