refactor: TT-358 Change folder structure according to new app skeleton

.gitignore

@@ -25,7 +25,13 @@ htmlcov/
 
 # Dependency directories
 node_modules
-.serverless
+
+# Serverless directories
+.serverless/
+
+# Azure Functions json config
+host.json
+local.settings.json
 
 # Files generated for development
 .env

V2/azure_time_tracker/.npmignore → V2/.npmignore

@@ -77,6 +77,10 @@ typings/
 # Serverless directories
 .serverless/
 
+# Azure Functions json config
+host.json
+local.settings.json
+
 # FuseBox cache
 .fusebox/
 

V2/Makefile

@@ -0,0 +1,8 @@
+deploy:
+		@echo "Using serverles.yml provider config to deploy"
+		@echo "Deploying Time Tracker to Azure..."
+		sls deploy
+		rm -rf .serverless
+		rm -f host.json
+		rm -f local.settings.json
+		@echo "Completed! "

V2/azure_time_tracker/serverless.yml → V2/serverless.yml

@@ -37,13 +37,12 @@ package:
     - "!.git/**"
 
 functions:
-  activities:
-    handler: time_entries/application/azure_functions/activities.main
+  get_activities:
+    handler: time_entries/interface.get_activities
     events:
       - http: true
         x-azure-settings:
           methods:
             - GET
           route: activities/{id:?}
           authLevel: anonymous
-#  - ${file(activities/application/azure_functions/functions.yml)}

V2/azure_time_tracker/tests/api/azure/activity_azure_endpoints_test.py → V2/tests/api/azure/activity_azure_endpoints_test.py

@@ -1,4 +1,4 @@
-from time_entries.application import main
+from time_entries.interface import get_activities
 import azure.functions as func
 import json
 import typing
@@ -9,7 +9,7 @@ def test__activity_azure_endpoint__returns_all_activities(
 ):
     req = func.HttpRequest(method='GET', body=None, url='/api/activities')
 
-    response = main(req)
+    response = get_activities(req)
     activities_json_data = response.get_body().decode("utf-8")
 
     assert response.status_code == 200
@@ -26,7 +26,7 @@ def test__activity_azure_endpoint__returns_an_activity__when_activity_matches_it
         route_params={"id": activities_json[0]['id']},
     )
 
-    response = main(req)
+    response = get_activities(req)
     activitiy_json_data = response.get_body().decode("utf-8")
 
     assert response.status_code == 200

V2/azure_time_tracker/tests/integration/daos/activities_json_dao_test.py → V2/tests/integration/daos/activities_json_dao_test.py

@@ -1,5 +1,5 @@
-from time_entries.infrastructure import ActivitiesJsonDao
-from time_entries.domain import Activity
+from time_entries._infrastructure import ActivitiesJsonDao
+from time_entries._domain import Activity
 from faker import Faker
 import json
 import pytest

V2/azure_time_tracker/tests/unit/services/activity_service_test.py → V2/tests/unit/services/activity_service_test.py

@@ -1,4 +1,4 @@
-from time_entries.domain import ActivityService
+from time_entries._domain import ActivityService
 from faker import Faker
 
 

V2/azure_time_tracker/tests/unit/use_cases/activities_use_case_test.py → V2/tests/unit/use_cases/activities_use_case_test.py

@@ -1,5 +1,5 @@
-from time_entries.domain import ActivityService
-from time_entries.domain import use_cases
+from time_entries._domain import ActivityService
+from time_entries._domain import _use_cases
 from pytest_mock import MockFixture
 from faker import Faker
 
@@ -14,7 +14,7 @@ def test__get_list_activities_function__uses_the_activities_service__to_retrieve
         get_all=mocker.Mock(return_value=expected_activities)
     )
 
-    activities_use_case = use_cases.GetActivitiesUseCase(activity_service)
+    activities_use_case = _use_cases.GetActivitiesUseCase(activity_service)
     actual_activities = activities_use_case.get_activities()
 
     assert activity_service.get_all.called
@@ -29,7 +29,7 @@ def test__get_activity_by_id_function__uses_the_activities_service__to_retrieve_
         get_by_id=mocker.Mock(return_value=expected_activity)
     )
 
-    activity_use_case = use_cases.GetActivityUseCase(activity_service)
+    activity_use_case = _use_cases.GetActivityUseCase(activity_service)
     actual_activity = activity_use_case.get_activity_by_id(fake.uuid4())
 
     assert activity_service.get_by_id.called

V2/time_entries/_application/__init__.py

@@ -0,0 +1 @@
+from ._activities import get_activities

V2/time_entries/_application/_activities/__init__.py

@@ -0,0 +1 @@
+from ._get_activities import get_activities

V2/azure_time_tracker/time_entries/application/azure_functions/activities.py → V2/time_entries/_application/_activities/_get_activities.py

@@ -1,16 +1,16 @@
-from time_entries.infrastructure import ActivitiesJsonDao
-from time_entries.domain import ActivityService
-from time_entries.domain import Activity
-from time_entries.domain import use_cases
+from time_entries._infrastructure import ActivitiesJsonDao
+from time_entries._domain import ActivityService, _use_cases
 
 import azure.functions as func
 import json
 import logging
 
-JSON_PATH = 'V2/azure_time_tracker/time_entries/infrastructure/data_persistence/activities_data.json'
+JSON_PATH = (
+    'V2/time_entries/_infrastructure/_data_persistence/activities_data.json'
+)
 
 
-def main(req: func.HttpRequest) -> func.HttpResponse:
+def get_activities(req: func.HttpRequest) -> func.HttpResponse:
     logging.info(
         'Python HTTP trigger function processed a request to get an activity.'
     )
@@ -23,14 +23,14 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
             status_code = 404
     else:
         response = _get_all()
-
+    print("llego")
     return func.HttpResponse(
         body=response, status_code=status_code, mimetype="application/json"
     )
 
 
 def _get_by_id(activity_id: str) -> str:
-    activity_use_case = use_cases.GetActivityUseCase(
+    activity_use_case = _use_cases.GetActivityUseCase(
         _create_activity_service(JSON_PATH)
     )
     activity = activity_use_case.get_activity_by_id(activity_id)
@@ -39,7 +39,7 @@ def _get_by_id(activity_id: str) -> str:
 
 
 def _get_all() -> str:
-    activities_use_case = use_cases.GetActivitiesUseCase(
+    activities_use_case = _use_cases.GetActivitiesUseCase(
         _create_activity_service(JSON_PATH)
     )
     return json.dumps(

V2/time_entries/_domain/__init__.py

@@ -0,0 +1,4 @@
+from ._entities import Activity
+from ._persistence_contracts import ActivitiesDao
+from ._services import ActivityService
+from ._use_cases import GetActivitiesUseCase, GetActivityUseCase

V2/time_entries/_domain/_entities/__init__.py

@@ -0,0 +1 @@
+from ._activity import Activity

V2/time_entries/_domain/_persistence_contracts/__init__.py

@@ -0,0 +1 @@
+from ._activities_dao import ActivitiesDao

V2/azure_time_tracker/time_entries/domain/persistence_contracts/activities_dao.py → V2/time_entries/_domain/_persistence_contracts/_activities_dao.py

@@ -1,4 +1,4 @@
-from time_entries.domain import Activity
+from time_entries._domain import Activity
 import abc
 import typing
 

V2/time_entries/_domain/_services/__init__.py

@@ -0,0 +1 @@
+from ._activity import ActivityService

V2/azure_time_tracker/time_entries/domain/services/activity.py → V2/time_entries/_domain/_services/_activity.py

@@ -1,5 +1,4 @@
-from time_entries.domain import ActivitiesDao
-from time_entries.domain import Activity
+from time_entries._domain import ActivitiesDao, Activity
 import typing
 
 

V2/azure_time_tracker/time_entries/domain/use_cases/_get_activities_use_case.py → V2/time_entries/_domain/_use_cases/_get_activities_use_case.py

@@ -1,5 +1,4 @@
-from time_entries.domain import ActivityService
-from time_entries.domain import Activity
+from time_entries._domain import ActivityService, Activity
 import typing