Merge pull request #284 from lsst-ts/tickets/DM-46580

Fix date conversion for the get_jira_obs_report method

Author: sebastian-aranda

CHANGELOG.rst

@@ -2,6 +2,11 @@
 Version History
 ===============
 
+v7.1.2
+------
+
+* Fix date conversion for the get_jira_obs_report method `<https://github.com/lsst-ts/LOVE-manager/pull/284>`_
+
 v7.1.1
 ------
 

manager/api/tests/test_jira.py

@@ -30,6 +30,7 @@
 
 from manager.utils import (
     TIME_LOST_FIELD,
+    get_jira_obs_report,
     handle_jira_payload,
     jira_comment,
     jira_ticket,
@@ -488,3 +489,61 @@ def test_handle_exposure_jira_payload(self):
         )
 
         mock_jira_patcher.stop()
+
+    def test_get_jira_obs_report(self):
+        """Test call to get_jira_obs_report
+        function with all needed parameters"""
+        mock_jira_patcher = patch("requests.get")
+        mock_jira_client = mock_jira_patcher.start()
+        response = requests.Response()
+        response.status_code = 200
+        response.json = lambda: {
+            "issues": [
+                {
+                    "key": "LOVE-XX",
+                    "fields": {
+                        "summary": "Issue title",
+                        TIME_LOST_FIELD: 13.6,
+                        "creator": {"displayName": "user"},
+                        "created": "2022-07-03T19:58:13.00000",
+                    },
+                }
+            ]
+        }
+        mock_jira_client.return_value = response
+
+        request_data = {
+            "day_obs": 20240902,
+        }
+        jira_response = get_jira_obs_report(request_data)
+        assert jira_response[0]["key"] == "LOVE-XX"
+        assert jira_response[0]["summary"] == "Issue title"
+        assert jira_response[0]["time_lost"] == 13.6
+        assert jira_response[0]["reporter"] == "user"
+        assert jira_response[0]["created"] == "2022-07-03T19:58:13"
+
+        mock_jira_patcher.stop()
+
+    def test_get_jira_obs_report_fail(self):
+        """Test call to get_jira_obs_report function with fail response"""
+        mock_jira_patcher = patch("requests.get")
+        mock_jira_client = mock_jira_patcher.start()
+        response = requests.Response()
+        response.status_code = 400
+        mock_jira_client.return_value = response
+
+        request_data = {
+            "day_obs": 20240902,
+        }
+        with pytest.raises(Exception):
+            get_jira_obs_report(request_data)
+
+        mock_jira_patcher.stop()
+
+    def test_get_jira_obs_report_bad_date(self):
+        """Test call to get_jira_obs_report function with bad date"""
+        request_data = {
+            "day_obs": 20240931,
+        }
+        with pytest.raises(ValueError):
+            get_jira_obs_report(request_data)

manager/manager/utils.py

@@ -656,8 +656,11 @@ def get_jira_obs_report(request_data):
     Then get the total observation time loss from the time_lost param
     """
 
-    initial_day_obs_string = get_obsday_iso(request_data.get("day_obs"))
-    final_day_obs_string = get_obsday_iso(request_data.get("day_obs") + 1)
+    intitial_day_obs_tai = get_obsday_to_tai(request_data.get("day_obs"))
+    final_day_obs_tai = intitial_day_obs_tai + timedelta(days=1)
+
+    initial_day_obs_string = intitial_day_obs_tai.strftime("%Y-%m-%d")
+    final_day_obs_string = final_day_obs_tai.strftime("%Y-%m-%d")
 
     # JQL query to find issues created on a specific date
     jql_query = (
@@ -733,6 +736,25 @@ def get_obsday_from_tai(tai):
     return observing_day
 
 
+def get_obsday_to_tai(obsday):
+    """Return the TAI timestamp from an observing day.
+
+    The TAI timestamp is set to 12:00 UTC of the observing day.
+
+    Parameters
+    ----------
+    obsday : `int`
+        The observing day in the format "YYYYMMDD" as an integer
+
+    Returns
+    -------
+    `datetime.datetime`
+        The TAI timestamp
+    """
+    obsday_iso = get_obsday_iso(obsday)
+    return Time(f"{obsday_iso}T12:00:00", scale="tai").datetime
+
+
 def get_obsday_iso(obsday):
     """Return the observing day in ISO format.