2 files changed, 21 insertions, 14 deletions
diff --git a/python/report_ops/custodians.py b/python/report_ops/custodians.py
index 4524e14f..bb939e86 100644
--- a/python/report_ops/custodians.py
+++ b/python/report_ops/custodians.py
@@ -1,14 +1,15 @@
-from serenitas.utils.exchange import ExchangeMessage, FileAttachment
-from serenitas.utils.env import DAILY_DIR
-import warnings
 import datetime
-from .misc import get_dir, _recipients, _cc_recipients
-from .scotia import download_scotia_report
+from typing import ClassVar
+from dataclasses import dataclass
 import gpg
+
+from serenitas.utils.exchange import ExchangeMessage, FileAttachment
+from serenitas.utils.env import DAILY_DIR
 from serenitas.ops.trade_dataclasses import BondDeal
 from serenitas.ops.funds import Service
-from typing import ClassVar
-from dataclasses import dataclass
+
+from .misc import get_dir, _recipients, _cc_recipients, em_date_filter
+from .scotia import download_scotia_report
 
 
 def upload_to_custodian(account, trade_date, upload):
@@ -105,13 +106,7 @@ class Custodian:
 
     @staticmethod
     def em_date_filter(em, date):
-        start = datetime.datetime.combine(date, datetime.time.min).replace(
-            tzinfo=em._account.default_timezone
-        )
-        end = datetime.datetime.combine(date, datetime.time.max).replace(
-            tzinfo=em._account.default_timezone
-        )
-        return {"datetime_received__gte": start, "datetime_received__lte": end}
+        return em_date_filter(em, date, date)
 
 
 class NT(Custodian, account="NT"):
diff --git a/python/report_ops/misc.py b/python/report_ops/misc.py
index 757169fe..0db842bd 100644
--- a/python/report_ops/misc.py
+++ b/python/report_ops/misc.py
@@ -1,6 +1,8 @@
 import pathlib
 import datetime
+
 from serenitas.utils.env import DAILY_DIR
+from serenitas.utils.exchange import ExchangeMessage
 
 _recipients = {
     "ISOSEL": (
@@ -119,3 +121,13 @@ def dt_from_citco(filename, file_tag, dt_format):
     return datetime.datetime.strptime(
         filename.removesuffix(".csv").removeprefix(file_tag), dt_format
     )
+
+
+def em_date_filter(em: ExchangeMessage, start: datetime.date, end: datetime.date):
+    start = datetime.datetime.combine(start, datetime.time.min).replace(
+        tzinfo=em._account.default_timezone
+    )
+    end = datetime.datetime.combine(end, datetime.time.max).replace(
+        tzinfo=em._account.default_timezone
+    )
+    return {"datetime_received__gte": start, "datetime_received__lte": end}