Skip to content

Commit 2759f0b

Browse files
author
EliuX
committed
fix: Close #102 Tweak config of trigger handlers
1 parent e2d7eb1 commit 2759f0b

File tree

18 files changed

+138
-13
lines changed

18 files changed

+138
-13
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ swagger.json
3333

3434
# Local migration files
3535
migration_status.csv
36+
37+
# Mac
38+
.DS_Store

commons/data_access_layer/events_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
container_definition = {
44
'id': 'event',
55
'partition_key': PartitionKey(path='/tenant_id')
6-
}
6+
}

commons/data_access_layer/sql.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
from datetime import datetime
2-
31
from flask import Flask
42
from flask_sqlalchemy import SQLAlchemy
53

6-
from commons.data_access_layer.database import CRUDDao, ID_MAX_LENGTH
4+
from commons.data_access_layer.database import CRUDDao
75

86
db: SQLAlchemy = None
97

commons/git_hooks/enforce_semantic_commit_msg.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515

1616
COMMIT_MSG_REGEX = r'(build|ci|docs|feat|fix|perf|refactor|style|test|chore|revert)(\([\w\-]+\))?:\s.*'
1717

18-
1918
# Get the commit message file
2019
commit_msg_file = open(sys.argv[1]) # The first argument is the file
2120
commit_msg = commit_msg_file.read()
2221

23-
2422
if re.match(COMMIT_MSG_REGEX, commit_msg) is None:
2523
print(ERROR_MSG)
2624
sys.exit(1)

setup.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
from setuptools import setup, find_packages
21
import sys
32

3+
from setuptools import setup, find_packages
4+
45

56
def get_version() -> str:
67
version = {}

tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
from flask.testing import FlaskClient
88

99
from commons.data_access_layer.cosmos_db import CosmosDBRepository, CosmosDBDao
10-
from time_tracker_api.database import init_sql
1110
from commons.data_access_layer.database import EventContext
1211
from time_tracker_api import create_app
12+
from time_tracker_api.database import init_sql
1313
from time_tracker_api.security import get_or_generate_dev_secret_key
1414
from time_tracker_api.time_entries.time_entries_model import TimeEntryCosmosDBRepository
1515

tests/time_tracker_api/time_entries/time_entries_namespace_test.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from pytest_mock import MockFixture, pytest
99

1010
from commons.data_access_layer.cosmos_db import current_datetime, current_datetime_str
11+
from time_tracker_api.time_entries.time_entries_model import TimeEntriesCosmosDBDao
1112

1213
fake = Faker()
1314

@@ -289,8 +290,8 @@ def test_stop_time_entry_with_valid_id(client: FlaskClient, mocker: MockFixture,
289290
follow_redirects=True)
290291

291292
assert HTTPStatus.OK == response.status_code
292-
repository_update_mock.assert_called_once_with(str(valid_id), {"end_date": mocker.ANY},
293-
ANY, peeker=ANY)
293+
repository_update_mock.assert_called_once_with(str(valid_id), {"end_date": mocker.ANY}, ANY,
294+
peeker=TimeEntriesCosmosDBDao.checks_owner_and_is_not_stopped)
294295

295296

296297
def test_stop_time_entry_with_id_with_invalid_format(client: FlaskClient,
@@ -308,8 +309,8 @@ def test_stop_time_entry_with_id_with_invalid_format(client: FlaskClient,
308309
follow_redirects=True)
309310

310311
assert HTTPStatus.UNPROCESSABLE_ENTITY == response.status_code
311-
repository_update_mock.assert_called_once_with(invalid_id, {"end_date": ANY},
312-
ANY, peeker=ANY)
312+
repository_update_mock.assert_called_once_with(invalid_id, {"end_date": ANY}, ANY,
313+
peeker=TimeEntriesCosmosDBDao.checks_owner_and_is_not_stopped)
313314

314315

315316
def test_restart_time_entry_with_valid_id(client: FlaskClient,
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from ..handle_events_trigger import main as handler
2+
3+
main = handler

time_tracker_events/handle_events_trigger/function.json renamed to time_tracker_events/handle_activity_events_trigger/function.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"connectionStringSetting": "COSMOS_DATABASE_URI",
1010
"databaseName": "time-tracker-db",
1111
"collectionName": "activity",
12-
"createLeaseCollectionIfNotExists": "true"
12+
"createLeaseCollectionIfNotExists": "true",
13+
"leaseCollectionPrefix": "activity_"
1314
},
1415
{
1516
"direction": "out",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from ..handle_events_trigger import main as handler
2+
3+
main = handler

0 commit comments

Comments
 (0)