optimized the email services

3 files changed, 5 insertions, 5 deletions

diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index ace49889097..227c87602fc 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -1,6 +1,6 @@
 module Emails
   class BaseService
-    def initialize(user, opts)
+    def initialize(user, opts = {})
       @user = user
       @email = opts[:email]
     end
diff --git a/app/services/emails/confirm_service.rb b/app/services/emails/confirm_service.rb
index 45845ccecc5..e764f18ddd0 100644
--- a/app/services/emails/confirm_service.rb
+++ b/app/services/emails/confirm_service.rb
@@ -1,7 +1,7 @@
 module Emails
   class ConfirmService < ::Emails::BaseService
-    def execute
-      Email.find_by_email!(@email).resend_confirmation_instructions
+    def execute(email_record)
+      email_record.resend_confirmation_instructions
     end
   end
 end
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index d586b9dfe0c..d29d7e69bde 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -1,7 +1,7 @@
 module Emails
   class DestroyService < ::Emails::BaseService
-    def execute
-      Email.find_by_email!(@email).destroy && update_secondary_emails!
+    def execute(email_record)
+      email_record.destroy && update_secondary_emails!
     end
 
     private