feat: #215 change namespaces file ERROR

Author: PaulRC-ioet

tests/conftest.py

@@ -187,7 +187,7 @@ def time_entry_repository(app: Flask) -> TimeEntryCosmosDBRepository:
 
 @pytest.fixture
 def time_entries_dao():
-    from time_tracker_api.time_entries.time_entries_namespace import (
+    from time_tracker_api.time_entries.time_entries_namespace.base import (
         time_entries_dao,
     )
 

tests/time_tracker_api/smoke_test.py

@@ -1,26 +1,33 @@
 import pytest
-from azure.cosmos.exceptions import CosmosHttpResponseError, CosmosResourceExistsError, CosmosResourceNotFoundError
+from azure.cosmos.exceptions import (
+    CosmosHttpResponseError,
+    CosmosResourceExistsError,
+    CosmosResourceNotFoundError,
+)
 from flask.testing import FlaskClient
 from flask_restplus._http import HTTPStatus
 from pytest_mock import MockFixture
 
 from commons.data_access_layer.cosmos_db import CustomError
 
-unexpected_errors_to_be_handled = [CustomError(HTTPStatus.BAD_REQUEST, "Anything"),
-                                   CosmosHttpResponseError, CosmosResourceNotFoundError,
-                                   CosmosResourceExistsError, AttributeError]
+unexpected_errors_to_be_handled = [
+    CustomError(HTTPStatus.BAD_REQUEST, "Anything"),
+    CosmosHttpResponseError,
+    CosmosResourceNotFoundError,
+    CosmosResourceExistsError,
+    AttributeError,
+]
 
 
 def test_app_exists(app):
     assert app is not None
 
 
 @pytest.mark.parametrize("error_type", unexpected_errors_to_be_handled)
-def test_exceptions_are_handled(error_type, client: FlaskClient, mocker: MockFixture):
-    from time_tracker_api.time_entries.time_entries_namespace import time_entries_dao
-    mocker.patch.object(time_entries_dao,
-                        "get_all",
-                        side_effect=error_type)
+def test_exceptions_are_handled(
+    error_type, client: FlaskClient, mocker: MockFixture, time_entries_dao
+):
+    mocker.patch.object(time_entries_dao, "get_all", side_effect=error_type)
 
     response = client.get('/time-entries', follow_redirects=True)
 

time_tracker_api/api.py

@@ -102,9 +102,9 @@ def init_app(app: Flask):
 
     api.add_namespace(activities_namespace.ns)
 
-    from time_tracker_api.time_entries import time_entries_namespace
+    from time_tracker_api.time_entries.time_entries_namespace import base
 
-    api.add_namespace(time_entries_namespace.ns)
+    api.add_namespace(base.ns)
 
     from time_tracker_api.project_types import project_types_namespace
 

time_tracker_api/time_entries/_time_entries_namespace.py

@@ -0,0 +1,19 @@
+from datetime import timedelta
+from random import choice
+
+from faker import Faker
+from flask_restplus import fields, Resource
+from flask_restplus._http import HTTPStatus
+
+from utils.time import datetime_str, current_datetime, current_datetime_str
+
+from commons.data_access_layer.database import COMMENTS_MAX_LENGTH
+from time_tracker_api.api import (
+    common_fields,
+    create_attributes_filter,
+    api,
+    UUID,
+    NullableString,
+    remove_required_constraint,
+)
+from time_tracker_api.time_entries.time_entries_dao import create_dao

time_tracker_api/time_entries/time_entries_dao.py

@@ -1,14 +1,14 @@
 import abc
 from commons.data_access_layer.cosmos_db import (
     CosmosDBDao,
-    # CosmosDBRepository,
+    CosmosDBRepository,
     CustomError,
-    # CosmosDBModel,
+    CosmosDBModel,
 )
 from utils.extend_model import (
     add_project_info_to_time_entries,
     add_activity_name_to_time_entries,
-    # create_in_condition,
+    create_in_condition,
     create_custom_query_from_str,
     add_user_email_to_time_entries,
 )
@@ -20,17 +20,20 @@
     get_date_range_of_month,
     current_datetime_str,
 )
+from utils.azure_users import AzureConnection
 from flask_restplus import abort
 from flask_restplus._http import HTTPStatus
 from time_tracker_api.activities import activities_model
-
+from commons.data_access_layer.database import EventContext
 from time_tracker_api.projects import projects_model
 from utils import worked_time
 from datetime import timedelta
+from time_tracker_api.projects.projects_model import ProjectCosmosDBModel
 from time_tracker_api.time_entries.time_entries_repository import (
     TimeEntryCosmosDBRepository,
 )
 from time_tracker_api.database import CRUDDao, APICosmosDBDao
+from time_tracker_api.security import current_user_id
 
 
 class TimeEntriesDao(CRUDDao):