Skip to content
Prev Previous commit
Next Next commit
refactor: TT-353 Add type of argument and return type to functions
  • Loading branch information
Andrés Soto committed Sep 27, 2021
commit 7a2565cfda41c1335245c217964f6d6aadd0dfa5
5 changes: 3 additions & 2 deletions V2/source/daos/activities_dao_interface.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
from V2.source.dtos.activity import ActivityDto
import abc


class ActivitiesDaoInterface(abc.ABC):
@abc.abstractmethod
def get_by_id(self, id):
def get_by_id(self, id: str) -> ActivityDto:
pass

@abc.abstractmethod
def get_all(self):
def get_all(self) -> list:
pass
6 changes: 3 additions & 3 deletions V2/source/daos/activities_json_dao.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@


class ActivitiesJsonDao(ActivitiesDaoInterface):
def __init__(self, json_data_file_path):
def __init__(self, json_data_file_path: str):
self.json_data_file_path = json_data_file_path
self.activity_keys = ActivityDto.__dataclass_fields__.keys()

def get_by_id(self, id):
def get_by_id(self, id: str) -> ActivityDto:
try:
file = open(self.json_data_file_path)
activities = json.load(file)
Expand All @@ -31,7 +31,7 @@ def get_by_id(self, id):

return activity_dto

def get_all(self):
def get_all(self) -> list:
try:
file = open(self.json_data_file_path)
activities = json.load(file)
Expand Down
7 changes: 4 additions & 3 deletions V2/source/services/activity_service.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
from V2.source.daos.activities_dao_interface import ActivitiesDaoInterface
from V2.source.dtos.activity import ActivityDto


class ActivityService:

activities_dao: ActivitiesDaoInterface

def __init__(self, activities_dao):
def __init__(self, activities_dao: ActivitiesDaoInterface):
self.activities_dao = activities_dao

def get_by_id(self, id):
def get_by_id(self, id: str) -> ActivityDto:
activity_dto = self.activities_dao.get_by_id(id)
return activity_dto

def get_all(self):
def get_all(self) -> list:
list_activities = self.activities_dao.get_all()
return list_activities