From 075fb76a603bb44772348351acfee4548d231433 Mon Sep 17 00:00:00 2001
From: Nazar Gargol <nazargargol@gmail.com>
Date: Mon, 25 Nov 2019 12:04:58 +0700
Subject: [PATCH] Moved toJSON calls to serializer

- toJSON transformations should happen on serializer level so controllers could be called directly with it's own options internally
---
 core/server/api/canary/email.js                           | 5 ++---
 core/server/api/canary/utils/serializers/output/emails.js | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/server/api/canary/email.js b/core/server/api/canary/email.js
index 9dad02b506..25acbac083 100644
--- a/core/server/api/canary/email.js
+++ b/core/server/api/canary/email.js
@@ -27,7 +27,7 @@ module.exports = {
                         });
                     }
 
-                    return model.toJSON(frame.options);
+                    return model;
                 });
         }
     },
@@ -52,8 +52,7 @@ module.exports = {
                         });
                     }
 
-                    const result = await megaService.mega.retryFailedEmail(model);
-                    return result.toJSON(frame.options);
+                    return await megaService.mega.retryFailedEmail(model);
                 });
         }
     }
diff --git a/core/server/api/canary/utils/serializers/output/emails.js b/core/server/api/canary/utils/serializers/output/emails.js
index c44c4b5f5e..f355f66b7d 100644
--- a/core/server/api/canary/utils/serializers/output/emails.js
+++ b/core/server/api/canary/utils/serializers/output/emails.js
@@ -1,7 +1,7 @@
 module.exports = {
     read(email, apiConfig, frame) {
         frame.response = {
-            emails: [email]
+            emails: [email.toJSON(frame.options)]
         };
     },