Skip to content

Commit 73bb21a

Browse files
authored
refactor: TT-401 Rename the time entries folder (#340)
1 parent 9598ad4 commit 73bb21a

29 files changed

+79
-79
lines changed

V2/serverless.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ package:
3838

3939
functions:
4040
get_activities:
41-
handler: time_entries/interface.get_activities
41+
handler: time_tracker/activities/interface.get_activities
4242
events:
4343
- http: true
4444
x-azure-settings:
@@ -48,7 +48,7 @@ functions:
4848
authLevel: anonymous
4949

5050
delete_activity:
51-
handler: time_entries/interface.delete_activity
51+
handler: time_tracker/activities/interface.delete_activity
5252
events:
5353
- http: true
5454
x-azure-settings:
@@ -58,7 +58,7 @@ functions:
5858
authLevel: anonymous
5959

6060
update_activity:
61-
handler: time_entries/interface.update_activity
61+
handler: time_tracker/activities/interface.update_activity
6262
events:
6363
- http: true
6464
x-azure-settings:
@@ -68,7 +68,7 @@ functions:
6868
authLevel: anonymous
6969

7070
create_activity:
71-
handler: time_entries/interface.create_activity
71+
handler: time_tracker/activities/interface.create_activity
7272
events:
7373
- http: true
7474
x-azure-settings:

V2/tests/api/azure/activity_azure_endpoints_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from time_entries._application import _activities as activities
1+
from time_tracker.activities._application import _activities as activities
22
from faker import Faker
33

44
import azure.functions as func

V2/tests/integration/daos/activities_json_dao_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from time_entries._infrastructure import ActivitiesJsonDao
2-
from time_entries._domain import Activity
1+
from time_tracker.activities._infrastructure import ActivitiesJsonDao
2+
from time_tracker.activities._domain import Activity
33
from faker import Faker
44
import json
55
import pytest

V2/tests/unit/services/activity_service_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from time_entries._domain import ActivityService
1+
from time_tracker.activities._domain import ActivityService
22
from faker import Faker
33

44

V2/tests/unit/use_cases/activities_use_case_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from time_entries._domain import _use_cases
1+
from time_tracker.activities._domain import _use_cases
22
from pytest_mock import MockFixture
33
from faker import Faker
44

V2/time_entries/_application/_activities/_create_activity.py renamed to V2/time_tracker/activities/_application/_activities/_create_activity.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from ... import _infrastructure
99

1010
_JSON_PATH = (
11-
'time_entries/_infrastructure/_data_persistence/activities_data.json'
11+
'activities/_infrastructure/_data_persistence/activities_data.json'
1212
)
1313

1414

V2/time_entries/_application/_activities/_delete_activity.py renamed to V2/time_tracker/activities/_application/_activities/_delete_activity.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
from time_entries._infrastructure import ActivitiesJsonDao
2-
from time_entries._domain import ActivityService, _use_cases
1+
from time_tracker.activities._infrastructure import ActivitiesJsonDao
2+
from time_tracker.activities._domain import ActivityService, _use_cases
33

44
import azure.functions as func
55
import json
66
import logging
77

88
JSON_PATH = (
9-
'time_entries/_infrastructure/_data_persistence/activities_data.json'
9+
'activities/_infrastructure/_data_persistence/activities_data.json'
1010
)
1111

1212

Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
from time_entries._infrastructure import ActivitiesJsonDao
2-
from time_entries._domain import ActivityService, _use_cases
3-
4-
import azure.functions as func
5-
import json
6-
import logging
7-
8-
JSON_PATH = (
9-
'time_entries/_infrastructure/_data_persistence/activities_data.json'
10-
)
11-
12-
13-
def get_activities(req: func.HttpRequest) -> func.HttpResponse:
14-
logging.info(
15-
'Python HTTP trigger function processed a request to get an activity.'
16-
)
17-
activity_id = req.route_params.get('id')
18-
status_code = 200
19-
20-
if activity_id:
21-
response = _get_by_id(activity_id)
22-
if response == b'Not Found':
23-
status_code = 404
24-
else:
25-
response = _get_all()
26-
27-
return func.HttpResponse(
28-
body=response, status_code=status_code, mimetype="application/json"
29-
)
30-
31-
32-
def _get_by_id(activity_id: str) -> str:
33-
activity_use_case = _use_cases.GetActivityUseCase(
34-
_create_activity_service(JSON_PATH)
35-
)
36-
activity = activity_use_case.get_activity_by_id(activity_id)
37-
38-
return json.dumps(activity.__dict__) if activity else b'Not Found'
39-
40-
41-
def _get_all() -> str:
42-
activities_use_case = _use_cases.GetActivitiesUseCase(
43-
_create_activity_service(JSON_PATH)
44-
)
45-
return json.dumps(
46-
[
47-
activity.__dict__
48-
for activity in activities_use_case.get_activities()
49-
]
50-
)
51-
52-
53-
def _create_activity_service(path: str):
54-
activity_json = ActivitiesJsonDao(path)
55-
return ActivityService(activity_json)
1+
from time_tracker.activities._infrastructure import ActivitiesJsonDao
2+
from time_tracker.activities._domain import ActivityService, _use_cases
3+
4+
import azure.functions as func
5+
import json
6+
import logging
7+
8+
JSON_PATH = (
9+
'activities/_infrastructure/_data_persistence/activities_data.json'
10+
)
11+
12+
13+
def get_activities(req: func.HttpRequest) -> func.HttpResponse:
14+
logging.info(
15+
'Python HTTP trigger function processed a request to get an activity.'
16+
)
17+
activity_id = req.route_params.get('id')
18+
status_code = 200
19+
20+
if activity_id:
21+
response = _get_by_id(activity_id)
22+
if response == b'Not Found':
23+
status_code = 404
24+
else:
25+
response = _get_all()
26+
27+
return func.HttpResponse(
28+
body=response, status_code=status_code, mimetype="application/json"
29+
)
30+
31+
32+
def _get_by_id(activity_id: str) -> str:
33+
activity_use_case = _use_cases.GetActivityUseCase(
34+
_create_activity_service(JSON_PATH)
35+
)
36+
activity = activity_use_case.get_activity_by_id(activity_id)
37+
38+
return json.dumps(activity.__dict__) if activity else b'Not Found'
39+
40+
41+
def _get_all() -> str:
42+
activities_use_case = _use_cases.GetActivitiesUseCase(
43+
_create_activity_service(JSON_PATH)
44+
)
45+
return json.dumps(
46+
[
47+
activity.__dict__
48+
for activity in activities_use_case.get_activities()
49+
]
50+
)
51+
52+
53+
def _create_activity_service(path: str):
54+
activity_json = ActivitiesJsonDao(path)
55+
return ActivityService(activity_json)

0 commit comments

Comments
 (0)