diff --git a/threadcomponents/helpers/date.py b/threadcomponents/helpers/date.py index 9b97650..d236c60 100644 --- a/threadcomponents/helpers/date.py +++ b/threadcomponents/helpers/date.py @@ -1,4 +1,5 @@ -from datetime import datetime, timedelta +from datetime import datetime +from dateutil.relativedelta import relativedelta from threadcomponents.constants import DATETIME_OBJ @@ -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: diff --git a/threadcomponents/service/rest_svc.py b/threadcomponents/service/rest_svc.py index ad95b23..58e5582 100644 --- a/threadcomponents/service/rest_svc.py +++ b/threadcomponents/service/rest_svc.py @@ -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)