Revert "fix: TT-270 Fix handle exceptions in create update entries (#…

tests/conftest.py

@@ -1,6 +1,5 @@
 import copy
 from datetime import datetime, timedelta
-from http import HTTPStatus
 
 import jwt
 import pytest
@@ -218,22 +217,13 @@ def time_entries_dao():
     return time_entries_dao
 
 
-@pytest.fixture
+@pytest.fixture(scope="module")
 def running_time_entry(
     time_entry_repository: TimeEntryCosmosDBRepository,
     owner_id: str,
     tenant_id: str,
     event_context: EventContext,
-    mocker,
 ):
-    mocker.patch(
-        'time_tracker_api.time_entries.time_entries_repository.are_related_entry_entities_valid',
-        return_value={
-            "is_valid": True,
-            "status_code": HTTPStatus.OK,
-            "message": "Related entry entities valid",
-        },
-    )
     current_time_entry_repository = copy.copy(time_entry_repository)
     created_time_entry = current_time_entry_repository.create(
         {

tests/time_tracker_api/time_entries/time_entries_model_test.py

@@ -1,10 +1,11 @@
-from http import HTTPStatus
 from unittest.mock import Mock, patch
 import pytest
 from faker import Faker
 
-from commons.data_access_layer.cosmos_db import CustomError
 from commons.data_access_layer.database import EventContext
+from time_tracker_api.time_entries.time_entries_model import (
+    TimeEntryCosmosDBModel,
+)
 from time_tracker_api.time_entries.time_entries_repository import (
     TimeEntryCosmosDBRepository,
     TimeEntryCosmosDBModel,
@@ -16,7 +17,6 @@ def create_time_entry(
     end_date: str,
     owner_id: str,
     tenant_id: str,
-    mocker,
     event_context: EventContext,
     time_entry_repository: TimeEntryCosmosDBRepository,
 ) -> TimeEntryCosmosDBModel:
@@ -30,15 +30,6 @@ def create_time_entry(
         "tenant_id": tenant_id,
     }
 
-    mocker.patch(
-        'time_tracker_api.time_entries.time_entries_repository.are_related_entry_entities_valid',
-        return_value={
-            "is_valid": True,
-            "status_code": HTTPStatus.OK,
-            "message": "Related entry entities valid",
-        },
-    )
-
     created_item = time_entry_repository.create(
         data, event_context, mapper=TimeEntryCosmosDBModel
     )
@@ -87,7 +78,6 @@ def test_find_interception_with_date_range_should_find(
     end_date_: str,
     owner_id: str,
     tenant_id: str,
-    mocker,
     time_entry_repository: TimeEntryCosmosDBRepository,
     event_context: EventContext,
 ):
@@ -96,7 +86,6 @@ def test_find_interception_with_date_range_should_find(
         end_date,
         owner_id,
         tenant_id,
-        mocker,
         event_context,
         time_entry_repository,
     )
@@ -153,14 +142,12 @@ def test_find_interception_with_date_range_should_not_find(
     tenant_id: str,
     time_entry_repository: TimeEntryCosmosDBRepository,
     event_context: EventContext,
-    mocker,
 ):
     existing_item = create_time_entry(
         start_date,
         end_date,
         owner_id,
         tenant_id,
-        mocker,
         event_context,
         time_entry_repository,
     )
@@ -184,17 +171,14 @@ def test_find_interception_should_ignore_id_of_existing_item(
     tenant_id: str,
     time_entry_repository: TimeEntryCosmosDBRepository,
     event_context: EventContext,
-    mocker,
 ):
     start_date = "2020-10-01T05:00:00.000Z"
     end_date = "2020-10-01T10:00:00.000Z"
-
     existing_item = create_time_entry(
         start_date,
         end_date,
         owner_id,
         tenant_id,
-        mocker,
         event_context,
         time_entry_repository,
     )
@@ -245,10 +229,10 @@ def test_find_running_should_not_find_any_item(
     owner_id: str,
     time_entry_repository: TimeEntryCosmosDBRepository,
 ):
-    with pytest.raises(CustomError) as custom_error:
+    try:
         time_entry_repository.find_running(tenant_id, owner_id)
-
-    assert custom_error.value.code == HTTPStatus.NO_CONTENT
+    except Exception as e:
+        assert type(e) is StopIteration
 
 
 @patch(

tests/time_tracker_api/time_entries/time_entries_namespace_test.py

@@ -749,15 +749,6 @@ def test_create_with_valid_uuid_format_should_return_created(
     valid_uuid: str,
     time_entries_dao,
 ):
-    mocker.patch(
-        'time_tracker_api.time_entries.time_entries_repository.are_related_entry_entities_valid',
-        return_value={
-            "is_valid": True,
-            "status_code": HTTPStatus.OK,
-            "message": "Related entry entities valid",
-        },
-    )
-
     repository_container_create_item_mock = mocker.patch.object(
         time_entries_dao.repository.container,
         'create_item',

time_tracker_api/time_entries/time_entries_namespace.py

@@ -37,7 +37,7 @@
         ),
         'activity_id': UUID(
             title='Activity',
-            required=True,
+            required=False,
             description='The id of the selected activity',
             example=faker.uuid4(),
         ),

time_tracker_api/time_entries/time_entries_repository.py

@@ -30,7 +30,6 @@
 )
 from utils.query_builder import CosmosDBQueryBuilder, Order
 from utils.time import str_to_datetime
-from utils.validate_entries import are_related_entry_entities_valid
 
 
 class TimeEntryCosmosDBRepository(CosmosDBRepository):
@@ -304,21 +303,6 @@ def find_running(
     def validate_data(self, data, event_context: EventContext):
         start_date = data.get('start_date')
 
-        related_project_id = data.get('project_id')
-        related_activity_id = data.get('activity_id')
-
-        are_related_entities_valid = are_related_entry_entities_valid(
-            project_id=related_project_id, activity_id=related_activity_id
-        )
-
-        if not are_related_entities_valid.get('is_valid'):
-            status_code = are_related_entities_valid.get('status_code')
-            message = are_related_entities_valid.get('message')
-            raise CustomError(
-                status_code,
-                description=message,
-            )
-
         if data.get('end_date') is not None:
             if data['end_date'] <= start_date:
                 raise CustomError(