AttachmentsResource don't need querier anymore, RootResource doesn't need it too

4 files changed, 12 insertions, 10 deletions

diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py
index 4e6b6aa8..233d4d4a 100644
--- a/service/pixelated/adapter/services/mail_service.py
+++ b/service/pixelated/adapter/services/mail_service.py
@@ -60,6 +60,9 @@ class MailService(object):
     def mail(self, mail_id):
         return self.querier.mail(mail_id)
 
+    def attachment(self, attachment_id, encoding):
+        return self.querier.attachment(attachment_id, encoding)
+
     def mail_exists(self, mail_id):
         return not(not(self.querier.get_header_by_chash(mail_id)))
 
diff --git a/service/pixelated/config/app_factory.py b/service/pixelated/config/app_factory.py
index 1c7fb8a1..0a366514 100644
--- a/service/pixelated/config/app_factory.py
+++ b/service/pixelated/config/app_factory.py
@@ -47,6 +47,6 @@ def init_app(leap_home, leap_session):
     InputMail.FROM_EMAIL_ADDRESS = leap_session.account_email()
 
     resource = RootResource()
-    resource.initialize(soledad_querier, keymanager, search_engine, mail_service, draft_service)
+    resource.initialize(keymanager, search_engine, mail_service, draft_service)
 
     return resource
diff --git a/service/pixelated/resources/attachments_resource.py b/service/pixelated/resources/attachments_resource.py
index e0ba1bd1..83c7156d 100644
--- a/service/pixelated/resources/attachments_resource.py
+++ b/service/pixelated/resources/attachments_resource.py
@@ -27,15 +27,15 @@ class AttachmentResource(Resource):
 
     isLeaf = True
 
-    def __init__(self, attachment_id, querier):
+    def __init__(self, mail_service, attachment_id):
         Resource.__init__(self)
         self.attachment_id = attachment_id
-        self.querier = querier
+        self.mail_service = mail_service
 
     def render_GET(self, request):
         encoding = request.args.get('encoding', [None])[0]
         filename = request.args.get('filename', [self.attachment_id])[0]
-        attachment = self.querier.attachment(self.attachment_id, encoding)
+        attachment = self.mail_service.attachment(self.attachment_id, encoding)
 
         request.setHeader(b'Content-Type', b'application/force-download')
         request.setHeader(b'Content-Disposition', bytes('attachment; filename=' + filename))
@@ -57,9 +57,9 @@ class AttachmentResource(Resource):
 
 class AttachmentsResource(Resource):
 
-    def __init__(self, querier):
+    def __init__(self, mail_service):
         Resource.__init__(self)
-        self.querier = querier
+        self.mail_service = mail_service
 
     def getChild(self, attachment_id, request):
-        return AttachmentResource(attachment_id, self.querier)
+        return AttachmentResource(self.mail_service, attachment_id)
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py
index 4c0c47ac..c1111269 100644
--- a/service/pixelated/resources/root_resource.py
+++ b/service/pixelated/resources/root_resource.py
@@ -21,10 +21,10 @@ class RootResource(Resource):
             return self
         return Resource.getChild(self, path, request)
 
-    def initialize(self, querier, keymanager, search_engine, mail_service, draft_service):
+    def initialize(self, keymanager, search_engine, mail_service, draft_service):
         self.putChild('assets', File(self._static_folder))
         self.putChild('keys', KeysResource(keymanager))
-        self.putChild('attachment', AttachmentsResource(querier))
+        self.putChild('attachment', AttachmentsResource(mail_service))
         self.putChild('contacts', ContactsResource(search_engine))
         self.putChild('features', FeaturesResource())
         self.putChild('tags', TagsResource(search_engine))
@@ -32,7 +32,6 @@ class RootResource(Resource):
         self.putChild('mail', MailResource(mail_service))
 
     def _get_static_folder(self):
-
         static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "app"))
         # this is a workaround for packaging
         if not os.path.exists(static_folder):