feat: add test find_all is called with generated dates

Author: Angeluz-07

commons/data_access_layer/cosmos_db.py

@@ -2,7 +2,7 @@
 import logging
 import uuid
 from datetime import datetime
-from typing import Callable, List
+from typing import Callable, List, Tuple
 
 import azure.cosmos.cosmos_client as cosmos_client
 import azure.cosmos.exceptions as exceptions
@@ -292,3 +292,36 @@ def generate_uuid4() -> str:
 def init_app(app: Flask) -> None:
     global cosmos_helper
     cosmos_helper = CosmosDBFacade.from_flask_config(app)
+
+
+def get_last_day_of_month(year: int, month: int) -> int:
+    from calendar import monthrange
+    return monthrange(year=year, month=month)[1]
+
+
+def get_current_year() -> int:
+    return datetime.now().year
+
+
+def get_current_month() -> int:
+    return datetime.now().month
+
+
+def get_date_range_of_month(
+    year: int,
+    month: int
+) -> Tuple[datetime, datetime]:
+    first_day_of_month = 1
+    start_date = datetime(year=year, month=month, day=first_day_of_month)
+
+    last_day_of_month = get_last_day_of_month(year=year, month=month)
+    end_date = datetime(
+        year=year,
+        month=month,
+        day=last_day_of_month,
+        hour=23,
+        minute=59,
+        second=59,
+        microsecond=999999
+    )
+    return start_date, end_date

tests/time_tracker_api/time_entries/time_entries_namespace_test.py

@@ -7,7 +7,9 @@
 from flask_restplus._http import HTTPStatus
 from pytest_mock import MockFixture, pytest
 
-from commons.data_access_layer.cosmos_db import current_datetime, current_datetime_str
+from commons.data_access_layer.cosmos_db import current_datetime, \
+    current_datetime_str, get_date_range_of_month, get_current_month, \
+    get_current_year, datetime_str
 
 fake = Faker()
 
@@ -470,3 +472,44 @@ def test_create_with_valid_uuid_format_should_return_created(client: FlaskClient
     assert HTTPStatus.CREATED == response.status_code
     repository_container_create_item_mock.assert_called()
 
+
+@pytest.mark.parametrize(
+    'url,month,year',
+    [
+        ('/time-entries?month=4&year=2020', 4, 2020),
+        ('/time-entries?month=4', 4, get_current_year()),
+        ('/time-entries', get_current_month(), get_current_year())
+    ]
+)
+def test_find_all_is_called_with_generated_dates(client: FlaskClient,
+                                              mocker: MockFixture,
+                                              valid_header: dict,
+                                              tenant_id: str,
+                                              owner_id: str,
+                                              url: str,
+                                              month: int,
+                                              year: int):
+    from time_tracker_api.time_entries.time_entries_namespace import time_entries_dao
+    repository_find_all_mock = mocker.patch.object(time_entries_dao.repository,
+                                                   'find_all',
+                                                   return_value=fake_time_entry)
+
+    response = client.get(url,
+                          headers=valid_header,
+                          follow_redirects=True)
+
+    start_date, end_date = get_date_range_of_month(year, month)
+    custom_args = {
+        'start_date': datetime_str(start_date),
+        'end_date': datetime_str(end_date)
+    }
+
+    conditions = {
+        'owner_id': owner_id
+    }
+
+    assert HTTPStatus.OK == response.status_code
+    assert json.loads(response.data) is not None
+    repository_find_all_mock.assert_called_once_with(partition_key_value=tenant_id,
+                                                   conditions=conditions,
+                                                   custom_args=custom_args)

time_tracker_api/time_entries/time_entries_model.py

@@ -1,13 +1,12 @@
 import abc
 from dataclasses import dataclass, field
-from typing import List, Callable, Tuple
-from datetime import datetime
+from typing import List, Callable
 
 from azure.cosmos import PartitionKey
 from flask_restplus._http import HTTPStatus
 
 from commons.data_access_layer.cosmos_db import CosmosDBDao, CosmosDBRepository, CustomError, current_datetime_str, \
-    CosmosDBModel
+    CosmosDBModel, get_date_range_of_month, get_current_year, get_current_month
 from commons.data_access_layer.database import CRUDDao
 from time_tracker_api.security import current_user_id
 
@@ -187,31 +186,6 @@ def validate_data(self, data):
                               description="There is another time entry in that date range")
 
 
-def get_last_day_of_month(year: int, month: int) -> int:
-    from calendar import monthrange
-    return monthrange(year=year, month=month)[1]
-
-
-def get_current_year() -> int:
-    return datetime.now().year
-
-
-def get_current_month() -> int:
-    return datetime.now().month
-
-
-def get_date_range_of_month(
-    year: int,
-    month: int
-) -> Tuple[datetime, datetime]:
-    first_day_of_month = 1
-    start_date = datetime(year=year, month=month, day=first_day_of_month)
-
-    # TODO : fix bound as this would exclude the last day
-    last_day_of_month = get_last_day_of_month(year=year, month=month)
-    end_date = datetime(year=year, month=month, day=last_day_of_month)
-    return start_date, end_date
-
 
 class TimeEntriesCosmosDBDao(TimeEntriesDao, CosmosDBDao):
     def __init__(self, repository):