refactor: TT-365 Solving merge conflicts

dsgarcia8 · dsgarcia8 · commit e8798e498b04 · 2021-10-25T09:51:46.000-05:00
diff --git a/V2/tests/api/azure/activity_azure_endpoints_test.py b/V2/tests/api/azure/activity_azure_endpoints_test.py
@@ -57,3 +57,4 @@ def test__activity_azure_endpoint__creates_an_activity__when_activity_has_all_at
 
     assert response.status_code == 200
     assert activitiy_json_data ==  body
+
diff --git a/V2/time_entries/_application/_activities/_create_activity.py b/V2/time_entries/_application/_activities/_create_activity.py
@@ -8,10 +8,12 @@
 
 
 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.'

Original file line number	Diff line number	Diff line change
`@@ -57,3 +57,4 @@ def test__activity_azure_endpoint__creates_an_activity__when_activity_has_all_at`
`57`	`57`
`58`	`58`	`assert response.status_code == 200`
`59`	`59`	`assert activitiy_json_data == body`
	`60`	`+`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,12 @@`
`8`	`8`
`9`	`9`
`10`	`10`	`JSON_PATH = (`
	`11`	`+`
`11`	`12`	`'time_entries/_infrastructure/_data_persistence/activities_data.json'`
`12`	`13`	`)`
`13`	`14`
`14`	`15`
	`16`	`+`
`15`	`17`	`def create_activity(req: func.HttpRequest) -> func.HttpResponse:`
`16`	`18`	`logging.info(`
`17`	`19`	`'Python HTTP trigger function processed a request to create an activity.'`