[NOTICKET] Update endpoint delete file, change behavior to marked as is_deleted=True is user delete the file in FE

externals/databases/pg_crud.py

@@ -184,6 +184,22 @@ async def delete_file_by_filename(
     return result.rowcount > 0
 
 
+@retry_db(retries=2, delay=2)
+async def set_file_deleted_by_filename(
+    db: AsyncSession,
+    filename: str,
+    user_id: UUID,
+) -> bool:
+    stmt = (
+        update(CVFile)
+        .where(CVFile.filename == filename, CVFile.user_id == user_id)
+        .values(is_deleted=True)
+    )
+    result = await db.execute(stmt)
+    await db.commit()
+    return result.rowcount > 0
+
+
 @retry_db(retries=2, delay=2)
 async def get_file_by_user_id(
     db: AsyncSession,

externals/databases/pg_models.py

@@ -52,6 +52,7 @@ class CVFile(Base):
     filename = Column(String, nullable=False)
     url = Column(String, nullable=False)
     is_extracted = Column(BOOLEAN, nullable=False)
+    is_deleted = Column(BOOLEAN, nullable=False)
     uploaded_at = Column(TIMESTAMP(timezone=True), server_default=master_config.JAKARTA_NOW)
     date_modified = Column(TIMESTAMP(timezone=True), server_default=master_config.JAKARTA_NOW)
 

externals/storages/azure_blob.py

@@ -88,6 +88,10 @@ async def delete_blob_by_filename(filename: str, tenant_id: str, user_id: str) -
     blob_client = container.get_blob_client(blob_path)
 
     try:
+        logger.info(
+            "azure.blob.delete.requested",
+            extra={"cv_filename": filename},
+        )
         await blob_client.delete_blob()
         logger.info(
             "azure.blob.delete.success",

interfaces/api/file.py

@@ -97,13 +97,9 @@ async def delete_knowledge_file(
         user=current_user,
     )
 
-    await knowledge_service.delete.delete(filename)
+    status = await knowledge_service.delete.set_deleted(filename)
 
-    return {
-        "message": "File deleted successfully",
-        "filename": filename,
-        "deleted_by": current_user.email,
-    }
+    return status
 
 
 

services/knowledge/delete_file.py

@@ -4,6 +4,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from externals.databases.pg_crud import (
     get_file_by_filename,
     delete_file_by_filename,
+    set_file_deleted_by_filename,
 )
 from externals.storages.azure_blob import delete_blob_by_filename
 from utils.logger import get_logger
@@ -17,42 +18,119 @@ class KnowledgeDeleteService:
         self.user = user
 
     async def delete(self, filename: str) -> None:
-        logger.info(
-            "knowledge.delete.requested",
-            extra={
-                "cv_filename": filename,
-                "user_id": str(self.user.user_id),
-                "tenant_id": str(self.user.tenant_id),
-            },
-        )
-
-        # 1️⃣ Check DB record
-        cv_file = await get_file_by_filename(self.db, 
-                                             filename=filename, 
-                                             user_id=self.user.user_id)
-        if not cv_file:
-            raise HTTPException(
-                status_code=status.HTTP_404_NOT_FOUND,
-                detail=f"File '{filename}' not found",
+        try:
+            logger.info(
+                "knowledge.delete.requested",
+                extra={
+                    "cv_filename": filename,
+                    "user_id": str(self.user.user_id),
+                    "tenant_id": str(self.user.tenant_id),
+                },
             )
 
-        # 2️⃣ Delete blob
-        blob_deleted = await delete_blob_by_filename(filename=filename, 
-                                                     tenant_id=self.user.tenant_id, 
-                                                     user_id=self.user.user_id)
-        if not blob_deleted:
-            raise HTTPException(
-                status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
-                detail="Failed to delete blob file",
+            # 1️⃣ Check DB record
+            cv_file = await get_file_by_filename(self.db, 
+                                                filename=filename, 
+                                                user_id=self.user.user_id)
+            if not cv_file:
+                raise HTTPException(
+                    status_code=status.HTTP_404_NOT_FOUND,
+                    detail=f"File '{filename}' not found",
+                )
+
+            # 2️⃣ Delete blob
+            blob_deleted = await delete_blob_by_filename(filename=filename, 
+                                                        tenant_id=self.user.tenant_id, 
+                                                        user_id=self.user.user_id)
+            if not blob_deleted:
+                raise HTTPException(
+                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                    detail="Failed to delete blob file",
+                )
+
+            # 3️⃣ Delete DB record
+            await delete_file_by_filename(self.db, filename)
+
+            logger.info(
+                "knowledge.delete.success",
+                extra={
+                    "cv_filename": filename,
+                    "user_id": str(self.user.user_id),
+                },
+            )
+            return {"status": "success",
+                    "message": f"file '{filename}' has been deleted",
+                    "data": {
+                        "cv_filename": filename,
+                        "user_id": str(self.user.user_id)}
+                    }
+
+        except Exception as e:
+            logger.error(
+                "knowledge.delete.failed",
+                extra={
+                    "cv_filename": filename,
+                    "user_id": str(self.user.user_id),
+                    "error": str(e),
+                },
+            )
+
+            raise HTTPException(status_code=500, detail=f"Failed to delete file '{filename}': {str(e)}")
+
+    async def set_deleted(self, filename: str) -> dict:
+        try:
+            logger.info(
+                "knowledge.set_deleted.requested",
+                extra={
+                    "cv_filename": filename,
+                    "user_id": str(self.user.user_id),
+                    "tenant_id": str(self.user.tenant_id),
+                },
             )
 
-        # 3️⃣ Delete DB record
-        await delete_file_by_filename(self.db, filename)
+            # 1️⃣ Check DB record
+            cv_file = await get_file_by_filename(self.db,
+                                                 filename=filename,
+                                                 user_id=self.user.user_id)
+            if not cv_file:
+                raise HTTPException(
+                    status_code=status.HTTP_404_NOT_FOUND,
+                    detail=f"File '{filename}' not found",
+                )
+
+            # 2️⃣ Mark as deleted
+            updated = await set_file_deleted_by_filename(self.db,
+                                                         filename=filename,
+                                                         user_id=self.user.user_id)
+            if not updated:
+                raise HTTPException(
+                    status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+                    detail="Failed to mark file as deleted",
+                )
 
-        logger.info(
-            "knowledge.delete.success",
-            extra={
-                "cv_filename": filename,
-                "user_id": str(self.user.user_id),
-            },
-        )
+            logger.info(
+                "knowledge.set_deleted.success",
+                extra={
+                    "cv_filename": filename,
+                    "user_id": str(self.user.user_id),
+                },
+            )
+            return {
+                "status": "success",
+                "message": f"File '{filename}' marked as deleted",
+                "data": {
+                    "cv_filename": filename,
+                    "user_id": str(self.user.user_id),
+                },
+            }
+
+        except Exception as e:
+            logger.error(
+                "knowledge.set_deleted.failed",
+                extra={
+                    "cv_filename": filename,
+                    "user_id": str(self.user.user_id),
+                    "error": str(e),
+                },
+            )
+            raise HTTPException(status_code=500, detail=f"Failed to mark file '{filename}' as deleted: {str(e)}")