fix: Refactor time_tracker_events for deployment #101

EliuX · EliuX · commit b6ab54d5cf32 · 2020-04-30T15:23:16.000-05:00
diff --git a/.DS_Store b/.DS_Store
diff --git a/README.md b/README.md
@@ -46,7 +46,10 @@ automatically [pip](https://pip.pypa.io/en/stable/) as well.
     * `prod`: For anything deployed
     
     
-    Remember to do it with Python 3.
+Remember to do it with Python 3.
+    
+Bear in mind that the requirements for `time_tracker_events`, must be located on its local requirements.txt, by 
+    [convention](https://docs.microsoft.com/en-us/azure/azure-functions/functions-reference-python#folder-structure).
 
 - Run `pre-commit install`. For more details, check out Development > Git hooks.
 
@@ -134,6 +137,16 @@ following notes regarding to the manipulation of the data from and towards the A
 - The [recommended](https://docs.microsoft.com/en-us/azure/cosmos-db/working-with-dates#storing-datetimes) format for 
 DateTime strings in Azure Cosmos DB is `YYYY-MM-DDThh:mm:ss.fffffffZ` which follows the ISO 8601 **UTC standard**.
 
+The Azure function project `time_tracker_events` also have some constraints to have into account. It is recommended that
+you read the [Azure Functions Python developer guide](https://docs.microsoft.com/en-us/azure/azure-functions/functions-reference-python#folder-structure).
+
+If you require to deploy `time_tracker_events` from your local machine to Azure Functions, you can execute:
+
+```bash
+func azure functionapp publish time-tracker-events  --build local
+```
+
+
 ## Development
 
 ### Git hooks
diff --git a/requirements/time_tracker_events/prod.txt b/requirements/time_tracker_events/prod.txt
@@ -1,5 +1,4 @@
 # requirements/time_tracker_events/prod.txt
 
-# Azure Functions library
-azure-functions
-
+# Include the requirements of that folder, required there by convention
+-r ../../time_tracker_events/requirements.txt
diff --git a/tests/time_tracker_events/shared_code/__init__.py b/tests/time_tracker_events/shared_code/__init__.py
diff --git a/tests/time_tracker_events/shared_code/test_handle_events_trigger.py b/tests/time_tracker_events/shared_code/test_handle_events_trigger.py
@@ -1,7 +1,7 @@
 import azure.functions as func
 from faker import Faker
 
-from time_tracker_events.handle_events_trigger import main as main_handler
+from time_tracker_events.shared_code.handle_events_trigger import main as main_handler
 
 fake = Faker()
 
diff --git a/time_tracker_api/time_entries/time_entries_namespace.py b/time_tracker_api/time_entries/time_entries_namespace.py
@@ -163,7 +163,7 @@ def delete(self, id):
 
 @ns.route('/<string:id>/stop')
 @ns.response(HTTPStatus.NOT_FOUND, 'Running time entry not found')
-@ns.response(HTTPStatus.UNPROCESSABLE_ENTITY, '"The specified time entry is already stopped')
+@ns.response(HTTPStatus.UNPROCESSABLE_ENTITY, 'The specified time entry is already stopped')
 @ns.param('id', 'The unique identifier of a running time entry')
 class StopTimeEntry(Resource):
     @ns.doc('stop_time_entry')
diff --git a/time_tracker_events/.funcignore b/time_tracker_events/.funcignore
@@ -1 +1,2 @@
-
+run.sh
+.vscode
diff --git a/time_tracker_events/.gitignore b/time_tracker_events/.gitignore
@@ -40,4 +40,4 @@ venv.bak/
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
-*$py.class
+*$py.class
diff --git a/time_tracker_events/handle_activity_events_trigger/__init__.py b/time_tracker_events/handle_activity_events_trigger/__init__.py
@@ -1,3 +1,3 @@
-from ..handle_events_trigger import main as handler
+from ..shared_code import handle_events_trigger
 
-main = handler
+main = handle_events_trigger.main
diff --git a/time_tracker_events/handle_customer_trigger/__init__.py b/time_tracker_events/handle_customer_trigger/__init__.py
@@ -1,3 +1,3 @@
-from ..handle_events_trigger import main as handler
+from ..shared_code.handle_events_trigger import main as handler
 
 main = handler
diff --git a/time_tracker_events/handle_project_events_trigger/__init__.py b/time_tracker_events/handle_project_events_trigger/__init__.py
@@ -1,3 +1,3 @@
-from ..handle_events_trigger import main as handler
+from ..shared_code.handle_events_trigger import main as handler
 
 main = handler
diff --git a/time_tracker_events/handle_project_type_events_trigger/__init__.py b/time_tracker_events/handle_project_type_events_trigger/__init__.py
@@ -1,3 +1,3 @@
-from ..handle_events_trigger import main as handler
+from ..shared_code.handle_events_trigger import main as handler
 
 main = handler
diff --git a/time_tracker_events/handle_time_entry_events_trigger/__init__.py b/time_tracker_events/handle_time_entry_events_trigger/__init__.py
@@ -1,3 +1,3 @@
-from ..handle_events_trigger import main as handler
+from __app__.shared_code.handle_events_trigger import main as handler
 
 main = handler
diff --git a/time_tracker_events/host.json b/time_tracker_events/host.json
@@ -4,4 +4,4 @@
     "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[1.*, 2.0.0)"
   }
-}
+}
diff --git a/time_tracker_events/local.settings.json b/time_tracker_events/local.settings.json
diff --git a/time_tracker_events/requirements.txt b/time_tracker_events/requirements.txt
@@ -0,0 +1,4 @@
+# time_tracker_events/requirements.txt
+
+# Azure Functions library
+azure-functions
diff --git a/time_tracker_events/shared_code/handle_events_trigger.py b/time_tracker_events/shared_code/handle_events_trigger.py

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-from ..handle_events_trigger import main as handler`
	`1`	`+from ..shared_code.handle_events_trigger import main as handler`
`2`	`2`
`3`	`3`	`main = handler`