Merge pull request #81 from igorbenav/crud_base_count_fix

CRUDBase count method bug fix

Author: igorbenav

src/app/core/security.py

@@ -19,10 +19,12 @@
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/v1/login")
 
 async def verify_password(plain_password: str, hashed_password: str) -> bool:
-    return bcrypt.checkpw(plain_password.encode(), hashed_password.encode())
+    correct_password: bool = bcrypt.checkpw(plain_password.encode(), hashed_password.encode())
+    return correct_password
 
 def get_password_hash(password: str) -> str:
-    return bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
+    hashed_password: str = bcrypt.hashpw(password.encode(), bcrypt.gensalt()).decode()
+    return hashed_password
 
 async def authenticate_user(username_or_email: str, password: str, db: AsyncSession) -> Union[Dict[str, Any], Literal[False]]:
     if "@" in username_or_email:

src/app/crud/crud_base.py

@@ -146,10 +146,13 @@ async def count(
         ----
         This method provides a quick way to get the count of records without retrieving the actual data.
         """
-        conditions = [getattr(self._model, key) == value for key, value in kwargs.items()]
-        combined_conditions = and_(*conditions)
+        if kwargs:
+            conditions = [getattr(self._model, key) == value for key, value in kwargs.items()]
+            combined_conditions = and_(*conditions)
+            count_query = select(func.count()).select_from(self._model).filter(combined_conditions)
+        else:
+            count_query = select(func.count()).select_from(self._model)
 
-        count_query = select(func.count()).filter(combined_conditions)
         total_count: int = await db.scalar(count_query)
 
         return total_count