bug fixed, is_deleted in self._model.__table__.columns:

Author: igorbenav

docker-compose.yml

@@ -44,32 +44,32 @@ services:
       - redis-data:/data
 
   # #-------- uncomment to create first superuser --------
-  # create_superuser:
-  #   build: 
-  #     context: .
-  #     dockerfile: Dockerfile
-  #   env_file:
-  #     - ./src/.env
-  #   depends_on:
-  #     - db
-  #   command: python -m src.scripts.create_first_superuser
-  #   volumes:
-  #     - ./src:/code/src
+  create_superuser:
+    build: 
+      context: .
+      dockerfile: Dockerfile
+    env_file:
+      - ./src/.env
+    depends_on:
+      - db
+    command: python -m src.scripts.create_first_superuser
+    volumes:
+      - ./src:/code/src
 
   # #-------- uncomment to run tests --------
-  # pytest:
-  #   build: 
-  #     context: .
-  #     dockerfile: Dockerfile 
-  #   env_file:
-  #     - ./src/.env 
-  #   depends_on:
-  #     - db
-  #     - create_superuser
-  #     - redis
-  #   command: python -m pytest
-  #   volumes:
-  #     - ./src:/code/src
+  pytest:
+    build: 
+      context: .
+      dockerfile: Dockerfile 
+    env_file:
+      - ./src/.env 
+    depends_on:
+      - db
+      - create_superuser
+      - redis
+    command: python -m pytest
+    volumes:
+      - ./src:/code/src
 
 volumes:
   postgres-data:

src/app/api/v1/users.py

@@ -117,3 +117,8 @@ async def erase_db_user(
 
     db_user = await crud_users.db_delete(db=db, username=username)
     return {"message": "User deleted from the database"}
+
+@router.get("/deleted_users")
+async def read_users(request: Request, db: Annotated[AsyncSession, Depends(async_get_db)]):
+    users = await crud_users.get_multi(db=db, schema_to_select=UserRead, is_deleted=True)
+    return users

src/app/crud/crud_base.py

@@ -228,9 +228,9 @@ async def delete(
         -------
         None
         """
-        db_row = db_row or await self.get(db=db, **kwargs)
+        db_row = db_row or await self.exists(db=db, **kwargs)
         if db_row:
-            if "is_deleted" in db_row:
+            if "is_deleted" in self._model.__table__.columns:
                 object_dict = {
                     "is_deleted": True,
                     "deleted_at": datetime.utcnow()

src/app/crud/helper.py

@@ -22,7 +22,7 @@ def _extract_matching_columns_from_schema(model: Type[Base], schema: Type[BaseMo
     """
     column_list = list(model.__table__.columns)
     if schema is not None:
-        schema_fields = schema.__fields__.keys()
+        schema_fields = schema.model_fields.keys()
         column_list = []
         for column_name in schema_fields:
             if hasattr(model, column_name):