From bb9a1c8827c02ac71c16b7d5d0b4c4c18b34f24c Mon Sep 17 00:00:00 2001 From: NavaL Date: Mon, 18 Jan 2016 17:27:19 +0100 Subject: migrating AttachmentsResources to use the service factory Issue #576 --- service/pixelated/resources/__init__.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'service/pixelated/resources/__init__.py') diff --git a/service/pixelated/resources/__init__.py b/service/pixelated/resources/__init__.py index 556469c1..cddfff97 100644 --- a/service/pixelated/resources/__init__.py +++ b/service/pixelated/resources/__init__.py @@ -47,10 +47,19 @@ class BaseResource(Resource): Resource.__init__(self) self._services_factory = services_factory - def keymanager(self, request): - user_id = self._get_user_id_from_request() - return self._services_factory.services(user_id).keymanager - - def _get_user_id_from_request(self): + def _get_user_id_from_request(self, request): # currently we are faking this return self._services_factory._services_by_user.keys()[0] + + def _services(self, request): + user_id = self._get_user_id_from_request(request) + return self._services_factory.services(user_id) + + def _service(self, request, attribute): + return getattr(self._services(request), attribute) + + def keymanager(self, request): + return self._service(request, 'keymanager') + + def mail_service(self, request): + return self._service(request, 'mail_service') -- cgit v1.2.3