Merge pull request #160 from igorbenav/fastcrud-bump

fastcrud bump, dependencies fixed

Author: igorbenav

pyproject.toml

@@ -30,10 +30,10 @@ redis = "^5.0.1"
 arq = "^0.25.0"
 gunicorn = "^22.0.0"
 bcrypt = "^4.1.1"
-fastcrud = "^0.12.0"
 faker = "^26.0.0"
 psycopg2-binary = "^2.9.9"
 pytest-mock = "^3.14.0"
+fastcrud = "^0.15.5"
 
 
 [build-system]

src/app/api/dependencies.py

@@ -7,7 +7,7 @@
 from ..core.db.database import async_get_db
 from ..core.exceptions.http_exceptions import ForbiddenException, RateLimitException, UnauthorizedException
 from ..core.logger import logging
-from ..core.security import oauth2_scheme, verify_token
+from ..core.security import TokenType, oauth2_scheme, verify_token  # Add TokenType import
 from ..core.utils.rate_limit import rate_limiter
 from ..crud.crud_rate_limit import crud_rate_limits
 from ..crud.crud_tier import crud_tiers
@@ -24,7 +24,7 @@
 async def get_current_user(
     token: Annotated[str, Depends(oauth2_scheme)], db: Annotated[AsyncSession, Depends(async_get_db)]
 ) -> dict[str, Any] | None:
-    token_data = await verify_token(token, db)
+    token_data = await verify_token(token, TokenType.ACCESS, db)  # Specify TokenType.ACCESS
     if token_data is None:
         raise UnauthorizedException("User not authenticated.")
 
@@ -49,7 +49,7 @@ async def get_optional_user(request: Request, db: AsyncSession = Depends(async_g
         if token_type.lower() != "bearer" or not token_value:
             return None
 
-        token_data = await verify_token(token_value, db)
+        token_data = await verify_token(token_value, TokenType.ACCESS, db)  # Specify TokenType.ACCESS
         if token_data is None:
             return None
 

src/app/core/db/crud_token_blacklist.py

@@ -3,5 +3,5 @@
 from ..db.token_blacklist import TokenBlacklist
 from ..schemas import TokenBlacklistCreate, TokenBlacklistUpdate
 
-CRUDTokenBlacklist = FastCRUD[TokenBlacklist, TokenBlacklistCreate, TokenBlacklistUpdate, TokenBlacklistUpdate, None]
+CRUDTokenBlacklist = FastCRUD[TokenBlacklist, TokenBlacklistCreate, TokenBlacklistUpdate, TokenBlacklistUpdate, None, None]
 crud_token_blacklist = CRUDTokenBlacklist(TokenBlacklist)

src/app/crud/crud_posts.py

@@ -3,5 +3,5 @@
 from ..models.post import Post
 from ..schemas.post import PostCreateInternal, PostDelete, PostUpdate, PostUpdateInternal
 
-CRUDPost = FastCRUD[Post, PostCreateInternal, PostUpdate, PostUpdateInternal, PostDelete]
+CRUDPost = FastCRUD[Post, PostCreateInternal, PostUpdate, PostUpdateInternal, PostDelete, None]
 crud_posts = CRUDPost(Post)

src/app/crud/crud_rate_limit.py

@@ -3,5 +3,5 @@
 from ..models.rate_limit import RateLimit
 from ..schemas.rate_limit import RateLimitCreateInternal, RateLimitDelete, RateLimitUpdate, RateLimitUpdateInternal
 
-CRUDRateLimit = FastCRUD[RateLimit, RateLimitCreateInternal, RateLimitUpdate, RateLimitUpdateInternal, RateLimitDelete]
+CRUDRateLimit = FastCRUD[RateLimit, RateLimitCreateInternal, RateLimitUpdate, RateLimitUpdateInternal, RateLimitDelete, None]
 crud_rate_limits = CRUDRateLimit(RateLimit)

src/app/crud/crud_tier.py

@@ -3,5 +3,5 @@
 from ..models.tier import Tier
 from ..schemas.tier import TierCreateInternal, TierDelete, TierUpdate, TierUpdateInternal
 
-CRUDTier = FastCRUD[Tier, TierCreateInternal, TierUpdate, TierUpdateInternal, TierDelete]
+CRUDTier = FastCRUD[Tier, TierCreateInternal, TierUpdate, TierUpdateInternal, TierDelete, None]
 crud_tiers = CRUDTier(Tier)

src/app/crud/crud_users.py

@@ -3,5 +3,5 @@
 from ..models.user import User
 from ..schemas.user import UserCreateInternal, UserDelete, UserUpdate, UserUpdateInternal
 
-CRUDUser = FastCRUD[User, UserCreateInternal, UserUpdate, UserUpdateInternal, UserDelete]
+CRUDUser = FastCRUD[User, UserCreateInternal, UserUpdate, UserUpdateInternal, UserDelete, None]
 crud_users = CRUDUser(User)