solve merge conflicts

Author: dsgarcia8

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 <!--next-version-placeholder-->
 
+## v0.42.0 (2021-11-03)
+### Feature
+* TT-365 / TT-369  POST V2 Activity ([#329](https://github.com/ioet/time-tracker-backend/issues/329)) ([`6c3687b`](https://github.com/ioet/time-tracker-backend/commit/6c3687b5ca60893be23b6ad663de3081af964272))
+
+## v0.41.0 (2021-10-28)
+### Feature
+* TT-366 V2 - PUT update activity ([#331](https://github.com/ioet/time-tracker-backend/issues/331)) ([`500a5d0`](https://github.com/ioet/time-tracker-backend/commit/500a5d0261497ce9aa9a9040342fea94dbe70704))
+
 ## v0.40.0 (2021-10-27)
 ### Feature
 * TT-367  V2 - Delete Activity ([#330](https://github.com/ioet/time-tracker-backend/issues/330)) ([`6ba8320`](https://github.com/ioet/time-tracker-backend/commit/6ba8320c6ddd6599679dfbbbaf9ac1dba9addb8d))

V2/tests/api/azure/activity_azure_endpoints_test.py

@@ -85,18 +85,17 @@ def test__activity_azure_endpoint__creates_an_activity__when_activity_has_all_at
      create_temp_activities,
  ):
      activities_json, tmp_directory = create_temp_activities
-     activities._create_activity.JSON_PATH = tmp_directory
+     activities._create_activity._JSON_PATH = tmp_directory
 
-     activity_body = {'id': Faker().uuid4(), 'name': Faker().user_name(), 'description': Faker().sentence(),'deleted': Faker().uuid4() ,'status': 'active', 'tenant_id': Faker().uuid4()}
+     activity_body = {'id': None, 'name': Faker().user_name(), 'description': Faker().sentence(),'deleted': Faker().uuid4() ,'status': 'active', 'tenant_id': Faker().uuid4()}
      body = json.dumps(activity_body).encode("utf-8")
      req = func.HttpRequest(
          method='POST',
          body= body,
-         url='/api/activities/',
+         url=ACTIVITY_URL,
      )
 
-     response = activities._create_activity.create_activity(req)
+     response = activities.create_activity(req)
      activitiy_json_data = response.get_body()
-
-     assert response.status_code == 200
+     assert response.status_code == 201
      assert activitiy_json_data ==  body

V2/time_entries/_application/_activities/_create_activity.py

@@ -1,48 +1,62 @@
-from time_entries._infrastructure import ActivitiesJsonDao
-from time_entries._domain import ActivityService, _use_cases, Activity
-
-import azure.functions as func
 import json
 import logging
 import dataclasses
+import typing
+
+import azure.functions as func
 
+from ... import _domain
+from ... import _infrastructure
 
-JSON_PATH = (
+_JSON_PATH = (
     'time_entries/_infrastructure/_data_persistence/activities_data.json'
 )
 
 
-
 def create_activity(req: func.HttpRequest) -> func.HttpResponse:
-    logging.info(
-        'Python HTTP trigger function processed a request to create an activity.'
-    )
+    activity_dao = _infrastructure.ActivitiesJsonDao(_JSON_PATH)
+    activity_service = _domain.ActivityService(activity_dao)
+    use_case = _domain._use_cases.CreateActivityUseCase(activity_service)
+
+
     activity_data = req.get_json()
-    status_code = 200
-    if _validate_activity(activity_data):
-        response = _create_activity(activity_data)
-    else:
-        status_code = 404
-        response = b'Not possible to create activity, attributes are not correct '
 
-    return func.HttpResponse(
-        body=response, status_code=status_code, mimetype="application/json"
-    )
 
-def _create_activity(activity_data: dict) -> str:
-    activity_use_case = _use_cases.CreateActivityUseCase(
-        _create_activity_service(JSON_PATH)
+    validation_errors = _validate_activity(activity_data)
+    if validation_errors:
+        return func.HttpResponse(
+            body=validation_errors, status_code=400, mimetype="application/json"
+        )
+
+
+    activity_to_create = _domain.Activity(
+        id= None,
+        name=activity_data['name'],
+        description=activity_data['description'],
+        status=activity_data['status'],
+        deleted=activity_data['deleted'],
+        tenant_id=activity_data['tenant_id']
     )
-    activity = activity_use_case.create_activity(activity_data)
-    return json.dumps(activity.__dict__) if activity else b'Not Found'
 
-def _validate_activity(activity_data: dict) -> bool:
-    activity_keys = [field.name for field in dataclasses.fields(Activity)]
-    new_activity_keys = list(activity_data.keys())
-    return  all(map(lambda key: key in activity_keys, new_activity_keys)) and len(activity_keys) == len(new_activity_keys)
 
-def _create_activity_service(path: str):
-    activity_json = ActivitiesJsonDao(path)
-    return ActivityService(activity_json)
+    created_activity = use_case.create_activity(activity_to_create.__dict__)
+    if not create_activity:
+        return func.HttpResponse(
+            body={'error': 'activity could not be created'},
+            status_code=500,
+            mimetype="application/json",
+        )
+    return func.HttpResponse(
+        body=json.dumps(created_activity.__dict__),
+        status_code=201,
+        mimetype="application/json"
+    )
 
 
+def _validate_activity(activity_data: dict) -> typing.List[str]:
+    activity_fields = [field.name for field in dataclasses.fields(_domain.Activity)]
+    missing_keys = [field for field in activity_fields if field not in activity_data]
+    return [
+        f'The {missing_key} key is missing in the input data'
+        for missing_key in missing_keys
+    ]

time_tracker_api/version.py

@@ -1 +1 @@
-__version__ = '0.40.0'
+__version__ = '0.42.0'