Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
fix: TT-303 Create activity with active status fixed
  • Loading branch information
jcalarcon98 committed Aug 6, 2021
commit a40d5e9b455d863306d20bae645a9213a1144f28
41 changes: 35 additions & 6 deletions tests/time_tracker_api/activities/activities_model_test.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,19 @@
from unittest.mock import Mock, patch

import copy
from unittest.mock import Mock, patch, ANY
from faker import Faker
from commons.data_access_layer.database import EventContext
from time_tracker_api.activities.activities_model import (
ActivityCosmosDBRepository,
ActivityCosmosDBModel,
create_dao,
)

faker = Faker()


@patch(
'time_tracker_api.activities.activities_model.ActivityCosmosDBRepository.create_sql_condition_for_visibility'
)
@patch(
'time_tracker_api.activities.activities_model.ActivityCosmosDBRepository.find_partition_key_value'
)
Expand All @@ -16,10 +23,10 @@ def test_find_all_with_id_in_list(
activity_repository: ActivityCosmosDBRepository,
):
expected_item = {
'id': 'id1',
'name': 'testing',
'description': 'do some testing',
'tenant_id': 'tenantid1',
'id': faker.uuid4(),
'name': faker.name(),
'description': faker.sentence(nb_words=4),
'tenant_id': faker.uuid4(),
}

query_items_mock = Mock(return_value=[expected_item])
Expand All @@ -37,3 +44,25 @@ def test_find_all_with_id_in_list(
activity = result[0]
assert isinstance(activity, ActivityCosmosDBModel)
assert activity.__dict__ == expected_item


def test_create_activity_should_add_active_status(
mocker,
):
activity_payload = {
'name': faker.name(),
'description': faker.sentence(nb_words=5),
'tenant_id': faker.uuid4(),
}
activity_repository_create_mock = mocker.patch.object(
ActivityCosmosDBRepository, 'create'
)

activity_dao = create_dao()
activity_dao.create(activity_payload)

expect_argument = copy.copy(activity_payload)
expect_argument['status'] = 'active'
activity_repository_create_mock.assert_called_with(
data=expect_argument, event_context=ANY
)
13 changes: 8 additions & 5 deletions time_tracker_api/activities/activities_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@
from time_tracker_api.database import CRUDDao, APICosmosDBDao
from typing import List, Callable
from commons.data_access_layer.database import EventContext
from utils.repository import (
convert_list_to_tuple_string,
create_sql_in_condition,
)
from utils.query_builder import CosmosDBQueryBuilder, Order
from utils.query_builder import CosmosDBQueryBuilder


class ActivityDao(CRUDDao):
Expand Down Expand Up @@ -150,6 +146,13 @@ def get_all(
)
return activities

def create(self, activity_payload: dict):
event_ctx = self.create_event_context('create')
activity_payload['status'] = 'active'
return self.repository.create(
data=activity_payload, event_context=event_ctx
)


def create_dao() -> ActivityDao:
repository = ActivityCosmosDBRepository()
Expand Down