feat: TT-403 tests added

Author: mandres2015

V2/create_activity/function.json

@@ -1,24 +1,12 @@
-import pytest
 import json
 from faker import Faker
 
 import azure.functions as func
 
 import time_tracker.activities._application._activities as azure_activities
-import time_tracker.activities._infrastructure as infrastructure
-from time_tracker._infrastructure import DB
-from time_tracker.activities import _domain
-
-ACTIVITY_URL = '/api/activities/'
 
 
-@pytest.fixture(name='insert_activity')
-def _insert_activity() -> dict:
-    def _new_activity(activity: _domain.Activity, database: DB):
-        dao = infrastructure.ActivitiesSQLDao(database)
-        new_activity = dao.create(activity)
-        return new_activity.__dict__
-    return _new_activity
+ACTIVITY_URL = '/api/activities/'
 
 
 def test__activity_azure_endpoint__returns_all_activities(
@@ -27,8 +15,8 @@ def test__activity_azure_endpoint__returns_all_activities(
     fake_database = create_fake_database
     existent_activities = [activity_factory(), activity_factory()]
     inserted_activities = [
-        insert_activity(existent_activities[0], fake_database),
-        insert_activity(existent_activities[1], fake_database)
+        insert_activity(existent_activities[0], fake_database).__dict__,
+        insert_activity(existent_activities[1], fake_database).__dict__
     ]
 
     azure_activities._get_activities.DATABASE = fake_database
@@ -45,7 +33,7 @@ def test__activity_azure_endpoint__returns_an_activity__when_activity_matches_it
 ):
     fake_database = create_fake_database
     existent_activity = activity_factory()
-    inserted_activity = insert_activity(existent_activity, fake_database)
+    inserted_activity = insert_activity(existent_activity, fake_database).__dict__
 
     azure_activities._get_activities.DATABASE = fake_database
     req = func.HttpRequest(
@@ -67,7 +55,7 @@ def test__activity_azure_endpoint__returns_an_activity_with_inactive_status__whe
 ):
     fake_database = create_fake_database
     existent_activity = activity_factory()
-    inserted_activity = insert_activity(existent_activity, fake_database)
+    inserted_activity = insert_activity(existent_activity, fake_database).__dict__
 
     azure_activities._delete_activity.DATABASE = fake_database
     req = func.HttpRequest(
@@ -90,7 +78,7 @@ def test__update_activity_azure_endpoint__returns_an_activity__when_found_an_act
 ):
     fake_database = create_fake_database
     existent_activity = activity_factory()
-    inserted_activity = insert_activity(existent_activity, fake_database)
+    inserted_activity = insert_activity(existent_activity, fake_database).__dict__
 
     azure_activities._update_activity.DATABASE = fake_database
     activity_body = {"description": Faker().sentence()}

V2/delete_activity/function.json

@@ -1,44 +1,63 @@
-from time_tracker.time_entries._application import _time_entries as time_entries
+import pytest
+import json
 
 import azure.functions as func
-import json
+
+import time_tracker.time_entries._application._time_entries as azure_time_entries
+from time_tracker._infrastructure import DB
+from time_tracker.time_entries import _domain as domain_time_entries
+from time_tracker.time_entries import _infrastructure as infrastructure_time_entries
 
 
 TIME_ENTRY_URL = "/api/time-entries/"
 
 
+@pytest.fixture(name='insert_time_entry')
+def _insert_time_entry() -> domain_time_entries.TimeEntry:
+    def _new_time_entry(time_entry: domain_time_entries.TimeEntry, database: DB):
+        dao = infrastructure_time_entries.TimeEntriesSQLDao(database)
+        new_time_entry = dao.create(time_entry)
+        return new_time_entry
+    return _new_time_entry
+
+
 def test__delete_time_entries_azure_endpoint__returns_an_time_entry_with_true_deleted__when_its_id_is_found(
-    create_temp_time_entries,
+    create_fake_database, time_entry_factory, insert_time_entry, insert_activity, activity_factory,
 ):
-    time_entries_json, tmp_directory = create_temp_time_entries
-    time_entries.delete_time_entry.JSON_PATH = tmp_directory
+    db = create_fake_database
+    azure_time_entries._delete_time_entry.DATABASE = db
+    inserted_activity = insert_activity(activity_factory(), db).__dict__
+    time_entry_body = time_entry_factory(activity_id=inserted_activity["id"], technologies="[jira,sql]")
+    inserted_time_entry = insert_time_entry(time_entry_body, db)
+
     req = func.HttpRequest(
-        method="DELETE",
+        method='DELETE',
         body=None,
         url=TIME_ENTRY_URL,
-        route_params={"id": time_entries_json[0]["id"]},
+        route_params={"id": inserted_time_entry.id},
     )
 
-    response = time_entries.delete_time_entry(req)
+    response = azure_time_entries._delete_time_entry.delete_time_entry(req)
     time_entry_json_data = json.loads(response.get_body().decode("utf-8"))
 
     assert response.status_code == 200
-    assert time_entry_json_data["deleted"] is True
+    assert time_entry_json_data['deleted'] is True
 
 
 def test__delete_time_entries_azure_endpoint__returns_a_status_code_400__when_time_entry_recive_invalid_id(
-    create_temp_time_entries,
+    create_fake_database,
 ):
-    tmp_directory = create_temp_time_entries
-    time_entries.delete_time_entry.JSON_PATH = tmp_directory
+    db = create_fake_database
+    azure_time_entries._delete_time_entry.DATABASE = db
+
     req = func.HttpRequest(
         method="DELETE",
         body=None,
         url=TIME_ENTRY_URL,
         route_params={"id": "invalid id"},
     )
 
-    response = time_entries.delete_time_entry(req)
+    response = azure_time_entries._delete_time_entry.delete_time_entry(req)
 
     assert response.status_code == 400
     assert response.get_body() == b'Invalid Format ID'

V2/delete_time_entry/function.json

@@ -1,8 +1,3 @@
 # flake8: noqa
-<<<<<<< HEAD
-from fixtures import _activity_factory, _create_fake_dao, _create_fake_database
-=======
-from fixtures import create_temp_activities
-from fixtures import create_temp_time_entries
-from fixtures import _time_entry_factory
->>>>>>> 42cfc46... feat: TT-401 validated request create time entry
+from fixtures import _activity_factory, _create_fake_database, _insert_activity
+from fixtures import _time_entry_factory