INTEG-946 Changed upper boundary of timestamp to include microseconds to end_date (#21)

* INTEG-946 Changed upper boundary of timestamp to include microseconds when time is not specified

* INTEG-946 : Refactor change method name and refactor parse_timestamp

* INTEG-946 Added Changelog

Author: kiran-chaudhary

CHANGELOG.md

@@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 The intended audience of this file is for py42 consumers -- as such, changes that don't affect
 how a consumer would use the library (e.g. adding unit tests, updating documentation, etc) are not captured here.
 
+###Fixed
+
+- Add milliseconds to end timestamp, to represent end of day with milliseconds precision.
+
 ## 0.4.3 - 2020-03-17
 
 ### Added

src/code42cli/securitydata/date_helper.py

@@ -15,40 +15,54 @@ def create_event_timestamp_filter(begin_date=None, end_date=None):
             begin_date: The begin date for the range.
             end_date: The end date for the range.
     """
-    end_date = _get_end_date_with_eod_time_if_needed(end_date)
+
     if begin_date and end_date:
-        return _create_in_range_filter(begin_date, end_date)
+        min_timestamp = _parse_min_timestamp(begin_date)
+        max_timestamp = _parse_max_timestamp(end_date)
+        return _create_in_range_filter(min_timestamp, max_timestamp)
     elif begin_date and not end_date:
-        return _create_on_or_after_filter(begin_date)
+        min_timestamp = _parse_min_timestamp(begin_date)
+        return _create_on_or_after_filter(min_timestamp)
     elif end_date and not begin_date:
-        return _create_on_or_before_filter(end_date)
+        max_timestamp = _parse_max_timestamp(end_date)
+        return _create_on_or_before_filter(max_timestamp)
+
+
+def _parse_max_timestamp(end_date):
+    if len(end_date) == 1:
+        end_date = _get_end_date_with_eod_time_if_needed(end_date)
+        max_time = _parse_timestamp(end_date)
+        max_time = _add_milliseconds(max_time)
+    else:
+        max_time = _parse_timestamp(end_date)
+
+    return convert_datetime_to_timestamp(max_time)
+
+
+def _add_milliseconds(max_time):
+    return max_time + timedelta(milliseconds=999)
 
 
-def _create_in_range_filter(begin_date, end_date):
-    min_timestamp = _parse_min_timestamp(begin_date)
-    max_timestamp = _parse_timestamp(end_date)
+def _create_in_range_filter(min_timestamp, max_timestamp):
     _verify_timestamp_order(min_timestamp, max_timestamp)
     return EventTimestamp.in_range(min_timestamp, max_timestamp)
 
 
-def _create_on_or_after_filter(begin_date):
-    min_timestamp = _parse_min_timestamp(begin_date)
+def _create_on_or_after_filter(min_timestamp):
     return EventTimestamp.on_or_after(min_timestamp)
 
 
-def _create_on_or_before_filter(end_date):
-    max_timestamp = _parse_timestamp(end_date)
+def _create_on_or_before_filter(max_timestamp):
     return EventTimestamp.on_or_before(max_timestamp)
 
 
 def _get_end_date_with_eod_time_if_needed(end_date):
-    if end_date and len(end_date) == 1:
-        return end_date[0], "23:59:59"
-    return end_date
+    return end_date[0], "23:59:59"
 
 
 def _parse_min_timestamp(begin_date_str):
-    min_timestamp = _parse_timestamp(begin_date_str)
+    min_time = _parse_timestamp(begin_date_str)
+    min_timestamp = convert_datetime_to_timestamp(min_time)
     boundary_date = datetime.utcnow() - timedelta(days=_MAX_LOOK_BACK_DAYS)
     boundary = convert_datetime_to_timestamp(boundary_date)
     if min_timestamp and min_timestamp < boundary:
@@ -68,9 +82,9 @@ def _parse_timestamp(date_and_time):
         date_str = _join_date_and_time(date_and_time)
         date_format = u"%Y-%m-%d" if len(date_and_time) == 1 else u"%Y-%m-%d %H:%M:%S"
         time = datetime.strptime(date_str, date_format)
+        return time
     except ValueError:
         raise ValueError(_FORMAT_VALUE_ERROR_MESSAGE)
-    return convert_datetime_to_timestamp(time)
 
 
 def _join_date_and_time(date_and_time):

tests/securitydata/test_date_helper.py

@@ -37,7 +37,7 @@ def test_create_event_timestamp_filter_when_given_begin_with_time_builds_expecte
 def test_create_event_timestamp_filter_when_given_end_builds_expected_query():
     ts_range = create_event_timestamp_filter(begin_date_list, end_date_list)
     actual = get_filter_value_from_json(ts_range, filter_index=1)
-    expected = "{0}T23:59:59.000Z".format(end_date_list[0])
+    expected = "{0}T23:59:59.999Z".format(end_date_list[0])
     assert actual == expected
 
 

tests/securitydata/test_extraction.py

@@ -213,7 +213,7 @@ def test_extract_when_given_end_date_uses_expected_query(logger, namespace_with_
     namespace_with_begin.end_date = get_test_date_str(days_ago=10)
     extraction_module.extract(logger, namespace_with_begin)
     actual = get_filter_value_from_json(extractor.extract.call_args[0][0], filter_index=1)
-    expected = "{0}T23:59:59.000Z".format(namespace_with_begin.end_date)
+    expected = "{0}T23:59:59.999Z".format(namespace_with_begin.end_date)
     assert actual == expected