All persistence operations in the Aquarius class now use interactors …

…rather than persistence directly.

aquarius/Aquarius.py

@@ -41,7 +41,8 @@ def get_book_details(self, book_id):
         return i.execute(book_id)
 
     def get_book_type(self, format_code):
-        return self.__persistence.get_book_type(format_code)
+        i = self.__interactor_factory.get_book_type_interactor(self.__persistence)
+        return i.execute(format_code)
 
     def add_book(self, book):
         i = self.__interactor_factory.get_add_book_interactor(self.__persistence)

aquarius/InteractorFactory.py

@@ -9,5 +9,8 @@ def get_list_books_by_first_letter_interactor(self, persistence):
     def get_search_book_interactor(self, persistence):
         raise NotImplementedError
 
-    def get_book_details_interactor(self, param):
+    def get_book_details_interactor(self, persistence):
+        raise NotImplementedError
+
+    def get_book_type_interactor(self, persistence):
         raise NotImplementedError

aquarius/interactors/BasicInteractorFactory.py

@@ -1,6 +1,7 @@
 from aquarius.InteractorFactory import InteractorFactory
 from aquarius.interactors.AddBookInteractor import AddBookInteractor
 from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
+from aquarius.interactors.GetBookTypeInteractor import GetBookTypeInteractor
 from aquarius.interactors.ListBooksByFirstLetterInteractor import ListBooksByFirstLetterInteractor
 from aquarius.interactors.SearchBookInteractor import SearchBookInteractor
 
@@ -17,4 +18,7 @@ def get_search_book_interactor(self, persistence):
         return SearchBookInteractor(persistence)
 
     def get_book_details_interactor(self, persistence):
-        return GetBookDetailsInteractor(persistence)
+        return GetBookDetailsInteractor(persistence)
+
+    def get_book_type_interactor(self, persistence):
+        return GetBookTypeInteractor(persistence)

aquarius/interactors/GetBookTypeInteractor.py

@@ -0,0 +1,7 @@
+class GetBookTypeInteractor(object):
+
+    def __init__(self, persistence):
+        self.__persistence = persistence
+
+    def execute(self, format_code):
+        self.__persistence.get_book_type(format_code)

tests/TestAquarius.py

@@ -7,6 +7,7 @@
 from aquarius.bookharvesting.HardcodedHarvester import HardcodedHarvester
 from aquarius.interactors.AddBookInteractor import AddBookInteractor
 from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
+from aquarius.interactors.GetBookTypeInteractor import GetBookTypeInteractor
 from aquarius.interactors.ListBooksByFirstLetterInteractor import ListBooksByFirstLetterInteractor
 from aquarius.output.web.Web import Web
 from aquarius.persistence.hardcodedpersistence.HardcodedPersistence import HardcodedPersistence
@@ -26,12 +27,14 @@ def setup_interactors(self):
         self.__add_book_interactor = Mock(AddBookInteractor)
         self.__list_books_by_first_letter_interactor = Mock(ListBooksByFirstLetterInteractor)
         self.__get_book_details_interactor = Mock(GetBookDetailsInteractor)
+        self.__get_book_type_interactor = Mock(GetBookTypeInteractor)
         self.__interactor_factory = InteractorFactory()
         self.__interactor_factory.get_search_book_interactor = Mock(return_value=self.__search_book_interactor)
         self.__interactor_factory.get_add_book_interactor = Mock(return_value=self.__add_book_interactor)
         self.__interactor_factory.get_list_books_by_first_letter_interactor = \
             Mock(return_value=self.__list_books_by_first_letter_interactor)
         self.__interactor_factory.get_book_details_interactor = Mock(return_value=self.__get_book_details_interactor)
+        self.__interactor_factory.get_book_type_interactor = Mock(return_value=self.__get_book_type_interactor)
 
     def __setup_harvester_mock(self):
         self.__harvester = harvester = HardcodedHarvester(self.__app, None)
@@ -70,9 +73,13 @@ def test_get_book_details_calls_interactor(self):
         self.__app.get_book_details(0)
         self.assertTrue(self.__get_book_details_interactor.execute.called)
 
-    def test_get_book_type_calls_persistence(self):
+    def test_get_book_type_uses_interactor_factory(self):
         self.__app.get_book_type("EPUB")
-        self.assertTrue(self.__persistence.get_book_type.called)
+        self.assertTrue(self.__interactor_factory.get_book_type_interactor.called)
+
+    def test_get_book_type_calls_interactor(self):
+        self.__app.get_book_type("EPUB")
+        self.assertTrue(self.__get_book_type_interactor.execute.called)
 
     def test_add_book_uses_interactor_factory(self):
         self.__app.add_book(None)

tests/TestInteractorFactory.py

@@ -19,5 +19,8 @@ def test_get_search_book_interactor(self):
     def test_get_book_details_interactor(self):
         self.__assertNotImplemented(self.__target.get_book_details_interactor)
 
+    def test_get_book_type_interactor(self):
+        self.__assertNotImplemented(self.__target.get_book_type_interactor)
+
     def __assertNotImplemented(self, method):
         self.assertRaises(NotImplementedError, method, "persistence")

tests/interactors/TestBasicInteractorFactory.py

@@ -1,6 +1,7 @@
 import unittest
 from aquarius.interactors.BasicInteractorFactory import BasicInteractorFactory
 from aquarius.interactors.GetBookDetailsInteractor import GetBookDetailsInteractor
+from aquarius.interactors.GetBookTypeInteractor import GetBookTypeInteractor
 from aquarius.interactors.SearchBookInteractor import SearchBookInteractor
 from aquarius.interactors.AddBookInteractor import AddBookInteractor
 from aquarius.interactors.ListBooksByFirstLetterInteractor import ListBooksByFirstLetterInteractor
@@ -25,4 +26,8 @@ def test_get_search_book_interactor(self):
 
     def test_get_get_book_details_interactor(self):
         i = self.__target.get_book_details_interactor("persistence")
-        self.assertIsInstance(i, GetBookDetailsInteractor)
+        self.assertIsInstance(i, GetBookDetailsInteractor)
+
+    def test_get_book_type_interactor(self):
+        i = self.__target.get_book_type_interactor("persistence")
+        self.assertIsInstance(i, GetBookTypeInteractor)

tests/interactors/TestGetBookTypeInteractor.py

@@ -0,0 +1,13 @@
+import unittest
+from unittest.mock import Mock
+from aquarius.interactors.GetBookTypeInteractor import GetBookTypeInteractor
+from aquarius.persistence.sqlitepersistence.SqlitePersistence import SqlitePersistence
+
+
+class TestGetBookTypeInteractor(unittest.TestCase):
+
+    def test_get_book_type_interactor(self):
+        persistence = Mock(SqlitePersistence)
+        target = GetBookTypeInteractor(persistence)
+        target.execute("format_code")
+        self.assertTrue(persistence.get_book_type.called)