From 91a893a4333e320292014923a776f44e38cc02af Mon Sep 17 00:00:00 2001 From: Jet Li Date: Thu, 24 Apr 2025 00:06:58 -0700 Subject: [PATCH 1/2] chore(hover_image): adding new hover images in the response body --- apps/content/backend/content/constants.py | 1 + apps/content/backend/content/content_sharepoint_manager.py | 2 ++ apps/content/backend/content/models.py | 1 + 3 files changed, 4 insertions(+) diff --git a/apps/content/backend/content/constants.py b/apps/content/backend/content/constants.py index 3b733c0..55b8c03 100644 --- a/apps/content/backend/content/constants.py +++ b/apps/content/backend/content/constants.py @@ -20,6 +20,7 @@ class ContentDataFormat(IntEnum): class ContentFileConstants: COVER_FILE_NAME: str = "cover.png" + HOVER_FILE_NAME: str = "hover.png" SUMMARY_FILE_NAME: str = "summary.txt" TITLE_FILE_NAME: str = "title.txt" CONTENT_LINK_FILE_NAME: str = "content.link" diff --git a/apps/content/backend/content/content_sharepoint_manager.py b/apps/content/backend/content/content_sharepoint_manager.py index 1722363..3a124ec 100644 --- a/apps/content/backend/content/content_sharepoint_manager.py +++ b/apps/content/backend/content/content_sharepoint_manager.py @@ -60,6 +60,7 @@ class ContentSharePointManager: content_type_mapping = { ContentFileConstants.COVER_FILE_NAME: "cover_document_id", + ContentFileConstants.HOVER_FILE_NAME: "hover_document_id", ContentFileConstants.SUMMARY_FILE_NAME: "summary_text_new", ContentFileConstants.TITLE_FILE_NAME: "title_text_new", ContentFileConstants.CONTENT_LINK_FILE_NAME: "content_link", @@ -90,6 +91,7 @@ class ContentSharePointManager: content_directory = ContentDirectory( content_name=sp_folder["name"], cover_document_id=None, + hover_document_id=None, summary_text=None, title_text=None, content_link=None, diff --git a/apps/content/backend/content/models.py b/apps/content/backend/content/models.py index ce4efec..f258c1f 100644 --- a/apps/content/backend/content/models.py +++ b/apps/content/backend/content/models.py @@ -20,6 +20,7 @@ class ContentDirectory(BaseModel): content_text: Optional[str] = None content_text_new: Optional[str] = None content_document_id: Optional[str] = None + hover_document_id: Optional[str] = None class MediaType(IntEnum): From dd96819709b4e0eef46eefbd5004ff25f5cdd8cd Mon Sep 17 00:00:00 2001 From: Jet Li Date: Sat, 26 Apr 2025 19:53:44 -0700 Subject: [PATCH 2/2] fix(cleaner): update document cleaner job --- apps/content/backend/content/document_cleaner.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/content/backend/content/document_cleaner.py b/apps/content/backend/content/document_cleaner.py index 9bc4d30..54feb20 100644 --- a/apps/content/backend/content/document_cleaner.py +++ b/apps/content/backend/content/document_cleaner.py @@ -1,3 +1,4 @@ +from datetime import datetime, timedelta from typing import Set from backend.content.models import DocumentDoc from backend.content.models import ContentFolderDoc @@ -32,11 +33,16 @@ class DocumentCleaner: print( f"Valid document IDs (from updated content directories): {valid_document_ids}" ) + # Calculate the time 1 day ago + time_1_day_ago = datetime.now(datetime.UTC) - timedelta(days=1) # Retrieve all document IDs from DocumentDoc all_document_ids = set() async for doc in DocumentDoc.find( - {"created_by": {"$regex": "^content-service-"}} + { + "created_by": {"$regex": "^content-service-"}, + "create_time": {"$lt": time_1_day_ago}, + } ): # Fetch all documents that are created by content-service if doc.document_id: # Ensure document_id is not None all_document_ids.add(doc.document_id)