fix: TT-357 Testing of methods create and update

Author: dsgarcia8

.gitignore

@@ -29,10 +29,6 @@ node_modules
 # Serverless directories
 .serverless/
 
-# Azure Functions json config
-host.json
-local.settings.json
-
 # Files generated for development
 .env
 timetracker-api-postman-collection.json

CHANGELOG.md

@@ -2,6 +2,27 @@
 
 <!--next-version-placeholder-->
 
+## v0.42.0 (2021-11-03)
+### Feature
+* TT-365 / TT-369  POST V2 Activity ([#329](https://github.com/ioet/time-tracker-backend/issues/329)) ([`6c3687b`](https://github.com/ioet/time-tracker-backend/commit/6c3687b5ca60893be23b6ad663de3081af964272))
+
+## v0.41.0 (2021-10-28)
+### Feature
+* TT-366 V2 - PUT update activity ([#331](https://github.com/ioet/time-tracker-backend/issues/331)) ([`500a5d0`](https://github.com/ioet/time-tracker-backend/commit/500a5d0261497ce9aa9a9040342fea94dbe70704))
+
+## v0.40.0 (2021-10-27)
+### Feature
+* TT-367  V2 - Delete Activity ([#330](https://github.com/ioet/time-tracker-backend/issues/330)) ([`6ba8320`](https://github.com/ioet/time-tracker-backend/commit/6ba8320c6ddd6599679dfbbbaf9ac1dba9addb8d))
+* TT-358 Use serverless to create Azure endpoint ([#328](https://github.com/ioet/time-tracker-backend/issues/328)) ([`464f281`](https://github.com/ioet/time-tracker-backend/commit/464f28193d986f12ccea6c785eee1f818b5989fb))
+
+### Fix
+* TT-385 adding library Flask-SQLAlchemy ([#332](https://github.com/ioet/time-tracker-backend/issues/332)) ([`22de108`](https://github.com/ioet/time-tracker-backend/commit/22de108ef0bd7de0f130a697e5068cad308f76e2))
+* TT-001 commit to bring the changes to production ([#327](https://github.com/ioet/time-tracker-backend/issues/327)) ([`1d65c1d`](https://github.com/ioet/time-tracker-backend/commit/1d65c1d65c5a29bb6330dc8d52ae1bd5c38003be))
+* TT-335 patch to give admin permissions to certain users ([#323](https://github.com/ioet/time-tracker-backend/issues/323)) ([`c0b51c9`](https://github.com/ioet/time-tracker-backend/commit/c0b51c9b3127c7d231448e038a713fcc6126c093))
+
+### Documentation
+* TT-000 test 2 release ([#326](https://github.com/ioet/time-tracker-backend/issues/326)) ([`7294e2e`](https://github.com/ioet/time-tracker-backend/commit/7294e2e14641ee45f408c593e768cc7f2e07e742))
+
 ## v0.39.1 (2021-10-06)
 ### Fix
 * TT-339 skip users with azureioet.onmicrosoft.com extension from user search ([#322](https://github.com/ioet/time-tracker-backend/issues/322)) ([`8b37d4a`](https://github.com/ioet/time-tracker-backend/commit/8b37d4a7a890b9e4880efedd19dc733e60c5e7cf))

V2/serverless.yml

@@ -55,4 +55,24 @@ functions:
           methods:
             - DELETE
           route: activities/{id}
-          authLevel: anonymous
+          authLevel: anonymous
+
+  update_activity:
+    handler: time_entries/interface.update_activity
+    events:
+      - http: true
+        x-azure-settings:
+          methods:
+            - PUT   
+          route: activities/{id}
+          authLevel: anonymous    
+
+  create_activity:
+    handler: time_entries/interface.create_activity
+    events:
+      - http: true
+        x-azure-settings:
+          methods:
+            - POST
+          route: activities/
+          authLevel: anonymous

V2/tests/api/azure/activity_azure_endpoints_test.py

@@ -2,14 +2,17 @@
 import typing
 import json
 import uuid
-
+from faker import Faker
 
 import azure.functions as func
 
 import time_entries._application._activities as azure_activities
 import time_entries._domain as domain 
 import time_entries._infrastructure as infrastructure 
 
+ACTIVITY_URL = '/api/activities/'
+
+
 @pytest.fixture(name='create_fake_database')
 def _create_fake_database() -> domain.ActivitiesDao:
     db_fake = infrastructure.DB('sqlite:///:memory:')
@@ -41,7 +44,7 @@ def test__activity_azure_endpoint__returns_all_activities(
 ):
     database, activity_data = create_fake_database
     azure_activities._get_activities.DATABASE = database
-    req = func.HttpRequest(method='GET', body=None, url='/api/activities')
+    req = func.HttpRequest(method='GET', body=None, url=ACTIVITY_URL)
 
     response = azure_activities._get_activities.get_activities(req)
     activities_json_data = response.get_body().decode("utf-8")
@@ -61,7 +64,7 @@ def test__activity_azure_endpoint__returns_an_activity__when_activity_matches_it
     req = func.HttpRequest(
         method='GET',
         body=None,
-        url='/api/activities/',
+        url=ACTIVITY_URL,
         route_params={"id": str(activity_data[0]['id'])},
     )
 
@@ -82,7 +85,7 @@ def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__whe
     req = func.HttpRequest(
         method='DELETE',
         body=None,
-        url='/api/activities/',
+        url=ACTIVITY_URL,
         route_params={"id": str(activity_data[0]['id'])},
     )
 
@@ -91,3 +94,47 @@ def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__whe
 
     assert response.status_code == 200
     assert activity_json_data['status'] == 'inactive'
+
+
+def test__update_activity_azure_endpoint__returns_an_activity__when_found_an_activity_to_update(
+    create_fake_database,
+):
+    database, activity_data = create_fake_database
+    azure_activities._update_activity.DATABASE = database
+    activity_body = {"description": Faker().sentence()}
+    req = func.HttpRequest(
+        method='PUT',
+        body=json.dumps(activity_body).encode("utf-8"),
+        url=ACTIVITY_URL,
+        route_params={"id": str(activity_data[0]['id'])},
+    )
+
+    activity_data[0]["id"] = activity_data[0]["id"].hex
+
+    response = azure_activities._update_activity.update_activity(req)
+    activitiy_json_data = response.get_body().decode("utf-8")
+    new_activity = {**activity_data[0], **activity_body}
+
+    assert response.status_code == 200
+    assert activitiy_json_data == json.dumps(new_activity)
+
+def test__activity_azure_endpoint__creates_an_activity__when_activity_has_all_attributes(
+     create_fake_database,
+ ):
+     database, activity_data = create_fake_database
+     azure_activities._update_activity.DATABASE = database
+
+     activity_body = {'id': None, 'name': Faker().user_name(), 'description': Faker().sentence(),'deleted': Faker().uuid4() ,'status': 'active', 'tenant_id': Faker().uuid4()}
+     body = json.dumps(activity_body).encode("utf-8")
+     req = func.HttpRequest(
+         method='POST',
+         body= body,
+         url=ACTIVITY_URL,
+     )
+     
+
+     response = azure_activities._create_activity.create_activity(req)
+     activitiy_json_data = json.loads(response.get_body())
+     activity_body['id'] = activitiy_json_data['id']
+     assert response.status_code == 201
+     assert activitiy_json_data ==  activity_body

V2/tests/integration/daos/activities_json_dao_test.py

@@ -6,6 +6,18 @@
 import typing
 
 
+fake_activities = [
+    {
+        'id': Faker().uuid4(),
+        'name': Faker().user_name(),
+        'description': Faker().sentence(),
+        'deleted': Faker().uuid4(),
+        'status': 'active',
+        'tenant_id': Faker().uuid4(),
+    }
+]
+
+
 @pytest.fixture(name='create_fake_activities')
 def _create_fake_activities(mocker) -> typing.List[Activity]:
     def _creator(activities):
@@ -20,18 +32,7 @@ def test_get_by_id__returns_an_activity_dto__when_found_one_activity_that_matche
     create_fake_activities,
 ):
     activities_json_dao = ActivitiesJsonDao(Faker().file_path())
-    activities = create_fake_activities(
-        [
-            {
-                "name": "test_name",
-                "description": "test_description",
-                "tenant_id": "test_tenant_id",
-                "id": "test_id",
-                "deleted": "test_deleted",
-                "status": "test_status",
-            }
-        ]
-    )
+    activities = create_fake_activities(fake_activities)
     activity_dto = activities.pop()
 
     result = activities_json_dao.get_by_id(activity_dto.id)
@@ -55,19 +56,7 @@ def test__get_all__returns_a_list_of_activity_dto_objects__when_one_or_more_acti
 ):
     activities_json_dao = ActivitiesJsonDao(Faker().file_path())
     number_of_activities = 3
-    activities = create_fake_activities(
-        [
-            {
-                "name": "test_name",
-                "description": "test_description",
-                "tenant_id": "test_tenant_id",
-                "id": "test_id",
-                "deleted": "test_deleted",
-                "status": "test_status",
-            }
-        ]
-        * number_of_activities
-    )
+    activities = create_fake_activities(fake_activities * number_of_activities)
 
     result = activities_json_dao.get_all()
 
@@ -117,3 +106,44 @@ def test_delete__returns_none__when_no_activity_matching_its_id_is_found(
     result = activities_json_dao.delete(Faker().uuid4())
 
     assert result is None
+
+
+def test_update__returns_an_activity_dto__when_found_one_activity_to_update(
+    create_fake_activities,
+):
+    activities_json_dao = ActivitiesJsonDao(Faker().file_path())
+    activities = create_fake_activities(fake_activities)
+    activity_dto = activities.pop()
+    activity_data = {"description": Faker().sentence()}
+
+    result = activities_json_dao.update(activity_dto.id, activity_data)
+    new_activity = {**activity_dto.__dict__, **activity_data}
+
+    assert result == Activity(**new_activity)
+
+
+def test_update__returns_none__when_doesnt_found_one_activity_to_update(
+    create_fake_activities,
+):
+    activities_json_dao = ActivitiesJsonDao(Faker().file_path())
+    create_fake_activities([])
+    activity_data = {"description": Faker().sentence()}
+
+    result = activities_json_dao.update('', activity_data)
+
+    assert result == None
+
+def test_create_activity__returns_an_activity_dto__when_create_an_activity_that_matches_attributes(create_fake_activities):
+     create_fake_activities([])
+
+     activities_json_dao = ActivitiesJsonDao(Faker().file_path())
+     activity_data = {
+         "name": "test_name",
+         "description": "test_description",
+         "tenant_id": "test_tenant_id",
+         "id": "test_id",
+         "deleted": "test_deleted",
+         "status": "test_status",
+     }
+     result = activities_json_dao.create_activity(activity_data)
+     assert result == Activity(**activity_data)

V2/tests/unit/services/activity_service_test.py

@@ -41,3 +41,32 @@ def test__delete_activity__uses_the_activity_dao__to_change_activity_status(
 
     assert activity_dao.delete.called
     assert expected_activity == deleted_activity
+
+
+def test__update_activity__uses_the_activity_dao__to_update_one_activity(
+    mocker,
+):
+    expected_activity = mocker.Mock()
+    activity_dao = mocker.Mock(
+        update=mocker.Mock(return_value=expected_activity)
+    )
+    activity_service = ActivityService(activity_dao)
+
+    updated_activity = activity_service.update(
+        Faker().uuid4(), Faker().pydict()
+    )
+
+    assert activity_dao.update.called
+    assert expected_activity == updated_activity
+
+def test__create_activity__uses_the_activity_dao__to_create_an_activity(mocker):
+    expected_activity = mocker.Mock()
+    activity_dao = mocker.Mock(
+        create_activity=mocker.Mock(return_value=expected_activity)
+    )
+    activity_service = ActivityService(activity_dao)
+
+    actual_activity = activity_service.create_activity(Faker().pydict())
+
+    assert activity_dao.create_activity.called
+    assert expected_activity == actual_activity

V2/tests/unit/use_cases/activities_use_case_test.py

@@ -36,6 +36,20 @@ def test__get_activity_by_id_function__uses_the_activity_service__to_retrieve_ac
     assert expected_activity == actual_activity
 
 
+def test__create_activity_function__uses_the_activities_service__to_create_activity(
+     mocker: MockFixture,
+ ):
+     expected_activity = mocker.Mock()
+     activity_service = mocker.Mock(
+         create_activity=mocker.Mock(return_value=expected_activity)
+     )
+
+     activity_use_case = _use_cases.CreateActivityUseCase(activity_service)
+     actual_activity = activity_use_case.create_activity(fake.pydict())
+
+     assert activity_service.create_activity.called
+     assert expected_activity == actual_activity
+
 def test__delete_activity_function__uses_the_activity_service__to_change_activity_status(
     mocker: MockFixture,
 ):
@@ -49,3 +63,19 @@ def test__delete_activity_function__uses_the_activity_service__to_change_activit
 
     assert activity_service.delete.called
     assert expected_activity == deleted_activity
+
+def test__update_activity_function__uses_the_activities_service__to_update_an_activity(
+    mocker: MockFixture,
+):
+    expected_activity = mocker.Mock()
+    activity_service = mocker.Mock(
+        update=mocker.Mock(return_value=expected_activity)
+    )
+
+    activity_use_case = _use_cases.UpdateActivityUseCase(activity_service)
+    updated_activity = activity_use_case.update_activity(
+        fake.uuid4(), fake.pydict()
+    )
+
+    assert activity_service.update.called
+    assert expected_activity == updated_activity

V2/time_entries/_application/__init__.py

@@ -1,2 +1,4 @@
 from ._activities import get_activities
 from ._activities import delete_activity
+from ._activities import update_activity
+from ._activities import create_activity

V2/time_entries/_application/_activities/__init__.py

@@ -1,2 +1,4 @@
 from ._get_activities import get_activities
 from ._delete_activity import delete_activity
+from ._update_activity import update_activity
+from ._create_activity import create_activity