refactor emails service

app/services/emails/base_service.rb

 module Emails
   class BaseService
-    def initialize(current_user, user, opts)
-      @current_user = current_user
+    def initialize(user, opts)
       @user = user
       @email = opts[:email]
     end
-
-    def log_audit_event(options = {})
-      AuditEventService.new(@current_user, @user, options)
-          .for_email(@email).security_event
-    end
   end
 end

app/services/emails/create_service.rb

 module Emails
   class CreateService < ::Emails::BaseService
-    def execute
-      email = @user.emails.create(email: @email)
-
-      log_audit_event(action: :create)
+    prepend EE::Emails::CreateService
 
-      email
+    def execute
+      @user.emails.create(email: @email)
     end
   end
 end

app/services/emails/destroy_service.rb

 module Emails
   class DestroyService < ::Emails::BaseService
+    prepend EE::Emails::DestroyService
+
     def execute
       Email.find_by_email!(@email).destroy && update_secondary_emails!
-
-      log_audit_event(action: :destroy)
     end
 
     private

ee/app/services/ee/emails/base_service.rb

+module EE
+  module Emails
+    module BaseService
+      def initialize(current_user, user, opts)
+        @current_user = current_user
+
+        super(user, opts)
+      end
+
+      private
+
+      def log_audit_event(options = {})
+        AuditEventService.new(@current_user, @user, options)
+            .for_email(@email).security_event
+      end
+    end
+  end
+end

ee/app/services/ee/emails/create_service.rb

+module EE
+  module Emails
+    module CreateService
+      include EE::Emails::BaseService
+
+      def execute
+        email = super
+
+        log_audit_event(action: :create) if email.persisted?
+
+        email
+      end
+    end
+  end
+end

ee/app/services/ee/emails/destroy_service.rb

+module EE
+  module Emails
+    module DestroyService
+      include EE::Emails::BaseService
+
+      def execute
+        result = super
+
+        log_audit_event(action: :destroy)
+
+        result
+      end
+    end
+  end
+end