Merge branch 'dev' into feature/dax/devops-svc
This commit is contained in:
commit
3ce7a7ec76
@ -20,6 +20,7 @@ class ContentDataFormat(IntEnum):
|
|||||||
|
|
||||||
class ContentFileConstants:
|
class ContentFileConstants:
|
||||||
COVER_FILE_NAME: str = "cover.png"
|
COVER_FILE_NAME: str = "cover.png"
|
||||||
|
HOVER_FILE_NAME: str = "hover.png"
|
||||||
SUMMARY_FILE_NAME: str = "summary.txt"
|
SUMMARY_FILE_NAME: str = "summary.txt"
|
||||||
TITLE_FILE_NAME: str = "title.txt"
|
TITLE_FILE_NAME: str = "title.txt"
|
||||||
CONTENT_LINK_FILE_NAME: str = "content.link"
|
CONTENT_LINK_FILE_NAME: str = "content.link"
|
||||||
|
|||||||
@ -60,6 +60,7 @@ class ContentSharePointManager:
|
|||||||
|
|
||||||
content_type_mapping = {
|
content_type_mapping = {
|
||||||
ContentFileConstants.COVER_FILE_NAME: "cover_document_id",
|
ContentFileConstants.COVER_FILE_NAME: "cover_document_id",
|
||||||
|
ContentFileConstants.HOVER_FILE_NAME: "hover_document_id",
|
||||||
ContentFileConstants.SUMMARY_FILE_NAME: "summary_text_new",
|
ContentFileConstants.SUMMARY_FILE_NAME: "summary_text_new",
|
||||||
ContentFileConstants.TITLE_FILE_NAME: "title_text_new",
|
ContentFileConstants.TITLE_FILE_NAME: "title_text_new",
|
||||||
ContentFileConstants.CONTENT_LINK_FILE_NAME: "content_link",
|
ContentFileConstants.CONTENT_LINK_FILE_NAME: "content_link",
|
||||||
@ -90,6 +91,7 @@ class ContentSharePointManager:
|
|||||||
content_directory = ContentDirectory(
|
content_directory = ContentDirectory(
|
||||||
content_name=sp_folder["name"],
|
content_name=sp_folder["name"],
|
||||||
cover_document_id=None,
|
cover_document_id=None,
|
||||||
|
hover_document_id=None,
|
||||||
summary_text=None,
|
summary_text=None,
|
||||||
title_text=None,
|
title_text=None,
|
||||||
content_link=None,
|
content_link=None,
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
from datetime import datetime, timedelta
|
||||||
from typing import Set
|
from typing import Set
|
||||||
from backend.content.models import DocumentDoc
|
from backend.content.models import DocumentDoc
|
||||||
from backend.content.models import ContentFolderDoc
|
from backend.content.models import ContentFolderDoc
|
||||||
@ -32,11 +33,16 @@ class DocumentCleaner:
|
|||||||
print(
|
print(
|
||||||
f"Valid document IDs (from updated content directories): {valid_document_ids}"
|
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
|
# Retrieve all document IDs from DocumentDoc
|
||||||
all_document_ids = set()
|
all_document_ids = set()
|
||||||
async for doc in DocumentDoc.find(
|
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
|
): # Fetch all documents that are created by content-service
|
||||||
if doc.document_id: # Ensure document_id is not None
|
if doc.document_id: # Ensure document_id is not None
|
||||||
all_document_ids.add(doc.document_id)
|
all_document_ids.add(doc.document_id)
|
||||||
|
|||||||
@ -20,6 +20,7 @@ class ContentDirectory(BaseModel):
|
|||||||
content_text: Optional[str] = None
|
content_text: Optional[str] = None
|
||||||
content_text_new: Optional[str] = None
|
content_text_new: Optional[str] = None
|
||||||
content_document_id: Optional[str] = None
|
content_document_id: Optional[str] = None
|
||||||
|
hover_document_id: Optional[str] = None
|
||||||
|
|
||||||
|
|
||||||
class MediaType(IntEnum):
|
class MediaType(IntEnum):
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user