icecheng/freeleaps-service-hub
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update payment redirect and scheduler job for deleting document id

Browse Source
This commit is contained in:
jetli 2025-04-20 00:05:00 -07:00
parent 21b49df49c
commit b95a818e30
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/content/backend/document/document_manager.py
View File

@ -1,6 +1,7 @@
from common.config.app_settings import app_settings from common.config.app_settings import app_settings
from backend.content.models import DocumentDoc from backend.content.models import DocumentDoc
from backend.document.models import BasicProfileDoc from backend.document.models import BasicProfileDoc
from datetime import datetime, timezone
import httpx import httpx
import base64 import base64
@ -53,9 +54,12 @@ class DocumentManager:
print(f"Failed to queue deletion: {response.text}") print(f"Failed to queue deletion: {response.text}")
async def cleanup_document(self): async def cleanup_document(self):
# Get today's date at midnight (UTC)
today_start = datetime.now(timezone.utc).replace(hour=0, minute=0, second=0, microsecond=0)
# Corrected query with regex # Corrected query with regex
documents = await DocumentDoc.find( documents = await DocumentDoc.find(
{"created_by": {"$regex": "^content-service-"}} {"created_by": {"$regex": "^content-service-"},
"create_time": {"$lt": today_start}}
).to_list() ).to_list()
if documents: if documents:

21
apps/content/scheduler/scheduler_manager.py
View File

@ -1,5 +1,6 @@
from apscheduler.schedulers.asyncio import AsyncIOScheduler from apscheduler.schedulers.asyncio import AsyncIOScheduler
from apscheduler.triggers.date import DateTrigger from apscheduler.triggers.date import DateTrigger
from apscheduler.triggers.cron import CronTrigger
from datetime import datetime, timedelta from datetime import datetime, timedelta
from scheduler.refresh_sharepoint_content_job import ( from scheduler.refresh_sharepoint_content_job import (
refresh_sharepoint_content_job, refresh_sharepoint_content_job,
@ -28,15 +29,11 @@ async def register_job(scheduler: AsyncIOScheduler):
"date", "date",
run_date=datetime(2025, 2, 7, 20, 0, 0), run_date=datetime(2025, 2, 7, 20, 0, 0),
) )
# Register cleanup_document_job as a one-time job
# This job is just one-time job for removing many unused documents await init_lock(ScheduleJobLocker.CLEANUP_DOCUMENT_JOB_LOCKER)
# Run already, now comment it out scheduler.add_job(
# await init_lock(ScheduleJobLocker.CLEANUP_DOCUMENT_JOB_LOCKER) cleanup_document_job,
# execution_time = datetime.now() + timedelta( trigger=CronTrigger(hour=2, minute=0), # Runs every day at 2:00 AM
# seconds=60 id="cleanup_document_daily",
# ) # Schedule to run 60 seconds from now )
# scheduler.add_job(
# cleanup_document_job, # Job function
# trigger=DateTrigger(run_date=execution_time), # One-time trigger
# id="cleanup_document_one_time", # Optional: Give the job an ID
# )

4
apps/payment/backend/business/stripe_manager.py
View File

@ -292,10 +292,10 @@ class StripeManager:
}, },
}, },
mode="payment", mode="payment",
success_url="{}/work-space".format( success_url="{}/projects".format(
self.site_url_root self.site_url_root
), # needs to be set, local: http://localhost/ ), # needs to be set, local: http://localhost/
cancel_url="{}/work-space".format(self.site_url_root), cancel_url="{}/projects".format(self.site_url_root),
) )
if session: if session: