Schema added

app/api/endpoints/users.py

@@ -1,8 +1,10 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, HTTPException
+from uuid import UUID
 
-from app.api.models.user import UserInDB, User, UpdateUser, UserResponse
+from app.api.models.user import User, UpdateUser, UserResponse
 from app.core.database import SessionLocal
 from app.core.security import get_password_hash, verify_password
+from app.core.models import UserInDB
 
 database = SessionLocal()
 
@@ -22,17 +24,17 @@ async def create_user(user: User):
     return {**user.dict(), "id": db_user.id, "hashed_password": None}
 
 
-@router.get("/{id}/", response_model=UserResponse)
-async def read_user(id: int):
-    db_user = database.query(UserInDB).filter(UserInDB.id == id).first()
+@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)
 
 
-@router.put("/{id}/", response_model=User)
-async def update_user(id: int, user: UpdateUser):
-    db_user = db.query(UserInDB).filter(UserInDB.id == id).first()
+@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):
@@ -49,9 +51,9 @@ async def update_user(id: int, user: UpdateUser):
     return {**user.dict(), "id": db_user.id, "hashed_password": None}
 
 
-@router.delete("/{id}/", response_model=int)
-async def delete_user(id: int):
-    db_user = database.query(UserInDB).filter(UserInDB.id == id).first()
+@router.delete("/{user_id}/", response_model=int)
+async def delete_user(user_id: UUID):
+    db_user = database.query(UserInDB).filter(UserInDB.id == user_id).first()
     database.delete(db_user)
     database.commit()
-    return id
+    return user_id

app/api/models/transcribe.py

@@ -0,0 +1,11 @@
+import uuid
+
+from pydantic import BaseModel
+from typing import Optional
+
+from sqlalchemy.dialects.postgresql import UUID
+
+from sqlalchemy import Column, Integer, String, Boolean, ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+
+from app.core.database import Base

app/api/models/user.py

@@ -1,8 +1,13 @@
+import uuid
+
 from pydantic import BaseModel
 from typing import Optional
 
+from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy import Column, Integer, String, Boolean
+
 from app.core.database import Base
+from sqlalchemy.orm import Mapped, mapped_column, relationship
 
 
 class UserBase(BaseModel):
@@ -27,18 +32,3 @@ class User(UserBase):
 
 class UpdateUser(UserBase):
     current_password: str
-
-
-class UserInDB(Base):
-    __tablename__ = "users"
-
-    id = Column(Integer, primary_key=True, index=True, autoincrement=True)
-    username = Column(String, unique=True, index=True)
-    email = Column(String, unique=True, index=True)
-    hashed_password = Column(String)
-    is_active = Column(Boolean, default=True)
-
-    def __init__(self, username: str, email: str, hashed_password: str):
-        self.username = username
-        self.email = email
-        self.hashed_password = hashed_password

app/core/config.py

@@ -1,9 +1,9 @@
+from os import environ as env
+
 from typing import Any, Dict, List, Optional, Union
 from pydantic import AnyHttpUrl, validator
 
-from pydantic_settings import BaseSettings, SettingsConfigDict
-
-from os import environ as env
+from pydantic_settings import BaseSettings
 
 
 class Settings(BaseSettings):

app/core/models/AuthToken.py

@@ -0,0 +1,38 @@
+from datetime import datetime, timedelta
+import uuid
+import random
+import string
+
+from app.core.config import settings
+
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy import Column, String, Boolean, ForeignKey, DateTime
+from sqlalchemy.sql import func
+
+from app.core.database import Base, engine
+
+
+class AuthToken(Base):
+    __tablename__ = "auth_tokens"
+
+    id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    token = Column(String, unique=True, index=True)
+    user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"))
+    created_at = Column(DateTime(timezone=True), server_default=func.now())
+
+    def __init__(self, user_id: UUID):
+        self.user_id = user_id
+        self.token = self.create_token()
+
+    def create_token(self):
+        token = self.generate_bearer_token()
+        return token
+
+    def generate_bearer_token(self):
+        token_prefix = str(self.id).replace("-", "")  # Remove hyphens from UUID
+        token_suffix = str(uuid.uuid4().hex)  # Generate a random UUID string
+        return f"{token_prefix}{token_suffix}"
+
+    @staticmethod
+    def validate_bearer_token(request_token):
+        ...

app/core/models/Transcribe.py

@@ -0,0 +1,21 @@
+from datetime import datetime, timedelta
+
+
+import uuid
+from app.core.config import settings
+
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy import Column, String, Boolean, ForeignKey, DateTime
+from sqlalchemy.orm import Mapped, mapped_column, relationship
+from sqlalchemy.sql import func
+
+from app.core.database import Base, engine
+
+
+class TranscibeInDB(Base):
+    __tablename__ = "transcribe_data"
+
+    id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    text = Column(String)
+    user_id = Column(UUID(as_uuid=True), ForeignKey("users.id"))
+    user = relationship("UserInDB", back_populates="transcribes")

app/core/models/User.py

@@ -0,0 +1,26 @@
+import uuid
+
+
+from app.core.config import settings
+
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy import Column, String, Boolean
+from sqlalchemy.orm import relationship
+
+from app.core.database import Base, engine
+
+
+class UserInDB(Base):
+    __tablename__ = "users"
+
+    id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    username = Column(String, unique=True, index=True)
+    email = Column(String, unique=True, index=True)
+    hashed_password = Column(String)
+    is_active = Column(Boolean, default=True)
+    transcribes = relationship("TranscibeInDB", back_populates="user")
+
+    def __init__(self, username: str, email: str, hashed_password: str):
+        self.username = username
+        self.email = email
+        self.hashed_password = hashed_password

app/core/models/__init__.py

@@ -0,0 +1,8 @@
+from .AuthToken import AuthToken
+from .User import UserInDB
+from .Transcribe import TranscibeInDB
+
+from app.core.database import Base, engine
+
+
+Base.metadata.create_all(engine)

app/core/security.py

@@ -1,10 +1,12 @@
 from passlib.context import CryptContext
 
+from app.core.config import settings
+
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_MINUTES = 30
-SECRET_KEY = "mysecretkey"
+SECRET_KEY = settings.SECRET_KEY
 
 
 def get_password_hash(password: str) -> str:

requirements.txt

@@ -8,4 +8,5 @@ pytest-cov
 faker
 requests-mock
 passlib
-httpx
+httpx
+PyJWT