Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
refactor: TT-358 Change name to the domain partitioning
  • Loading branch information
Andrés Soto committed Oct 18, 2021
commit 1c281970ace33ac95aaa944427cb9e176edcfa87
2 changes: 0 additions & 2 deletions V2/azure_time_tracker/activities/application/__init__.py

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion V2/azure_time_tracker/serverless.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ package:

functions:
activities:
handler: activities/application/azure_functions/activities.main
handler: time_entries/application/azure_functions/activities.main
events:
- http: true
x-azure-settings:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from azure_functions.activities.activities import main
from time_entries.application import main
import azure.functions as func
import json
import typing
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_tracker.source.entry_points.flask_api import create_app
from time_entries.application import create_app
import json
import pytest
import typing
Expand Down
2 changes: 1 addition & 1 deletion V2/azure_time_tracker/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from time_tracker.tests.api.api_fixtures import activities_json
from tests.api.api_fixtures import activities_json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from time_tracker.source.daos.activities_json_dao import ActivitiesJsonDao
from time_tracker.source.dtos.activity import Activity
from time_entries.infrastructure import ActivitiesJsonDao
from time_entries.domain import Activity
from faker import Faker
import json
import pytest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from time_tracker.source.entry_points.flask_api.activities_endpoints import (
from time_entries.application import (
Activities,
Activity,
)
from time_tracker.source import use_cases
from time_tracker.source.dtos.activity import Activity as ActivityDTO
from time_entries.domain import use_cases
from time_entries.domain import Activity as ActivityDTO
from pytest_mock import MockFixture
from faker import Faker
from werkzeug.exceptions import NotFound
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from time_tracker.source.services.activity_service import ActivityService
from time_entries.domain import ActivityService
from faker import Faker


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from time_tracker.source.services.activity_service import ActivityService
from time_tracker.source 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

Expand Down
2 changes: 2 additions & 0 deletions V2/azure_time_tracker/time_entries/application/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from .azure_functions import main
from .flask import Activities, Activity, create_app
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from activities.infrastructure import ActivitiesJsonDao
from activities.domain import ActivityService
from activities.domain import Activity
from activities.domain import use_cases
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

import azure.functions as func
import json
import logging

JSON_PATH = 'activities/infrastructure/data_persistence/activities_data.json'
JSON_PATH = 'time_entries/infrastructure/data_persistence/activities_data.json'


def main(req: func.HttpRequest) -> func.HttpResponse:
Expand All @@ -18,29 +18,29 @@ def main(req: func.HttpRequest) -> func.HttpResponse:
status_code = 200

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

return func.HttpResponse(
body=response, status_code=status_code, mimetype="application/json"
)


def get_by_id(activity_id: str) -> str:
def _get_by_id(activity_id: str) -> str:
activity_use_case = use_cases.GetActivityUseCase(
create_activity_service(JSON_PATH)
_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:
def _get_all() -> str:
activities_use_case = use_cases.GetActivitiesUseCase(
create_activity_service(JSON_PATH)
_create_activity_service(JSON_PATH)
)
return json.dumps(
[
Expand All @@ -50,6 +50,6 @@ def get_all() -> str:
)


def create_activity_service(path: str):
def _create_activity_service(path: str):
activity_json = ActivitiesJsonDao(path)
return ActivityService(activity_json)
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from flask_wtf.csrf import CSRFProtect
from flask_restplus import Namespace, Resource, Api
from http import HTTPStatus
from .activities_endpoints import Activities, Activity
from . import activities_endpoints

csrf = CSRFProtect()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from activities.infrastructure import ActivitiesJsonDao
from activities.domain import ActivityService
from activities.domain import use_cases
from time_entries.infrastructure import ActivitiesJsonDao
from time_entries.domain import ActivityService
from time_entries.domain import use_cases
from flask_restplus import Resource
from http import HTTPStatus

JSON_PATH = 'V2/azure_time_tracker/activities/infrastructure/data_persistence/activities_data.json'
JSON_PATH = 'V2/azure_time_tracker/time_entries/infrastructure/data_persistence/activities_data.json'


class Activities(Resource):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from activities.domain import Activity
from time_entries.domain import Activity
import abc
import typing

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


Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from activities.domain import ActivityService
from activities.domain import Activity
from time_entries.domain import ActivityService
from time_entries.domain import Activity
import typing


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


class GetActivityUseCase:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from activities.domain import ActivitiesDao
from activities.domain import Activity
from time_entries.domain import ActivitiesDao
from time_entries.domain import Activity
import dataclasses
import json
import typing
Expand Down