refactor: TT-352 solving merge conflicts

Author: JosueOb

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 <!--next-version-placeholder-->
 
+## v0.39.0 (2021-10-04)
+### Feature
+* TT-353 Create V2 Activities DAO ([#320](https://github.com/ioet/time-tracker-backend/issues/320)) ([`328ad43`](https://github.com/ioet/time-tracker-backend/commit/328ad43e3058de3c824b2feec47530bee5b23823))
+
 ## v0.38.0 (2021-09-08)
 ### Feature
 * TT-326 Get recent projects feature added ([#319](https://github.com/ioet/time-tracker-backend/issues/319)) ([`8e2aadc`](https://github.com/ioet/time-tracker-backend/commit/8e2aadc0937d3a26752b7fb8a1dd837af2f6d6a0))

V2/source/daos/activities_json_dao.py

@@ -1,34 +1,30 @@
 from V2.source.daos.activities_dao import ActivitiesDao
 from V2.source.dtos.activity import Activity
+import dataclasses
 import json
 import typing
 
-
 class ActivitiesJsonDao(ActivitiesDao):
     def __init__(self, json_data_file_path: str):
         self.json_data_file_path = json_data_file_path
-        self.activity_keys = Activity.__dataclass_fields__.keys()
+        self.activity_keys = [
+            field.name for field in dataclasses.fields(Activity)
+        ]
 
     def get_by_id(self, activity_id: str) -> Activity:
-        activities_grouped_by_id = {
+        activity = {
             activity.get('id'): activity
             for activity in self.__get_activities_from_file()
-        }
-        activity = activities_grouped_by_id.get(activity_id)
-        activity_dto = (
-            self.__create_activity_dto(activity) if activity else None
-        )
+        }.get(activity_id)
 
-        return activity_dto
+        return self.__create_activity_dto(activity) if activity else None
 
     def get_all(self) -> typing.List[Activity]:
-        all_activities = self.__get_activities_from_file()
-        activity_dtos = [
-            self.__create_activity_dto(activity) for activity in all_activities
+        return [
+            self.__create_activity_dto(activity)
+            for activity in self.__get_activities_from_file()
         ]
 
-        return activity_dtos
-
     def __get_activities_from_file(self) -> typing.List[dict]:
         try:
             file = open(self.json_data_file_path)
@@ -42,5 +38,4 @@ def __get_activities_from_file(self) -> typing.List[dict]:
 
     def __create_activity_dto(self, activity: dict) -> Activity:
         activity = {key: activity.get(key) for key in self.activity_keys}
-        activity_dto = Activity(**activity)
-        return activity_dto
+        return Activity(**activity)

V2/source/entry_points/flask_api/__init__.py

@@ -1,7 +1,6 @@
 from flask import Flask
 from flask_restplus import Namespace, Resource, Api
 from http import HTTPStatus
-
 from . import activities_endpoints
 
 

V2/source/entry_points/flask_api/activities_endpoints.py

@@ -1,6 +1,7 @@
+from V2.source import use_cases
 from flask_restplus import Resource
+from http import HTTPStatus
 
-from V2.source import use_cases
 
 class Activities(Resource):
     def get(self):
@@ -10,7 +11,10 @@ def get(self):
 
 
 class Activity(Resource):
-   def get(self, activity_id: str):
-       activity_dto = use_cases.get_activity_by_id(activity_id)
-       activity = activity_dto.__dict__
-       return activity
+    def get(self, activity_id: str):
+        try:
+            activities_dto = use_cases.get_activity_by_id(activity_id)
+            activity = activities_dto.__dict__
+            return activity
+        except AttributeError:
+            return {'message': 'Activity not found'}, HTTPStatus.NOT_FOUND

V2/tests/entry_points/flask_api/activities_endpoints_test.py

@@ -1,16 +1,14 @@
+from V2.source.entry_points.flask_api import create_app
+from V2.source import use_cases
+from V2.source.dtos.activity import Activity
 import json
-
 import pytest
 from http import HTTPStatus
 from pytest_mock import MockFixture
 from flask.testing import FlaskClient
 from faker import Faker
 from werkzeug.exceptions import NotFound
 
-from V2.source.entry_points.flask_api import create_app
-from V2.source import use_cases
-from V2.source.dtos.activity import Activity
-
 fake = Faker()
 
 valid_id = fake.uuid4()

V2/tests/services/activity_service_test.py

@@ -15,7 +15,7 @@ def test__get_all__uses_the_activity_dao__to_retrieve_activities(mocker):
     assert expected_activities == actual_activities
 
 
-def test__get_by_id__uses_the_activity_dao__to_retrieve_one_ativity(mocker):
+def test__get_by_id__uses_the_activity_dao__to_retrieve_one_activity(mocker):
     expected_activity = mocker.Mock()
     activity_dao = mocker.Mock(
         get_by_id=mocker.Mock(return_value=expected_activity)

time_tracker_api/version.py

@@ -1 +1 @@
-__version__ = '0.38.0'
+__version__ = '0.39.0'