TT-201 validate the current entry and last entry

tests/time_tracker_api/time_entries/time_entries_model_test.py

@@ -330,11 +330,78 @@ def test_get_last_entry(
         'activity_id': 'activity_id',
         'technologies': ['python'],
     }
-    query_items_mock = Mock(return_value=[expected_item])
+    query_items_mock = Mock(return_value=iter([expected_item]))
     time_entry_repository.container = Mock()
     time_entry_repository.container.query_items = query_items_mock
 
-    result = time_entry_repository.get_last_entry('id1', event_context)
+    time_entry = time_entry_repository.get_last_entry('id1', event_context)
+
     find_partition_key_value_mock.assert_called_once()
+    assert isinstance(time_entry, TimeEntryCosmosDBModel)
+    assert time_entry.__dict__ == expected_item
+
+
+expected_item = {
+    'id': 'id',
+    'owner_id': '1',
+    'start_date': '2021-03-22T10:00:00.000Z',
+    'end_date': "2021-03-22T11:00:00.000Z",
+    'description': 'do some testing',
+    'tenant_id': 'tenant_id',
+    'project_id': 'project_id',
+    'activity_id': 'activity_id',
+    'technologies': ['python'],
+}
+
+running_item = {
+    'id': 'id',
+    'owner_id': '1',
+    'update_last_entry_if_overlap': True,
+    'start_date': '2021-03-22T10:30:00.000Z',
+    'end_date': '2021-03-22T11:30:00.000Z',
+    'description': 'do some testing',
+    'tenant_id': 'tenant_id',
+    'project_id': 'project_id',
+    'activity_id': 'activity_id',
+    'technologies': ['python'],
+}
+
+last_item_update = {
+    'id': 'id',
+    'owner_id': '1',
+    'start_date': '2021-03-22T10:00:00.000Z',
+    'end_date': "2021-03-22T10:30:00.000Z",
+    'description': 'do some testing',
+    'tenant_id': 'tenant_id',
+    'project_id': 'project_id',
+    'activity_id': 'activity_id',
+    'technologies': ['python'],
+}
+
+
+@pytest.mark.parametrize(
+    "expected_item, running_item, last_item_update",
+    [(expected_item, running_item, last_item_update)],
+)
+def test_update_last_entry(
+    event_context: EventContext,
+    time_entry_repository: TimeEntryCosmosDBRepository,
+    expected_item,
+    running_item,
+    last_item_update,
+):
+    query_items_mock = Mock(return_value=iter([expected_item]))
+    time_entry_repository.container = Mock()
+    time_entry_repository.container.query_items = query_items_mock
+
+    partial_update_mock = Mock(return_value=[last_item_update])
+    time_entry_repository.partial_update = partial_update_mock
+
+    time_entry_repository.update_last_entry(
+        running_item.get('owner_id'),
+        running_item.get('start_date'),
+        event_context,
+    )
 
-    assert result == expected_item
+    partial_update_mock.assert_called_once()
+    query_items_mock.assert_called_once()

tests/time_tracker_api/time_entries/time_entries_namespace_test.py

@@ -881,3 +881,32 @@ def test_paginated_sends_max_count_and_offset_on_call_to_repository(
     _, kwargs = time_entries_dao.repository.find_all.call_args
     assert 'max_count' in kwargs and kwargs['max_count'] is not None
     assert 'offset' in kwargs and kwargs['offset'] is not None
+
+
+def test_update_time_entry_calls_update_last_entry(
+    client: FlaskClient,
+    mocker: MockFixture,
+    valid_header: dict,
+    valid_id: str,
+    time_entries_dao,
+):
+    time_entries_dao.repository.partial_update = Mock(return_value={})
+    time_entries_dao.repository.find = Mock(return_value={})
+    time_entries_dao.check_whether_current_user_owns_item = Mock()
+    time_entries_dao.repository.update_last_entry = Mock(return_value={})
+
+    update_time_entry = valid_time_entry_input.copy()
+    update_time_entry['update_last_entry_if_overlap'] = True
+
+    response = client.put(
+        f'/time-entries/{valid_id}',
+        headers=valid_header,
+        json=update_time_entry,
+        follow_redirects=True,
+    )
+
+    assert HTTPStatus.OK == response.status_code
+    time_entries_dao.repository.partial_update.assert_called_once()
+    time_entries_dao.repository.find.assert_called_once()
+    time_entries_dao.check_whether_current_user_owns_item.assert_called_once()
+    time_entries_dao.repository.update_last_entry.assert_called_once()

time_tracker_api/time_entries/time_entries_repository.py

@@ -261,7 +261,8 @@ def get_last_entry(
             partition_key=partition_key_value,
         )
 
-        return result.pop()
+        function_mapper = self.get_mapper_or_dict(mapper)
+        return function_mapper(next(result))
 
     def update_last_entry(
         self, owner_id, start_date, event_context: EventContext