Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions V2/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ package:

functions:
get_activities:
handler: time_entries/interface.get_activities
handler: time_tracker/activities/interface.get_activities
events:
- http: true
x-azure-settings:
Expand All @@ -48,7 +48,7 @@ functions:
authLevel: anonymous

delete_activity:
handler: time_entries/interface.delete_activity
handler: time_tracker/activities/interface.delete_activity
events:
- http: true
x-azure-settings:
Expand All @@ -58,7 +58,7 @@ functions:
authLevel: anonymous

update_activity:
handler: time_entries/interface.update_activity
handler: time_tracker/activities/interface.update_activity
events:
- http: true
x-azure-settings:
Expand All @@ -68,7 +68,7 @@ functions:
authLevel: anonymous

create_activity:
handler: time_entries/interface.create_activity
handler: time_tracker/activities/interface.create_activity
events:
- http: true
x-azure-settings:
Expand Down
2 changes: 1 addition & 1 deletion V2/tests/api/azure/activity_azure_endpoints_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._application import _activities as activities
from time_tracker.activities._application import _activities as activities
from faker import Faker

import azure.functions as func
Expand Down
4 changes: 2 additions & 2 deletions V2/tests/integration/daos/activities_json_dao_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from time_entries._infrastructure import ActivitiesJsonDao
from time_entries._domain import Activity
from time_tracker.activities._infrastructure import ActivitiesJsonDao
from time_tracker.activities._domain import Activity
from faker import Faker
import json
import pytest
Expand Down
2 changes: 1 addition & 1 deletion V2/tests/unit/services/activity_service_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivityService
from time_tracker.activities._domain import ActivityService
from faker import Faker


Expand Down
2 changes: 1 addition & 1 deletion V2/tests/unit/use_cases/activities_use_case_test.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import _use_cases
from time_tracker.activities._domain import _use_cases
from pytest_mock import MockFixture
from faker import Faker

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from ... import _infrastructure

_JSON_PATH = (
'time_entries/_infrastructure/_data_persistence/activities_data.json'
'activities/_infrastructure/_data_persistence/activities_data.json'
)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from time_entries._infrastructure import ActivitiesJsonDao
from time_entries._domain import ActivityService, _use_cases
from time_tracker.activities._infrastructure import ActivitiesJsonDao
from time_tracker.activities._domain import ActivityService, _use_cases

import azure.functions as func
import json
import logging

JSON_PATH = (
'time_entries/_infrastructure/_data_persistence/activities_data.json'
'activities/_infrastructure/_data_persistence/activities_data.json'
)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
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 = (
'time_entries/_infrastructure/_data_persistence/activities_data.json'
)
def get_activities(req: func.HttpRequest) -> func.HttpResponse:
logging.info(
'Python HTTP trigger function processed a request to get an activity.'
)
activity_id = req.route_params.get('id')
status_code = 200
if activity_id:
response = _get_by_id(activity_id)
if response == b'Not Found':
status_code = 404
else:
response = _get_all()
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(
_create_activity_service(JSON_PATH)
)
activity = activity_use_case.get_activity_by_id(activity_id)
return json.dumps(activity.__dict__) if activity else b'Not Found'
def _get_all() -> str:
activities_use_case = _use_cases.GetActivitiesUseCase(
_create_activity_service(JSON_PATH)
)
return json.dumps(
[
activity.__dict__
for activity in activities_use_case.get_activities()
]
)
def _create_activity_service(path: str):
activity_json = ActivitiesJsonDao(path)
return ActivityService(activity_json)
from time_tracker.activities._infrastructure import ActivitiesJsonDao
from time_tracker.activities._domain import ActivityService, _use_cases

import azure.functions as func
import json
import logging

JSON_PATH = (
'activities/_infrastructure/_data_persistence/activities_data.json'
)


def get_activities(req: func.HttpRequest) -> func.HttpResponse:
logging.info(
'Python HTTP trigger function processed a request to get an activity.'
)
activity_id = req.route_params.get('id')
status_code = 200

if activity_id:
response = _get_by_id(activity_id)
if response == b'Not Found':
status_code = 404
else:
response = _get_all()

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(
_create_activity_service(JSON_PATH)
)
activity = activity_use_case.get_activity_by_id(activity_id)

return json.dumps(activity.__dict__) if activity else b'Not Found'


def _get_all() -> str:
activities_use_case = _use_cases.GetActivitiesUseCase(
_create_activity_service(JSON_PATH)
)
return json.dumps(
[
activity.__dict__
for activity in activities_use_case.get_activities()
]
)


def _create_activity_service(path: str):
activity_json = ActivitiesJsonDao(path)
return ActivityService(activity_json)
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from time_entries._infrastructure import ActivitiesJsonDao
from time_entries._domain import ActivityService, Activity, _use_cases
from time_tracker.activities._infrastructure import ActivitiesJsonDao
from time_tracker.activities._domain import ActivityService, Activity, _use_cases

import azure.functions as func
import dataclasses
import json
import logging

JSON_PATH = (
'time_entries/_infrastructure/_data_persistence/activities_data.json'
'activities/_infrastructure/_data_persistence/activities_data.json'
)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import Activity
from time_tracker.activities._domain import Activity
import abc
import typing

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivitiesDao, Activity
from time_tracker.activities._domain import ActivitiesDao, Activity
import typing


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivityService, Activity
from time_tracker.activities._domain import ActivityService, Activity


class CreateActivityUseCase:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivityService, Activity
from time_tracker.activities._domain import ActivityService, Activity


class DeleteActivityUseCase:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivityService, Activity
from time_tracker.activities._domain import ActivityService, Activity
import typing


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivityService, Activity
from time_tracker.activities._domain import ActivityService, Activity


class GetActivityUseCase:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivityService, Activity
from time_tracker.activities._domain import ActivityService, Activity


class UpdateActivityUseCase:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_entries._domain import ActivitiesDao, Activity
from time_tracker.activities._domain import ActivitiesDao, Activity
import dataclasses
import json
import typing
Expand Down
File renamed without changes.