Skip to content

Change of expiry-dates on report-submission #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jecarr merged 1 commit into from
Oct 19, 2025
Merged

Change of expiry-dates on report-submission #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions threadcomponents/helpers/date.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from datetime import datetime, timedelta
from datetime import datetime
from dateutil.relativedelta import relativedelta

from threadcomponents.constants import DATETIME_OBJ

Expand Down Expand Up @@ -86,7 +87,7 @@ def pre_save_date_checks(date_dict_list, mandatory_field_list, success_response)
def generate_report_expiry(data=None, **date_kwargs):
"""Function to generate an expiry date from today and add it to a data-dictionary, if provided."""
# Prepare expiry date as str
expiry_date = datetime.now() + timedelta(**date_kwargs)
expiry_date = datetime.now() + relativedelta(**date_kwargs)
expiry_date_str = expiry_date.strftime("%Y-%m-%d %H:%M:%S")

if data:
Expand Down
4 changes: 2 additions & 2 deletions threadcomponents/service/rest_svc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,8 +511,8 @@ async def start_analysis(self, criteria=None):
if article_date:
update_data.update(dict(date_written=article_date))

# Add expiry date (now + 1 week)
self.report_manager.add_report_expiry(data=update_data, weeks=1)
# Add expiry date (now + 1 month)
self.report_manager.add_report_expiry(data=update_data, months=1)

# Update card to reflect the end of queue
await self.dao.update("reports", where=dict(uid=report_id), data=update_data)
Expand Down