Skip to content

TT-69 fix: Delete overlap hours #248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 18, 2020
Merged

TT-69 fix: Delete overlap hours #248

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
367b57e
TT-69 fix: Delete overlap hours
Dec 17, 2020
d5482a6
TT-69 fix: add tests
Dec 18, 2020
e150b7d
TT-69 fix: refactor condition
Dec 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions tests/time_tracker_api/time_entries/time_entries_model_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from unittest.mock import Mock, patch
import pytest
from faker import Faker

Expand Down Expand Up @@ -231,3 +232,37 @@ def test_find_running_should_not_find_any_item(
time_entry_repository.find_running(tenant_id, owner_id)
except Exception as e:
assert type(e) is StopIteration


@patch(
'commons.data_access_layer.cosmos_db.CosmosDBRepository.on_update',
new_callable=Mock,
)
def test_updated_item_with_deleted_key_should_not_call_validate_data(
on_update_mock,
event_context: EventContext,
time_entry_repository: TimeEntryCosmosDBRepository,
):

time_entry_repository.validate_data = Mock()
time_entry_repository.replace_empty_value_per_none = Mock()
time_entry_repository.on_update({'deleted': '01234'}, event_context)
on_update_mock.assert_called_once()
time_entry_repository.validate_data.assert_not_called()


@patch(
'commons.data_access_layer.cosmos_db.CosmosDBRepository.on_update',
new_callable=Mock,
)
def test_updated_item_without_deleted_key_should_call_validate_data(
on_update_mock,
event_context: EventContext,
time_entry_repository: TimeEntryCosmosDBRepository,
):

time_entry_repository.validate_data = Mock()
time_entry_repository.replace_empty_value_per_none = Mock()
time_entry_repository.on_update({}, event_context)
on_update_mock.assert_called_once()
time_entry_repository.validate_data.assert_called_once()
3 changes: 2 additions & 1 deletion time_tracker_api/time_entries/time_entries_repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ def on_create(self, new_item_data: dict, event_context: EventContext):

def on_update(self, updated_item_data: dict, event_context: EventContext):
CosmosDBRepository.on_update(self, updated_item_data, event_context)
self.validate_data(updated_item_data, event_context)
if not 'deleted' in updated_item_data:
self.validate_data(updated_item_data, event_context)
self.replace_empty_value_per_none(updated_item_data)

def find_interception_with_date_range(
Expand Down