fix: Close #102 Tweak config of trigger handlers

ioet · EliuX · Apr 30, 2020 · Apr 29, 2020 · Apr 29, 2020 · Apr 30, 2020
commit 2759f0b425140dd22081596c059f2bc732b11c89
diff --git a/.gitignore b/.gitignore
@@ -33,3 +33,6 @@ swagger.json
 
 # Local migration files
 migration_status.csv
+
+# Mac
+.DS_Store
diff --git a/commons/data_access_layer/events_model.py b/commons/data_access_layer/events_model.py
@@ -3,4 +3,4 @@
 container_definition = {
     'id': 'event',
     'partition_key': PartitionKey(path='/tenant_id')
-}
+}
diff --git a/commons/data_access_layer/sql.py b/commons/data_access_layer/sql.py
@@ -1,9 +1,7 @@
-from datetime import datetime
-
 from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 
-from commons.data_access_layer.database import CRUDDao, ID_MAX_LENGTH
+from commons.data_access_layer.database import CRUDDao
 
 db: SQLAlchemy = None
 

diff --git a/commons/git_hooks/enforce_semantic_commit_msg.py b/commons/git_hooks/enforce_semantic_commit_msg.py
@@ -15,12 +15,10 @@
 
 COMMIT_MSG_REGEX = r'(build|ci|docs|feat|fix|perf|refactor|style|test|chore|revert)(\([\w\-]+\))?:\s.*'
 
-
 # Get the commit message file
 commit_msg_file = open(sys.argv[1])  # The first argument is the file
 commit_msg = commit_msg_file.read()
 
-
 if re.match(COMMIT_MSG_REGEX, commit_msg) is None:
     print(ERROR_MSG)
     sys.exit(1)

diff --git a/setup.py b/setup.py
@@ -1,6 +1,7 @@
-from setuptools import setup, find_packages
 import sys
 
+from setuptools import setup, find_packages
+
 
 def get_version() -> str:
     version = {}

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -7,9 +7,9 @@
 from flask.testing import FlaskClient
 
 from commons.data_access_layer.cosmos_db import CosmosDBRepository, CosmosDBDao
-from time_tracker_api.database import init_sql
 from commons.data_access_layer.database import EventContext
 from time_tracker_api import create_app
+from time_tracker_api.database import init_sql
 from time_tracker_api.security import get_or_generate_dev_secret_key
 from time_tracker_api.time_entries.time_entries_model import TimeEntryCosmosDBRepository
 

diff --git a/tests/time_tracker_api/time_entries/time_entries_namespace_test.py b/tests/time_tracker_api/time_entries/time_entries_namespace_test.py
@@ -8,6 +8,7 @@
 from pytest_mock import MockFixture, pytest
 
 from commons.data_access_layer.cosmos_db import current_datetime, current_datetime_str
+from time_tracker_api.time_entries.time_entries_model import TimeEntriesCosmosDBDao
 
 fake = Faker()
 
@@ -289,8 +290,8 @@ def test_stop_time_entry_with_valid_id(client: FlaskClient, mocker: MockFixture,
                            follow_redirects=True)
 
     assert HTTPStatus.OK == response.status_code
-    repository_update_mock.assert_called_once_with(str(valid_id), {"end_date": mocker.ANY},
-                                                   ANY, peeker=ANY)
+    repository_update_mock.assert_called_once_with(str(valid_id), {"end_date": mocker.ANY}, ANY,
+                                                   peeker=TimeEntriesCosmosDBDao.checks_owner_and_is_not_stopped)
 
 
 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,
                            follow_redirects=True)
 
     assert HTTPStatus.UNPROCESSABLE_ENTITY == response.status_code
-    repository_update_mock.assert_called_once_with(invalid_id, {"end_date": ANY},
-                                                   ANY, peeker=ANY)
+    repository_update_mock.assert_called_once_with(invalid_id, {"end_date": ANY}, ANY,
+                                                   peeker=TimeEntriesCosmosDBDao.checks_owner_and_is_not_stopped)
 
 
 def test_restart_time_entry_with_valid_id(client: FlaskClient,

diff --git a/time_tracker_events/handle_activity_events_trigger/__init__.py b/time_tracker_events/handle_activity_events_trigger/__init__.py
@@ -0,0 +1,3 @@
+from ..handle_events_trigger import main as handler
+
+main = handler
diff --git a/...vents/handle_events_trigger/function.json → ...dle_activity_events_trigger/function.json b/...vents/handle_events_trigger/function.json → ...dle_activity_events_trigger/function.json
@@ -9,7 +9,8 @@
       "connectionStringSetting": "COSMOS_DATABASE_URI",
       "databaseName": "time-tracker-db",
       "collectionName": "activity",
-      "createLeaseCollectionIfNotExists": "true"
+      "createLeaseCollectionIfNotExists": "true",
+      "leaseCollectionPrefix": "activity_"
     },
     {
       "direction": "out",

diff --git a/time_tracker_events/handle_customer_trigger/__init__.py b/time_tracker_events/handle_customer_trigger/__init__.py
@@ -0,0 +1,3 @@
+from ..handle_events_trigger import main as handler
+
+main = handler
diff --git a/time_tracker_events/handle_customer_trigger/function.json b/time_tracker_events/handle_customer_trigger/function.json
@@ -0,0 +1,27 @@
+{
+  "scriptFile": "__init__.py",
+  "bindings": [
+    {
+      "type": "cosmosDBTrigger",
+      "name": "documents",
+      "direction": "in",
+      "leaseCollectionName": "leases",
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "databaseName": "time-tracker-db",
+      "collectionName": "customer",
+      "createLeaseCollectionIfNotExists": "true",
+      "leaseCollectionPrefix": "customer_"
+    },
+    {
+      "direction": "out",
+      "type": "cosmosDB",
+      "name": "events",
+      "databaseName": "time-tracker-db",
+      "collectionName": "event",
+      "leaseCollectionName": "leases",
+      "createLeaseCollectionIfNotExists": true,
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "createIfNotExists": true
+    }
+  ]
+}
diff --git a/..._events/handle_events_trigger/__init__.py → time_tracker_events/handle_events_trigger.py b/..._events/handle_events_trigger/__init__.py → time_tracker_events/handle_events_trigger.py
diff --git a/time_tracker_events/handle_project_events_trigger/__init__.py b/time_tracker_events/handle_project_events_trigger/__init__.py
@@ -0,0 +1,3 @@
+from ..handle_events_trigger import main as handler
+
+main = handler
diff --git a/time_tracker_events/handle_project_events_trigger/function.json b/time_tracker_events/handle_project_events_trigger/function.json
@@ -0,0 +1,27 @@
+{
+  "scriptFile": "__init__.py",
+  "bindings": [
+    {
+      "type": "cosmosDBTrigger",
+      "name": "documents",
+      "direction": "in",
+      "leaseCollectionName": "leases",
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "databaseName": "time-tracker-db",
+      "collectionName": "project",
+      "createLeaseCollectionIfNotExists": "true",
+      "leaseCollectionPrefix": "project_"
+    },
+    {
+      "direction": "out",
+      "type": "cosmosDB",
+      "name": "events",
+      "databaseName": "time-tracker-db",
+      "collectionName": "event",
+      "leaseCollectionName": "leases",
+      "createLeaseCollectionIfNotExists": true,
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "createIfNotExists": true
+    }
+  ]
+}
diff --git a/time_tracker_events/handle_project_type_events_trigger/__init__.py b/time_tracker_events/handle_project_type_events_trigger/__init__.py
@@ -0,0 +1,3 @@
+from ..handle_events_trigger import main as handler
+
+main = handler
diff --git a/time_tracker_events/handle_project_type_events_trigger/function.json b/time_tracker_events/handle_project_type_events_trigger/function.json
@@ -0,0 +1,27 @@
+{
+  "scriptFile": "__init__.py",
+  "bindings": [
+    {
+      "type": "cosmosDBTrigger",
+      "name": "documents",
+      "direction": "in",
+      "leaseCollectionName": "leases",
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "databaseName": "time-tracker-db",
+      "collectionName": "project_type",
+      "createLeaseCollectionIfNotExists": "true",
+      "leaseCollectionPrefix": "project_type_"
+    },
+    {
+      "direction": "out",
+      "type": "cosmosDB",
+      "name": "events",
+      "databaseName": "time-tracker-db",
+      "collectionName": "event",
+      "leaseCollectionName": "leases",
+      "createLeaseCollectionIfNotExists": true,
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "createIfNotExists": true
+    }
+  ]
+}
diff --git a/time_tracker_events/handle_time_entry_events_trigger/__init__.py b/time_tracker_events/handle_time_entry_events_trigger/__init__.py
@@ -0,0 +1,3 @@
+from ..handle_events_trigger import main as handler
+
+main = handler
diff --git a/time_tracker_events/handle_time_entry_events_trigger/function.json b/time_tracker_events/handle_time_entry_events_trigger/function.json
@@ -0,0 +1,27 @@
+{
+  "scriptFile": "__init__.py",
+  "bindings": [
+    {
+      "type": "cosmosDBTrigger",
+      "name": "documents",
+      "direction": "in",
+      "leaseCollectionName": "leases",
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "databaseName": "time-tracker-db",
+      "collectionName": "time_entry",
+      "createLeaseCollectionIfNotExists": "true",
+      "leaseCollectionPrefix": "time_entry_"
+    },
+    {
+      "direction": "out",
+      "type": "cosmosDB",
+      "name": "events",
+      "databaseName": "time-tracker-db",
+      "collectionName": "event",
+      "leaseCollectionName": "leases",
+      "createLeaseCollectionIfNotExists": true,
+      "connectionStringSetting": "COSMOS_DATABASE_URI",
+      "createIfNotExists": true
+    }
+  ]
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from ..handle_events_trigger import main as handler

		main = handler