refactor: TT-357 Refactor functions names for Activity

Author: dsgarcia8

V2/tests/integration/daos/activities_sql_dao_test.py

@@ -64,7 +64,7 @@ def test_update__returns_an_activity_updated__when_an_activity_matching_its_id_i
         'status': 'active',
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         })
-    results = create_fake_dao.update('b4327ba69f9649eea9ac3c1edf525172',activity)
+    results = create_fake_dao.update_activity('b4327ba69f9649eea9ac3c1edf525172',activity)
     assert results == expected_result
 
 
@@ -77,7 +77,7 @@ def test_update__returns_none__when_no_activity_matching_its_id_is_found_with_sq
         'status': 'active',
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         }
-    results = create_fake_dao.update('b4327ba69f9649eea9ac3c1edf525172',activity)
+    results = create_fake_dao.update_activity('b4327ba69f9649eea9ac3c1edf525172',activity)
     assert results == None
 
 
@@ -101,7 +101,7 @@ def test__get_all__returns_a_list_of_activity_dto_objects__when_one_or_more_acti
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         }),
     ]
-    results = create_fake_dao.get_all()
+    results = create_fake_dao.get_all_activities()
     assert results == expected_result
 
 
@@ -115,19 +115,19 @@ def test_get_by_id__returns_an_activity_dto__when_found_one_activity_that_matche
         'status': 'active',
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         })
-    results = create_fake_dao.get_by_id('b4327ba69f9649eea9ac3c1edf525172')
+    results = create_fake_dao.get_activity_by_id('b4327ba69f9649eea9ac3c1edf525172')
     assert results == expected_result
 
 
 @pytest.mark.parametrize('with_data',[False])
 def test__get_by_id__returns_none__when_no_activity_matches_its_id_with_sql_database(create_fake_dao):    
-    results = create_fake_dao.get_by_id('b4327ba69f9649eea9ac3c1edf525172')
+    results = create_fake_dao.get_activity_by_id('b4327ba69f9649eea9ac3c1edf525172')
     assert results == None
 
 
 @pytest.mark.parametrize('with_data',[False])
 def test_get_all__returns_an_empty_list__when_doesnt_found_any_activities_with_sql_database(create_fake_dao):
-    results = create_fake_dao.get_all()
+    results = create_fake_dao.get_all_activities()
     assert results == []
 
 
@@ -141,11 +141,11 @@ def test_delete__returns_an_activity_with_inactive_status__when_an_activity_matc
         'status': 'inactive',
         'deleted': 'b4327ba6-9f96-49ee-a9ac-3c1edf525172',
         })
-    results = create_fake_dao.delete('b4327ba69f9649eea9ac3c1edf525172')
+    results = create_fake_dao.delete_activity('b4327ba69f9649eea9ac3c1edf525172')
     assert results == expected_result
 
 
 @pytest.mark.parametrize('with_data',[False])
 def test_delete__returns_none__when_no_activity_matching_its_id_is_found_with_sql_database(create_fake_dao):
-    results = create_fake_dao.delete('b4327ba69f9649eea9ac3c1edf525172')
+    results = create_fake_dao.delete_activity('b4327ba69f9649eea9ac3c1edf525172')
     assert results == None

V2/tests/unit/services/activity_service_test.py

@@ -5,26 +5,26 @@
 def test__get_all__uses_the_activity_dao__to_retrieve_activities(mocker):
     expected_activities = mocker.Mock()
     activity_dao = mocker.Mock(
-        get_all=mocker.Mock(return_value=expected_activities)
+        get_all_activities=mocker.Mock(return_value=expected_activities)
     )
     activity_service = ActivityService(activity_dao)
 
     actual_activities = activity_service.get_all()
 
-    assert activity_dao.get_all.called
+    assert activity_dao.get_all_activities.called
     assert expected_activities == actual_activities
 
 
 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)
+        get_activity_by_id=mocker.Mock(return_value=expected_activity)
     )
     activity_service = ActivityService(activity_dao)
 
     actual_activity = activity_service.get_by_id(Faker().uuid4())
 
-    assert activity_dao.get_by_id.called
+    assert activity_dao.get_activity_by_id.called
     assert expected_activity == actual_activity
 
 
@@ -33,13 +33,13 @@ def test__delete_activity__uses_the_activity_dao__to_change_activity_status(
 ):
     expected_activity = mocker.Mock()
     activity_dao = mocker.Mock(
-        delete=mocker.Mock(return_value=expected_activity)
+        delete_activity=mocker.Mock(return_value=expected_activity)
     )
 
     activity_service = ActivityService(activity_dao)
     deleted_activity = activity_service.delete(Faker().uuid4())
 
-    assert activity_dao.delete.called
+    assert activity_dao.delete_activity.called
     assert expected_activity == deleted_activity
 
 
@@ -48,15 +48,15 @@ def test__update_activity__uses_the_activity_dao__to_update_one_activity(
 ):
     expected_activity = mocker.Mock()
     activity_dao = mocker.Mock(
-        update=mocker.Mock(return_value=expected_activity)
+        update_activity=mocker.Mock(return_value=expected_activity)
     )
     activity_service = ActivityService(activity_dao)
 
     updated_activity = activity_service.update(
         Faker().uuid4(), Faker().pydict()
     )
 
-    assert activity_dao.update.called
+    assert activity_dao.update_activity.called
     assert expected_activity == updated_activity
 
 def test__create_activity__uses_the_activity_dao__to_create_an_activity(mocker):

V2/time_entries/_domain/_persistence_contracts/_activities_dao.py

@@ -5,19 +5,19 @@
 
 class ActivitiesDao(abc.ABC):
     @abc.abstractmethod
-    def get_by_id(self, id: str) -> Activity:
+    def get_activity_by_id(self, id: str) -> Activity:
         pass
 
     @abc.abstractmethod
-    def get_all(self) -> typing.List[Activity]:
+    def get_all_activities(self) -> typing.List[Activity]:
         pass
 
     @abc.abstractmethod
-    def delete(self, id: str) -> Activity:
+    def delete_activity(self, id: str) -> Activity:
         pass
 
     @abc.abstractmethod
-    def update(self, id: str, new_activity: dict) -> Activity:
+    def update_activity(self, id: str, new_activity: dict) -> Activity:
         pass
 
     @abc.abstractmethod

V2/time_entries/_domain/_services/_activity.py

@@ -7,16 +7,16 @@ def __init__(self, activities_dao: ActivitiesDao):
         self.activities_dao = activities_dao
 
     def get_by_id(self, activity_id: str) -> Activity:
-        return self.activities_dao.get_by_id(activity_id)
+        return self.activities_dao.get_activity_by_id(activity_id)
 
     def get_all(self) -> typing.List[Activity]:
-        return self.activities_dao.get_all()
+        return self.activities_dao.get_all_activities()
 
     def delete(self, activity_id: str) -> Activity:
-        return self.activities_dao.delete(activity_id)
+        return self.activities_dao.delete_activity(activity_id)
 
     def update(self, activity_id: str, new_activity: dict) -> Activity:
-        return self.activities_dao.update(activity_id, new_activity)
+        return self.activities_dao.update_activity(activity_id, new_activity)
 
     def create_activity(self, activity_data: dict) -> Activity:
         return self.activities_dao.create_activity(activity_data)

V2/time_entries/_infrastructure/_data_persistence/_activities_sql_dao.py

@@ -25,12 +25,12 @@ def __init__(self, database: _db.DB):
                      extend_existing=True,
               )
 
-    def get_by_id(self, activity_id: str) -> domain.Activity:
+    def get_activity_by_id(self, activity_id: str) -> domain.Activity:
         query = sql.select(self.activity).where(self.activity.c.id ==  activity_id)
         activity = self.db.get_session().execute(query).one_or_none()
         return self.__create_activity_dto(dict(activity)) if activity else None
 
-    def get_all(self) -> typing.List[domain.Activity]:
+    def get_all_activities(self) -> typing.List[domain.Activity]:
         query = sql.select(self.activity)
         result = self.db.get_session().execute(query)
         return [
@@ -45,16 +45,16 @@ def create_activity(self, activity_data: dict) -> domain.Activity:
         activity = self.db.get_session().execute(query)
         return self.__create_activity_dto(activity.last_inserted_params())
 
-    def delete(self, activity_id: str) -> domain.Activity:
+    def delete_activity(self, activity_id: str) -> domain.Activity:
         query = self.activity.update().where(self.activity.c.id == activity_id).values(status = 'inactive')
         self.db.get_session().execute(query)
-        return self.get_by_id(activity_id);
+        return self.get_activity_by_id(activity_id);
 
-    def update(self, activity_id: str, new_activity: dict) -> domain.Activity:
+    def update_activity(self, activity_id: str, new_activity: dict) -> domain.Activity:
         new_activity.pop('id', None)
         query = self.activity.update().where(self.activity.c.id==activity_id).values(new_activity)
         self.db.get_session().execute(query)
-        return self.get_by_id(activity_id)
+        return self.get_activity_by_id(activity_id)
 
     def __create_activity_dto(self, activity: dict) -> domain.Activity:
         activity = {key: activity.get(key).hex if key == "id" else activity.get(key) for key in self.activity_keys}