From 7b40bad03aaa01d8d991d8489e556377241311cb Mon Sep 17 00:00:00 2001
From: Clemens Wolff <clemens@ascoderu.ca>
Date: Mon, 20 Jan 2020 21:08:56 -0500
Subject: [PATCH] Slim down IoC interface (#247)

---
 opwen_email_client/webapp/ioc.py | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/opwen_email_client/webapp/ioc.py b/opwen_email_client/webapp/ioc.py
index efe34519..71a8aa0b 100644
--- a/opwen_email_client/webapp/ioc.py
+++ b/opwen_email_client/webapp/ioc.py
@@ -19,21 +19,6 @@
 
 
 class Ioc:
-    @cached_property
-    def serializer(self):
-        return JsonSerializer()
-
-    @cached_property
-    def email_server_client(self):
-        if AppConfig.TESTING:
-            return LocalEmailServerClient()
-
-        return HttpEmailServerClient(
-            compression=AppConfig.COMPRESSION,
-            hostname=AppConfig.EMAIL_SERVER_HOSTNAME,
-            client_id=AppConfig.CLIENT_ID,
-        )
-
     @cached_property
     def email_store(self):
         return SqliteEmailStore(
@@ -44,14 +29,25 @@ def email_store(self):
 
     @cached_property
     def email_sync(self):
+        if AppConfig.TESTING:
+            email_server_client = LocalEmailServerClient()
+        else:
+            email_server_client = HttpEmailServerClient(
+                compression=AppConfig.COMPRESSION,
+                hostname=AppConfig.EMAIL_SERVER_HOSTNAME,
+                client_id=AppConfig.CLIENT_ID,
+            )
+
+        serializer = JsonSerializer()
+
         return AzureSync(
             compression=AppConfig.COMPRESSION,
             account_name=AppConfig.STORAGE_ACCOUNT_NAME,
             account_key=AppConfig.STORAGE_ACCOUNT_KEY,
-            email_server_client=self.email_server_client,
+            email_server_client=email_server_client,
             container=AppConfig.STORAGE_CONTAINER,
             provider=AppConfig.STORAGE_PROVIDER,
-            serializer=self.serializer,
+            serializer=serializer,
         )
 
     @cached_property