diff --git a/auth/models.py b/auth/models.py index 41cb69f..d6233ee 100644 --- a/auth/models.py +++ b/auth/models.py @@ -1,27 +1,259 @@ -from sqlalchemy import Column, Integer, String, Enum, DateTime -import enum, datetime +from enum import Enum +import random +import smtplib +from backend.config import SECRET_KEY, ALGORITHM, ACCESS_TOKEN_EXPIRE_MINUTES ,pwd_context, get_session_db, Base, user_collection +from datetime import datetime, timedelta, timezone +from pydantic import BaseModel +from fastapi import Depends, HTTPException +from typing import Annotated +from fastapi.security import OAuth2PasswordBearer +from pydantic.networks import EmailStr +from sqlalchemy import Integer, DateTime, ForeignKey +from sqlalchemy.orm import Session, relationship, mapped_column, Mapped +from sqlalchemy.dialects.postgresql import ARRAY +from email.message import EmailMessage +from typing import TYPE_CHECKING -from ..config import Base -class Role(str, enum.Enum): - admin = "admin" +if TYPE_CHECKING: + from ..collectionObj.models import CollectionsDB #iç içe import döngüsünü önlemek için TYPE_CHECKING kullanıyoruz + + +import jwt + +class Token(BaseModel): + access_token: str + token_type: str + + +### ENUMS ### +class Role(str, Enum): user = "user" + admin = "admin" + guest = "guest" mod = "mod" -class Status(str, enum.Enum): - banned = "banned" +class Status(str, Enum): active = "active" + banned = "banned" suspended = "suspended" -class User(Base): - __tablename__ = "users" - user_id = Column(Integer, primary_key=True) - username = Column(String, unique=True) - name = Column(String) - surname = Column(String) - hashedPassword = Column(String) - email = Column(String, unique=True) - role = Column(Enum(Role), default=Role.user) - status = Column(Enum(Status), default=Status.active) - bio = Column(String(144)) - created_date = Column(DateTime, default=datetime.datetime.utcnow) +### KULLANICI MODELLERİ ### sqlalchemy ve pydantic modelleri farklıdır +class UserBase(BaseModel): #bu bir veri tabanı modeli değil !!!! lütfen dikkat et + username: str | None = None #Option yerine Union kullanabilirsin + role: Role | None = None + status: Status | None = None + +class UserInDb(UserBase): + user_id: int | None = None + email: EmailStr | None = None + hashed_password: str | None = None + +class UserPublic(BaseModel): + username : str | None = None + role : Role | None = None + status : Status | None = None + +class UserCreate(BaseModel): + username: str | None = None + role: Role | None = None + email : EmailStr | None = None + status: Status | None = None + password : str | None = None + + +### VERİTABANI MODELİ ### +class DBUser(Base): + __tablename__ = "users_table" + + user_id: Mapped[int] = mapped_column(primary_key=True, index=True, autoincrement=True) + #collection_id : Mapped[list[int]] = mapped_column(Integer, ForeignKey("collections_table.collection_id"), nullable=True) # collection_id ile ilişki + username : Mapped[str] = mapped_column(unique=True, index=True, nullable=False) + email : Mapped[str] = mapped_column(unique=True, index=True, nullable=False) + hashed_password : Mapped[str] = mapped_column(nullable=False) + role : Mapped[Role] = mapped_column(default=Role.user) + status : Mapped[Status] = mapped_column(default=Status.active) + created_date : Mapped[datetime] = mapped_column(DateTime, default=datetime.now()) #datetime.datetime -> python, DateTime -> sqlalchemy + bio : Mapped[str] = mapped_column(default="No bio") + follow_users : Mapped[list[int]] = mapped_column(ARRAY(Integer), default=[]) # takip edilen kullanıcılar + # -> buralar diğer tablolar ile olan ilişkiler + #items : Mapped[list['Items']] = relationship("Items", back_populates="user", cascade="all, delete-orphan") items'e direk değil collection üzerinden erişiyoruz + collections : Mapped[list['CollectionsDB']] = relationship( + "CollectionsDB", + secondary=user_collection, + back_populates="users", + lazy='select' + ) # collection'lar ile olan ilişki + + + +### AUTH ### +oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/auth/login") + + + +### SERVİSLER ### + +def verify_password(plain_password: str, hashed_password: str) -> bool: + return pwd_context.verify(plain_password, hashed_password) + +def get_password_hash(password: str) -> str: + return pwd_context.hash(password) + +def authenticate_user( + session: Annotated[Session, Depends(get_session_db)], + username: str, + password: str + ) -> UserInDb | None: + + user = session.query(DBUser).filter(DBUser.username == username).first() + if user is None or not verify_password(password, user.hashed_password): #sqlalchemy'de bu şekilde kontrol ediliyor None ile + return None + return user + + +def create_access_token( + data: dict, + expires_delta: Annotated[timedelta, None] = timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES), +) -> str: + to_encode = data.copy() + expire = datetime.now(timezone.utc) + expires_delta + to_encode.update({"exp": expire}) + encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM) + return encoded_jwt + + +async def get_user( + session: Annotated[Session, Depends(get_session_db)], + username: str + ) -> UserInDb | None: + + user = session.query(DBUser).filter(DBUser.username == username).first() + return user + + +async def get_current_user( + token: Annotated[str, Depends(oauth2_scheme)], + session: Annotated[Session, Depends(get_session_db)] +) -> UserPublic: + + credentials_exception = HTTPException( + status_code=401, + detail="Invalid credentials currently", + headers={"WWW-Authenticate": "Bearer"}, + ) + try: + payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM]) + username : str | None = payload.get("sub") + user = UserInDb.model_validate(payload) + + if username is None: + raise credentials_exception + + except jwt.PyJWTError: + raise credentials_exception + + user = await get_user(session, username) + if user is None: + raise credentials_exception + return user + + +async def get_current_active_user( + current_user: Annotated[UserInDb, Depends(get_current_user)] +) -> UserPublic: + + if current_user.status == Status.banned: + raise HTTPException(status_code=400, detail="Inactive user") + return current_user + + +### Kullanıcı kaydı +def register_user( + session: Annotated[Session, Depends(get_session_db)], + user: Annotated[UserCreate, Depends()] +) -> UserPublic: + + user_dict = user.dict() # kullanıcıdan gelen verileri alıyoruz çunku şifreyi hashleyeceğiz + user_dict['hashed_password'] = get_password_hash(user.password) # şifreyi hashliyoruz + + if not verify_password(user.password, user_dict['hashed_password']): + raise HTTPException(status_code=400, detail="Password hashing failed") # şifre hashleme işlemi başarısız oldu + + # Kullanıcı adı ve e-posta adresinin benzersiz olduğunu kontrol et + existing_user = session.query(DBUser).filter( + (DBUser.username == user.username) | (DBUser.email == user.email) + ).first() + + if existing_user: + raise HTTPException(status_code=400, detail="Username or email already registered") + + user_dict['created_date'] = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S") # kullanıcı oluşturulma tarihi + user_dict.pop('password') ##password'u veri tabanına eklemiyoruz zaten sınıfımızda tanımlı değil hata verir + db_user = DBUser(**user_dict) #alchemy ile pydantic modelleri farklıdır bir birine + session.add(db_user) # donuşum yaparken dikkat et + session.commit() + session.refresh(db_user) + return db_user + + +def find_user_w_email( + session: Annotated[Session, Depends(get_session_db)], + email: EmailStr | None = None, +): + + exist_user = session.query(DBUser).filter(DBUser.email == email).first() #email ile kullanıcıyı bul + if exist_user is None: + raise HTTPException(status_code=400, detail="User not found") + + if exist_user.status == Status.banned: + raise HTTPException(status_code=400, detail="Inactive user") + + return True + +def send_password_to_email( + session: Annotated[Session, Depends(get_session_db)], + email: EmailStr | None = None, +) -> str: + + msg = EmailMessage() #obje oluştur + msg['Subject'] = 'Password Reset' + msg['From'] = 'hansneiumann@gmail.com' + msg['To'] = email + veritification_code = generate_password_reset_number() + msg.set_content(veritification_code) + + with smtplib.SMTP_SSL('smtp.gmail.com', 465) as smtp: + smtp.login("hansneiumann@gmail.com", "rwaq mbil lzut dgja") + smtp.send_message(msg) + + update_password_w_email(session, email=email, password=veritification_code) #şifreyi güncelle + + +def generate_password_reset_number() -> str: + return str(random.randint(10000000, 99999999)) # 8 haneli rastgele bir sayı döndür + + +def update_password_w_email( + session: Annotated[Session, Depends(get_session_db)], + password: str | None = None, + email: EmailStr | None = None, +) -> dict: + + hashed_password = get_password_hash(password) + session.query(DBUser).filter(DBUser.email == email).update({"hashed_password": hashed_password}) + session.commit() + + return {"message": "Password updated successfully"} + +def update_password_w_user( + session: Annotated[Session, Depends(get_session_db)], + user: Annotated[DBUser , None], + password: str | None = None, + +) -> any: + + hashed_password = get_password_hash(password) + session.query(DBUser).filter(DBUser.user_id == user.user_id).update({"hashed_password": hashed_password}) + session.commit() + diff --git a/auth/router.py b/auth/router.py index 92affa8..7b09a33 100644 --- a/auth/router.py +++ b/auth/router.py @@ -1,14 +1,12 @@ -import os - -from fastapi import APIRouter, HTTPException -import bcrypt -import jwt - -from fastapi import Depends +from fastapi import APIRouter, Depends, HTTPException, status, BackgroundTasks +from .models import Token, UserPublic, authenticate_user, create_access_token, UserCreate, find_user_w_email, get_current_user, register_user, send_password_to_email, update_password_w_user +from datetime import timedelta +from typing import Annotated +from ..config import get_session_db +from fastapi.security import OAuth2PasswordRequestForm from sqlalchemy.orm import Session -from .models import User -from .schemas import UserCreate, UserOut, UserLogin -from ..config import get_db +from pydantic.networks import EmailStr + router = APIRouter( prefix="/auth", @@ -17,40 +15,61 @@ router = APIRouter( dependencies=[], ) -def create_token(user: User): - return jwt.encode({"sub": user.username}, os.getenv("SECRET_KEY"), algorithm=os.getenv("ALGORITHM")) +@router.post('/login') +async def login_for_access_token( + form_data : Annotated[OAuth2PasswordRequestForm, Depends()], + session : Annotated[Session, Depends(get_session_db)], +) -> Token: -def verify_token(token: str): - try: - data = jwt.decode(token, os.getenv("SECRET_KEY"), algorithms=[os.getenv("ALGORITHM")]) - return data.get("sub") - except jwt.ExpiredSignatureError: - raise HTTPException(401, "Token expired") - except jwt.InvalidTokenError: - raise HTTPException(401, "Invalid token") + user = authenticate_user(session, form_data.username, form_data.password) + if not user: + raise HTTPException( + status_code=status.HTTP_401_UNAUTHORIZED, + detail="Incorrect username or password", + headers={"WWW-Authenticate": "Bearer"}, + ) + access_token_expires = timedelta(minutes=30) + access_token = create_access_token( + data={"sub": user.username, "role": user.role, 'status': user.status}, expires_delta=access_token_expires + ) + return Token(access_token=access_token, token_type="bearer") -@router.post("/register") -def register(user: UserCreate, db: Session = Depends(get_db)): - if db.query(User).filter_by(username=user.username).first(): - raise HTTPException(400, "Username taken") - hashed = bcrypt.hashpw(user.password.encode(), bcrypt.gensalt()).decode() - db_user = User(**user.model_dump(exclude={"password"}), hashedPassword=hashed) - db.add(db_user) - db.commit() - return {"msg": "User created"} +@router.post('/register', response_model=UserPublic) #userPublic güvenli bir model +async def create_user( + session : Annotated[Session, Depends(get_session_db)], + user : Annotated[UserCreate, Depends()] +): + + return register_user(session, user) -@router.post("/login") -def login(user: UserLogin, db: Session = Depends(get_db)): - db_user = db.query(User).filter_by(username=user.username).first() - if not db_user or not bcrypt.checkpw(user.password.encode(), db_user.hashedPassword.encode()): - raise HTTPException(401, "Invalid creds") - return {"token": create_token(db_user)} +@router.post('/password_reset') +async def password_reset( + session : Annotated[Session, Depends(get_session_db)], + email : Annotated[EmailStr, None] = None, + task: Annotated[BackgroundTasks, None] = None, # BackgroundTasks, task'ı arka planda çalıştırmak için kullanıyoruz +): + + if not find_user_w_email(session, email): + return HTTPException( + status_code=status.HTTP_404_NOT_FOUND, + detail="bad request", + ) + + task.add_task(send_password_to_email, session, email) -@router.get("/me", response_model=UserOut) -def get_me(token: str, db: Session = Depends(get_db)): - username = verify_token(token) - if not username: - raise HTTPException(401, "Invalid token") - user = db.query(User).filter_by(username=username).first() - return user \ No newline at end of file + return {"message": "New password has been sent to your email."} + +@router.post('/update_password') +async def update_password( + user: Annotated[str, Depends(get_current_user)], + session: Annotated[Session, Depends(get_session_db)], + new_password: Annotated[str, None] = None, +) -> dict: + + update_password_w_user(session, user, new_password) + + return {"message": "Password updated successfully."} + + + \ No newline at end of file diff --git a/auth/schemas.py b/auth/schemas.py deleted file mode 100644 index b9f3a16..0000000 --- a/auth/schemas.py +++ /dev/null @@ -1,23 +0,0 @@ -from pydantic import BaseModel, EmailStr -from .models import Role, Status - -class UserCreate(BaseModel): - username: str - name: str - surname: str - password: str - email: EmailStr - bio: str = "" - -class UserOut(BaseModel): - username: str - name: str - surname: str - email: EmailStr - role: Role - status: Status - bio: str - -class UserLogin(BaseModel): - username: str - password: str \ No newline at end of file diff --git a/collectionObj/models.py b/collectionObj/models.py new file mode 100644 index 0000000..5ddc1d7 --- /dev/null +++ b/collectionObj/models.py @@ -0,0 +1,173 @@ +from fastapi import HTTPException, Depends +from sqlalchemy import Integer, String, Boolean +from pydantic import BaseModel +from sqlalchemy.orm import Session, relationship, mapped_column, Mapped +from ..config import Base, get_session_db, user_collection, collection_item +from ..auth.models import DBUser +from typing import TYPE_CHECKING + +if TYPE_CHECKING: + from ..items.models import Items, Item + + + + +###### SCHEMAS ######### + +class CollectionBase(BaseModel): + collection_name : str | None = None + collection_description : str | None = None + visibility : bool | None = None + +class CollectionCreate(CollectionBase): + pass + +class CollectionPublic(CollectionBase): + collection_id : int | None = None + + class Config: + from_attributes = True #sqlalchemy ile pydantic arasında geçiş yapabilmek için kullanılır + +class CollectionUpdate(CollectionBase): + pass + + + +##### veri tabanı modelleri ##### +class CollectionsDB(Base): + __tablename__ = "collections_table" + + collection_id : Mapped[int] = mapped_column(Integer, primary_key=True, index=True, autoincrement=True) + #user_id : Mapped[int] = mapped_column(Integer, ForeignKey("users_table.user_id"), nullable=False) # user_id ile ilişki + #item_id : Mapped[list[int]] = mapped_column(Integer, ForeignKey("items_table.item_id"), nullable=False) # item_id ile ilişki + visibility : Mapped[bool] = mapped_column(Boolean, default=True) + collection_name : Mapped[str] = mapped_column(String, nullable=False) + collection_description : Mapped[str] = mapped_column(String, default="No description") + + # ilişkiler + users : Mapped[list['DBUser']] = relationship( + "DBUser", + secondary=user_collection, + back_populates="collections", + lazy='select' + ) #back_populates karşı tarafın ismi + + items : Mapped[list['Items']] = relationship( + "Items", + secondary=collection_item, + back_populates="collections" , + lazy='select' + ) + + + #### collection bir item listesi birde kullanıcı listesi tutacak + + + +def create_colletion( + collection: CollectionCreate | None = None, + user_id : int | None = None + +) -> bool: + """ + Collection oluşturma fonksiyonu + """ + if collection is None: + raise HTTPException(status_code=400, detail="Collection is None returned") + + session = next(get_session_db()) # -> get_session_db() fonksiyonu daima generator döndürür next ile çağırmalısın + user = session.query(DBUser).filter(DBUser.user_id == user_id).first() + if user is None: + raise HTTPException(status_code=404, detail="User not found") + + + try: + new_collection = CollectionsDB( + collection_name=collection.collection_name, + collection_description=collection.collection_description, + visibility=collection.visibility + ) + + new_collection.users.append(user) + session.add(new_collection) + session.commit() + except Exception as e: + raise HTTPException(status_code=500, detail=f"Error creating collection: {e}") + + return True + + +def get_collections( + user_id : int | None = None +) -> list[CollectionPublic] | None: + """ + Kullanıcının collectionlarını döndürür + """ + if user_id is None: + raise HTTPException(status_code=400, detail="User id is None") + + session = next(get_session_db()) # -> get_session_db() fonksiyonu daima generator döndürür next ile çağırmalısın + collections = session.query(CollectionsDB).filter(CollectionsDB.users.any(user_id=user_id)).all() + + if collections is None: + raise HTTPException(status_code=404, detail="No collections found") + + return collections + +def update_collection( + collection: CollectionUpdate | None = None, + user_id : int | None = None, + collection_id : int | None = None +) -> bool: + """ + Collection güncelleme fonksiyonu + """ + if collection is None: + raise HTTPException(status_code=400, detail="Collection is None returned") + + session = next(get_session_db()) # -> get_session_db() fonksiyonu daima generator döndürür next ile çağırmalısın + user = session.query(DBUser).filter(DBUser.user_id == user_id).first() + if user is None: + raise HTTPException(status_code=404, detail="User not found") + + collection_to_update = session.query(CollectionsDB).filter(CollectionsDB.collection_id == collection_id).first() + if collection_to_update is None: + raise HTTPException(status_code=404, detail="Collection not found") + + try: + collection_to_update.collection_name = collection.collection_name + collection_to_update.collection_description = collection.collection_description + collection_to_update.visibility = collection.visibility + + session.commit() + except Exception as e: + raise HTTPException(status_code=500, detail=f"Error updating collection: {e}") + + return True + +def delete_collection( + user_id : int | None = None, + collection_id : int | None = None +) -> bool: + """ + Collection silme fonksiyonu + """ + if user_id is None or collection_id is None: + raise HTTPException(status_code=400, detail="User id or collection id is None") + + session = next(get_session_db()) # -> get_session_db() fonksiyonu daima generator döndürür next ile çağırmalısın + user = session.query(DBUser).filter(DBUser.user_id == user_id).first() + if user is None: + raise HTTPException(status_code=404, detail="User not found") + + collection_to_delete = session.query(CollectionsDB).filter(CollectionsDB.collection_id == collection_id).first() + if collection_to_delete is None: + raise HTTPException(status_code=404, detail="Collection not found") + + try: + session.delete(collection_to_delete) + session.commit() + except Exception as e: + raise HTTPException(status_code=500, detail=f"Error deleting collection: {e}") + + return True \ No newline at end of file diff --git a/collectionObj/router.py b/collectionObj/router.py new file mode 100644 index 0000000..f258273 --- /dev/null +++ b/collectionObj/router.py @@ -0,0 +1,60 @@ +from fastapi import FastAPI, APIRouter +from .models import CollectionPublic, CollectionCreate, CollectionUpdate +from .models import get_collections, create_colletion, update_collection, delete_collection + +router = APIRouter( + prefix="/collections", + tags=["collections"], + responses={404: {"description": "Not found"}}, + dependencies=[], +) + + + +@router.get("/{user_id}") +async def get_collections_api(user_id: int) -> list[CollectionPublic]: + """ + Kullanıcının collectionlarını döndürür + """ + + _collections : list[CollectionPublic] = get_collections(user_id=user_id) + + return _collections + + + +@router.post("/{user_id}") +async def create_collection( + user_id: int, + collection: CollectionCreate +) -> bool: + """ + Collection oluşturma fonksiyonu + """ + _result = create_colletion(user_id=user_id, collection=collection) + return _result + + +@router.put("/{user_id}/{collection_id}") +async def update_collection_api( + user_id: int, + collection_id : int, + collection: CollectionUpdate +) -> bool: + """ + Collection güncelleme fonksiyonu + """ + _result = update_collection(user_id=user_id, collection_id=collection_id, collection=collection) + return _result + + +@router.delete("/{user_id}/{collection_id}") +async def delete_collection_api( + user_id: int, + collection_id : int +) -> bool: + """ + Collection silme fonksiyonu + """ + _result = delete_collection(user_id=user_id, collection_id=collection_id) + return _result \ No newline at end of file diff --git a/config.py b/config.py index e4641c4..9657ba7 100644 --- a/config.py +++ b/config.py @@ -1,39 +1,64 @@ from sqlalchemy import create_engine -from sqlalchemy.orm import sessionmaker, declarative_base +from sqlalchemy.orm import sessionmaker, DeclarativeBase from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware +from sqlalchemy import Table, Column, Integer, String, Float, Boolean, ForeignKey +from passlib.context import CryptContext from dotenv import load_dotenv import os load_dotenv() -DATABASE_URL = ( - f"postgresql://{os.getenv('USERNAME_DB')}:" - f"{os.getenv('PASSWORD_DB')}@" - f"{os.getenv('HOST_DB')}:" - f"{os.getenv('PORT_DB')}/" - f"{os.getenv('NAME_DB')}" -) +pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto") + +SECRET_KEY = os.getenv("SECRET_KEY") +ALGORITHM = os.getenv("ALGORITHM") +ACCESS_TOKEN_EXPIRE_MINUTES = int(os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES", 30)) + +DATABASE_URL = os.getenv("DATABASE_URL") +# Engine oluştur +engine = create_engine(DATABASE_URL, echo=False) +# Session factory oluştur +SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) +#Base = declarative_base() #sqlalchemy için bu sınıfı kullanıyoruz 'class DBUser(Base)' şeklinde tanımlıyoruz + +class Base(DeclarativeBase): + pass #yeni sqlalchemy sürümünde bu sınıfı kullanıyoruz -engine = create_engine(DATABASE_URL) -SessionLocal = sessionmaker(bind=engine) -Base = declarative_base() +#models te içe aktarmayı unutma -from .auth.models import * -from .items.models import * +def init_db(): + #Base.metadata.drop_all(engine) # Veritabanını her başlangıcta siler burayada dikkat !!!!!!!! + Base.metadata.create_all(bind=engine) # Veritabanını oluşturur -Base.metadata.create_all(bind=engine) - - -def get_db(): +# Session dependency (FastAPI için) +def get_session_db() -> 'Generator[Session, None]': db = SessionLocal() try: yield db finally: db.close() +user_collection = Table( # user -> collection + "user_collection", + Base.metadata, + Column("user_id", Integer, ForeignKey("users_table.user_id"), primary_key=True), + Column("collection_id", Integer, ForeignKey("collections_table.collection_id"), primary_key=True), +) + + +collection_item = Table( # collection -> item + "collection_item", + Base.metadata, + Column("collection_id", ForeignKey("collections_table.collection_id"), primary_key=True), + Column("item_id", ForeignKey("items_table.item_id"), primary_key=True) +) + + + +### SECRET KEY ### origins = [ "http://localhost", "http://localhost:8080", @@ -42,6 +67,10 @@ origins = [ ] app = FastAPI() +@app.on_event("startup") +def startup_event(): + init_db() + app.add_middleware( CORSMiddleware, allow_origins=origins, @@ -49,3 +78,6 @@ app.add_middleware( allow_methods=["*"], allow_headers=["*"], ) + + + diff --git a/items/models.py b/items/models.py index 75215e3..9adbf6d 100644 --- a/items/models.py +++ b/items/models.py @@ -1,15 +1,78 @@ -from datetime import datetime -from ..config import Base -from sqlalchemy import Column, Integer, String, DateTime, ForeignKey -from sqlalchemy.orm import relationship, Mapped, mapped_column +from datetime import datetime, timedelta, timezone +from typing import Annotated +from sqlalchemy import DateTime +from pydantic import BaseModel +from fastapi import Depends +from sqlalchemy.orm import Session, relationship, mapped_column, Mapped +from sqlalchemy import String, Float, Integer, ForeignKey +from sqlalchemy.dialects.postgresql import ARRAY +from ..config import Base, get_session_db, collection_item +from typing import TYPE_CHECKING +from ..auth.models import Role, Status, UserBase +from ..collectionObj.models import CollectionsDB -class Item(Base): - __tablename__ = "items" - item_id = Column(Integer, primary_key=True) - name = Column(String(100), nullable=False) - description = Column(String(500), nullable=True) - price = Column(Integer, nullable=False) - created_date = Column(DateTime, default=datetime.utcnow) - updated_date = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow) - user_id: Mapped[int] = mapped_column(ForeignKey("users.id")) - user: Mapped["User"] = relationship(back_populates="items") \ No newline at end of file + +class UserProfileBase(UserBase): + bio : str | None = None + created_date : datetime | None = None + # collection : list[str] | None = None + +class UserProfileID(UserProfileBase): + user_id : int | None = None + + +class UserProfilePublic(UserProfileBase): + pass + +class UserProfilePrivate(UserProfilePublic): + #collection : list[str] | None = None + role : Role | None = None + status : Status | None = None + follow_user : list[int] | None = None + items : list['Item'] | None = None + + + +######## ITEMS ###### + +class BaseItem(BaseModel): + item_created_date : datetime | None = None + item_location : str | None = None + item_type : str | None = None + item_content : str | None = None + +class ItemCreate(BaseItem): # item oluşturma için ekstra bir ihtiyaci olmaz + pass + + +class Item(BaseItem): + item_id : int | None = None + user_id : int | None = None + item_score : float | None = None + + class Config: + from_attributes = True #sqlalchemy ile pydantic arasında geçiş yapabilmek için kullanılır + +##### VERİTABANI MODELİ ##### +# Tüm modeller AUTH'da veri tabanına işlendi yukardaki +#modeller veri tabanında mevcuttur. Değiştirmek için AUTH'daki +# DBUser modelini değiştirip tekrar veri tabanına işleyebilirsin + +class Items(Base): + __tablename__ = "items_table" + + item_id : Mapped[int] = mapped_column(primary_key=True, index=True, autoincrement=True) + #collection_id : Mapped[list[int]] = mapped_column(Integer, ForeignKey("collections_table.collection_id"), nullable=True) # collection_id ile ilişki + item_created_date : Mapped[datetime] = mapped_column(DateTime, default=datetime.now()) + item_location: Mapped[str] = mapped_column(String, default="No location") + item_type: Mapped[str] = mapped_column(String, default="No type") + item_content: Mapped[str] = mapped_column(String, default="No content") + item_score: Mapped[float] = mapped_column(Float, default=0.0) + + # ilişkiler + collections : Mapped[list['CollectionsDB']]= relationship( + "CollectionsDB", + secondary=collection_item, + back_populates="items", + lazy='select' + ) #back_populates karşı tarafın ismi diff --git a/items/router.py b/items/router.py index 2961d4f..8704d2b 100644 --- a/items/router.py +++ b/items/router.py @@ -1,4 +1,9 @@ +from .models import ItemCreate, UserProfileBase, UserProfileID, UserProfilePrivate, UserProfilePublic from fastapi import APIRouter, Depends +from sqlalchemy.orm import Session +from ..config import get_session_db +from typing import Annotated +from ..auth.models import get_current_active_user router = APIRouter( prefix="/items", @@ -7,7 +12,8 @@ router = APIRouter( dependencies=[], ) +#tüm crud işlemleri yeni veri tabanı modeli ile yapılacak -@router.get("/") -async def get_items(): - return {"message": "List of items"} \ No newline at end of file + + + \ No newline at end of file diff --git a/main.py b/main.py index 14bc3fd..9415e73 100644 --- a/main.py +++ b/main.py @@ -1,6 +1,8 @@ from .config import app from .auth.router import router as auth_router from .items.router import router as items_router +from .collectionObj.router import router as collections_router app.include_router(auth_router) +app.include_router(collections_router) app.include_router(items_router) diff --git a/requirements.txt b/requirements.txt index 3f98454..0f102cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ annotated-types==0.7.0 anyio==4.9.0 +bcrypt==4.3.0 certifi==2025.4.26 click==8.1.8 dnspython==2.7.0 @@ -39,3 +40,5 @@ uvicorn==0.34.2 uvloop==0.21.0 watchfiles==1.0.5 websockets==15.0.1 +passlib[bcrypt]==1.7.4 +