[STTNHUB-348] fix(ingests): Use midnight for planning date if no time…

… provided (#77)
superdesk · Jul 2, 2024 · afc17bc · afc17bc
1 parent 98922d7
commit afc17bc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/server/features/ingest_planning.feature b/server/features/ingest_planning.feature
@@ -63,7 +63,7 @@ Feature: Ingest STT Planning items
             "ingest_provider": "#providers.sttplanningml#",
             "slugline": "Miten tilanne Ukrainan sodan ymp\u00e4rill\u00e4 ja Ukrainassa kehittyy?",
             "name": "Miten tilanne Ukrainan sodan ymp\u00e4rill\u00e4 ja Ukrainassa kehittyy?",
-            "planning_date": "2022-03-29T21:00:00+0000",
+            "planning_date": "2022-03-30T00:00:00+0000",
             "source": "stt",
             "state": "ingested",
             "subject": [{
@@ -83,7 +83,7 @@ Feature: Ingest STT Planning items
                 "planning": {
                     "g2_content_type": "text",
                     "slugline": "UKRAINA // Y\u00f6n seurantaa",
-                    "scheduled": "2022-03-29T21:00:00+0000",
+                    "scheduled": "2022-03-30T00:00:00+0000",
                     "genre": [{
                         "qcode": "sttgenre:1",
                         "name": "P\u00e4\u00e4juttu"
@@ -101,7 +101,7 @@ Feature: Ingest STT Planning items
                 "planning": {
                     "g2_content_type": "picture",
                     "slugline": "Miten tilanne Ukrainan sodan ymp\u00e4rill\u00e4 ja Ukrainassa kehittyy?",
-                    "scheduled": "2022-03-29T21:00:00+0000",
+                    "scheduled": "2022-03-30T00:00:00+0000",
                     "genre": [{
                         "qcode": "sttimage:27",
                         "name": "Kv. kuvaa"

diff --git a/server/stt/stt_planning_ml.py b/server/stt/stt_planning_ml.py
@@ -1,6 +1,8 @@
 from typing import Dict, Any, Optional, Set
 from xml.etree.ElementTree import Element
 from eve.utils import config
+from datetime import datetime
+import pytz
 
 from superdesk import get_resource_service
 from superdesk.utc import local_to_utc
@@ -46,6 +48,16 @@ def parse_item(self, tree: Element, original: Optional[Planning]) -> Optional[Pl
 
     def datetime(self, value: str):
         """When there is no timezone info, assume it's Helsinki timezone."""
+
+        # First check if the value provided is a date only
+        # And store the date/time as midnight in UTC
+        try:
+            date_value = datetime.strptime(value, "%Y-%m-%d")
+            return date_value.replace(tzinfo=pytz.utc)
+        except ValueError:
+            pass
+
+        # Value provides more than date, try other formats
         parsed = super().datetime(value)
         if "+" not in value:
             return local_to_utc(TIMEZONE, parsed)

diff --git a/server/tests/stt_planning_ml_test.py b/server/tests/stt_planning_ml_test.py
@@ -74,7 +74,7 @@ def test_placeholder_coverage(self):
                 "planning": {
                     "slugline": "",
                     "g2_content_type": "text",
-                    "scheduled": datetime(2023, 5, 28, 21, 0, tzinfo=tzutc()),
+                    "scheduled": datetime(2023, 5, 29, 0, 0, tzinfo=tzutc()),
                 },
                 "flags": {"placeholder": True},
                 "news_coverage_status": {