zm-ruby-client 3.0.1 → 3.1.0

data/lib/zm/client/domain/domain_jsns_builder.rb

@@ -9,13 +9,13 @@ module Zm
       end
 
       def to_create
-        soap_request = SoapElement.admin(SoapAdminConstants::CREATE_DOMAIN_REQUEST)
-                                  .add_attribute(SoapConstants::NAME, @item.name)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::CREATE_DOMAIN_REQUEST)
+                                  .add_attribute(SoapRequest::SoapConstants::NAME, @item.name)
 
         attrs_only_set_h.each do |key, values|
           values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
+            node_attr = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::A)
+                                   .add_attribute(SoapRequest::SoapConstants::N, key)
                                    .add_content(value)
             soap_request.add_node(node_attr)
           end
@@ -25,12 +25,12 @@ module Zm
       end
 
       def to_update
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_DOMAIN_REQUEST)
-                                  .add_attribute(SoapConstants::ID, @item.id)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::MODIFY_DOMAIN_REQUEST)
+                                  .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
 
         attrs_only_set_h.each do |key, values|
           values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A).add_attribute(SoapConstants::N, key).add_content(value)
+            node_attr = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::A).add_attribute(SoapRequest::SoapConstants::N, key).add_content(value)
             soap_request.add_node(node_attr)
           end
         end
@@ -39,14 +39,14 @@ module Zm
       end
 
       def to_patch(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::MODIFY_DOMAIN_REQUEST)
-                                  .add_attribute(SoapConstants::ID, @item.id)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::MODIFY_DOMAIN_REQUEST)
+                                  .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
 
         hash.each do |key, values|
           values = [values] unless values.is_a?(Array)
           values.each do |value|
-            node_attr = SoapElement.create(SoapConstants::A)
-                                   .add_attribute(SoapConstants::N, key)
+            node_attr = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::A)
+                                   .add_attribute(SoapRequest::SoapConstants::N, key)
                                    .add_content(value)
             soap_request.add_node(node_attr)
           end
@@ -56,8 +56,8 @@ module Zm
       end
 
       def to_delete
-        SoapElement.admin(SoapAdminConstants::DELETE_DOMAIN_REQUEST)
-                   .add_attribute(SoapConstants::ID, @item.id)
+        SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::DELETE_DOMAIN_REQUEST)
+                   .add_attribute(SoapRequest::SoapConstants::ID, @item.id)
       end
 
       def attrs_only_set_h

data/lib/zm/client/domain/domains_collection.rb

@@ -7,7 +7,7 @@ module Zm
       def initialize(parent)
         @child_class = Domain
         @builder_class = DomainsBuilder
-        @search_type = SearchType::DOMAIN
+        @search_type = :domains
         super
       end
 
@@ -19,12 +19,12 @@ module Zm
       end
 
       def build_find_by(hash)
-        soap_request = SoapElement.admin(SoapAdminConstants::GET_DOMAIN_REQUEST)
-        node_domain = SoapElement.create(SoapConstants::DOMAIN)
-                                 .add_attribute(SoapConstants::BY, hash.keys.first)
+        soap_request = SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::GET_DOMAIN_REQUEST)
+        node_domain = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::DOMAIN)
+                                 .add_attribute(SoapRequest::SoapConstants::BY, hash.keys.first)
                                  .add_content(hash.values.first)
         soap_request.add_node(node_domain)
-        soap_request.add_attribute(SoapConstants::ATTRS, attrs_comma)
+        soap_request.add_attribute(SoapRequest::SoapConstants::ATTRS, attrs_comma)
         soap_request
       end
 
@@ -32,7 +32,14 @@ module Zm
 
       def reset_query_params
         super
-        @attrs = SearchType::Attributes::DOMAIN.dup
+        @attrs = %w[
+          description
+          zimbraDomainName
+          zimbraDomainStatus
+          zimbraId
+          zimbraDomainType
+          zimbraDomainDefaultCOSId
+        ]
       end
     end
   end

data/lib/zm/client/filter_rules/filter_rules_collection.rb

@@ -15,7 +15,7 @@ module Zm
       end
 
       def build_query
-        SoapElement.mail(SoapMailConstants::GET_FILTER_RULES_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::GET_FILTER_RULES_REQUEST)
       end
     end
   end

data/lib/zm/client/filter_rules/outgoing_filter_rules_collection.rb

@@ -11,7 +11,7 @@ module Zm
       end
 
       def build_query
-        SoapElement.mail(SoapMailConstants::GET_OUTGOING_FILTER_RULES_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::GET_OUTGOING_FILTER_RULES_REQUEST)
       end
     end
   end

data/lib/zm/client/folder/folder.rb

@@ -4,9 +4,11 @@ module Zm
   module Client
     # class for account folder
     class Folder < Base::Object
-      include BelongsToFolder
-      include RequestMethodsMailbox
+      include Zm::Utils::BelongsToFolder
+      include SoapRequest::RequestMethodsMailbox
       include MailboxItemConcern
+      extend Relationship
+      has_jsns_builder
 
       attr_accessor :type, :uuid, :name, :absFolderPath, :url, :luuid, :f, :view, :rev, :ms,
                     :webOfflineSyncDays, :activesyncdisabled, :n, :s, :i4ms, :i4next, :zid, :rid, :ruuid,
@@ -112,16 +114,16 @@ module Zm
       def build_add_message(eml, d = nil, f = nil, tn = nil)
         m = {
           l: id,
-          d: d,
-          f: f,
-          tn: tn,
+          d:,
+          f:,
+          tn:,
           content: { _content: eml }
         }
         m.compact!
 
-        attrs = { m: m }
+        attrs = { m: }
 
-        SoapElement.mail(SoapMailConstants::ADD_MSG_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::ADD_MSG_REQUEST)
                    .add_attributes(attrs)
       end
 
@@ -130,9 +132,9 @@ module Zm
       end
 
       def build_add_appointments(ics)
-        attrs = { l: id, ct: SoapConstants::TEXT_CALENDAR }
-        soap_request = SoapElement.mail(SoapMailConstants::IMPORT_APPOINTMENTS_REQUEST).add_attributes(attrs)
-        node_content = SoapElement.create(SoapConstants::CONTENT).add_content(ics)
+        attrs = { l: id, ct: SoapRequest::SoapConstants::TEXT_CALENDAR }
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::IMPORT_APPOINTMENTS_REQUEST).add_attributes(attrs)
+        node_content = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::CONTENT).add_content(ics)
         soap_request.add_node(node_content)
         soap_request
       end
@@ -142,13 +144,32 @@ module Zm
       end
 
       def build_add_contacts(csv)
-        attrs = { l: id, ct: SoapConstants::CSV }
-        soap_request = SoapElement.mail(SoapMailConstants::IMPORT_CONTACTS_REQUEST).add_attributes(attrs)
-        node_content = SoapElement.create(SoapConstants::CONTENT).add_content(csv)
+        attrs = { l: id, ct: SoapRequest::SoapConstants::CSV }
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::IMPORT_CONTACTS_REQUEST).add_attributes(attrs)
+        node_content = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::CONTENT).add_content(csv)
         soap_request.add_node(node_content)
         soap_request
       end
 
+      def export_contacts(csvfmt: nil, csvlocale: nil, csvsep: nil)
+        @parent.soap_connector
+               .invoke(build_export_contacts(csvfmt:, csvlocale:, csvsep:))
+               .dig(:ExportContactsResponse, :content)
+      end
+
+      def build_export_contacts(csvfmt: nil, csvlocale: nil, csvsep: nil)
+        attrs = {
+          l: id,
+          ct: SoapRequest::SoapConstants::CSV,
+          csvfmt:,
+          csvlocale:,
+          csvsep:
+        }
+        attrs.compact!
+
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::EXPORT_CONTACTS_REQUEST).add_attributes(attrs)
+      end
+
       def download(dest_file_path, fmt: nil)
         uploader = @parent.build_uploader
         uploader.download_folder(dest_file_path, id, fmt:)
@@ -158,14 +179,6 @@ module Zm
         uploader = @parent.build_uploader
         uploader.send_file(src_file_path, id, fmt:, type: view, resolve:)
       end
-
-      private
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = FolderJsnsBuilder.new(self)
-      end
     end
   end
 end

data/lib/zm/client/folder/folder_default.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    module FolderDefault
+      FolderData = Data.define(:id, :name, :path, :type)
+
+      ROOT = FolderData.new(1, '', '/', 'unknown')
+      INBOX = FolderData.new(2, 'Inbox', '/Inbox', 'message')
+      TRASH = FolderData.new(3, 'Trash', '/Trash', 'unknown')
+      JUNK = FolderData.new(4, 'Junk', '/Junk', 'message')
+      SENT = FolderData.new(5, 'Sent', '/Sent', 'message')
+      DRAFTS = FolderData.new(6, 'Drafts', '/Drafts', 'message')
+      CONTACTS = FolderData.new(7, 'Contacts', '/Contacts', 'contact')
+      CALENDAR = FolderData.new(10, 'Calendar', '/Calendar', 'appointment')
+      EMAILED = FolderData.new(13, 'Emailed Contacts', '/Emailed Contacts', 'contact')
+      CHATS = FolderData.new(14, 'Chats', '/Chats', 'message')
+      TASKS = FolderData.new(15, 'Tasks', '/Tasks', 'task')
+      BRIEFCASE = FolderData.new(16, 'Briefcase', '/Briefcase', 'document')
+
+      ALL = [
+        ROOT,
+        BRIEFCASE,
+        CALENDAR,
+        CHATS,
+        CONTACTS,
+        DRAFTS,
+        EMAILED,
+        INBOX,
+        JUNK,
+        SENT,
+        TASKS,
+        TRASH
+      ].freeze
+
+      IDS = ALL.map(&:id).freeze
+    end
+  end
+end

data/lib/zm/client/folder/folder_grant_jsns_builder.rb

@@ -19,11 +19,11 @@ module Zm
           action: {
             op: :grant,
             id: @item.folder_id,
-            grant: grant
+            grant:
           }
         }
 
-        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::FOLDER_ACTION_REQUEST)
                    .add_attributes(attrs)
       end
 
@@ -41,7 +41,7 @@ module Zm
           }
         }
 
-        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::FOLDER_ACTION_REQUEST)
                    .add_attributes(attrs)
       end
 

data/lib/zm/client/folder/folder_grants_collection.rb

@@ -4,7 +4,7 @@ module Zm
   module Client
     # class for folder retention policies collection
     class FolderGrantsCollection
-      include MissingMethodStaticCollection
+      include Zm::Utils::MissingMethodStaticCollection
 
       attr_reader :parent
 

data/lib/zm/client/folder/folder_jsns_builder.rb

@@ -3,10 +3,10 @@
 module Zm
   module Client
     # class for account folder jsns builder
-    class FolderJsnsBuilder < BaseAccountJsnsBuilder
+    class FolderJsnsBuilder < Base::BaseAccountJsnsBuilder
       def to_find
         attrs = { folder: { l: @item.id } }
-        SoapElement.mail(SoapMailConstants::GET_FOLDER_REQUEST).add_attributes(attrs)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::GET_FOLDER_REQUEST).add_attributes(attrs)
       end
 
       def to_jsns
@@ -22,9 +22,9 @@ module Zm
         }
         folder.compact!
 
-        attrs = { folder: folder }
+        attrs = { folder: }
 
-        SoapElement.mail(SoapMailConstants::CREATE_FOLDER_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::CREATE_FOLDER_REQUEST)
                    .add_attributes(attrs)
       end
 
@@ -50,9 +50,9 @@ module Zm
           action.delete(:l)
         end
 
-        attrs = { action: action }
+        attrs = { action: }
 
-        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::FOLDER_ACTION_REQUEST)
                    .add_attributes(attrs)
       end
 
@@ -62,14 +62,14 @@ module Zm
           id: @item.id
         }.merge(options)
 
-        attrs = { action: action }
+        attrs = { action: }
 
-        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::FOLDER_ACTION_REQUEST)
                    .add_attributes(attrs)
       end
 
       def to_retentionpolicy
-        retentionpolicy = @item.retention_policies.all.map { |rp| retentionpolicy_jsns(rp) }.reduce({}, :merge)
+        retentionpolicy = @item.retention_policies.all.each_with_object({}) { |rp, h| h.merge!(retentionpolicy_jsns(rp)) }
 
         attrs = {
           action: {
@@ -79,7 +79,7 @@ module Zm
           }
         }
 
-        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::FOLDER_ACTION_REQUEST)
                    .add_attributes(attrs)
       end
 
@@ -90,9 +90,9 @@ module Zm
           recursive: false
         }
 
-        attrs = { action: action }
+        attrs = { action: }
 
-        SoapElement.mail(SoapMailConstants::FOLDER_ACTION_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::FOLDER_ACTION_REQUEST)
                    .add_attributes(attrs)
       end
 

data/lib/zm/client/folder/folder_jsns_initializer.rb

@@ -55,7 +55,7 @@ module Zm
             end
           end
 
-          item.extend(DocumentFolder) if item.view == Zm::Client::FolderView::DOCUMENT
+          item.extend(ModDocumentFolder) if item.view == Zm::Client::FolderView::DOCUMENT
 
           item
         end

data/lib/zm/client/folder/folder_retention_policies_collection.rb

@@ -4,7 +4,7 @@ module Zm
   module Client
     # class for folder retention policies collection
     class FolderRetentionPoliciesCollection
-      include MissingMethodStaticCollection
+      include Zm::Utils::MissingMethodStaticCollection
 
       def initialize(parent)
         @parent = parent
@@ -25,12 +25,16 @@ module Zm
       end
 
       def save!
-        @parent.soap_connector.invoke(jsns_builder.to_retentionpolicy)
+        soap_connector.invoke(jsns_builder.to_retentionpolicy)
         true
       end
 
       private
 
+      def soap_connector
+        @parent.parent.soap_connector
+      end
+
       def jsns_builder
         return @jsns_builder if defined? @jsns_builder
 

data/lib/zm/client/folder/folder_view.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Zm
+  module Client
+    module FolderView
+      UNKNOWN = 'unknown'
+      MESSAGE = 'message'
+      APPOINTMENT = 'appointment'
+      TASK = 'task'
+      DOCUMENT = 'document'
+      CONTACT = 'contact'
+      ALL = [MESSAGE, APPOINTMENT, TASK, DOCUMENT, CONTACT].freeze
+    end
+  end
+end

data/lib/zm/client/folder/folders_jsns_builder.rb

@@ -18,7 +18,7 @@ module Zm
         }
         attrs.compact!
 
-        SoapElement.mail(SoapMailConstants::GET_FOLDER_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::GET_FOLDER_REQUEST)
                    .add_attributes(attrs)
       end
     end

data/lib/zm/client/folder/mod_document_folder.rb

@@ -1,22 +1,26 @@
 # frozen_string_literal: true
 
-module DocumentFolder
-  UUID_REGEX = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
+module Zm
+  module Client
+    module ModDocumentFolder
+      UUID_REGEX = /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
 
-  def upload(file_path)
-    uploader = @parent.build_uploader
-    str = uploader.upload_attachment(file_path)
+      def upload(file_path)
+        uploader = @parent.build_uploader
+        str = uploader.upload_attachment(file_path)
 
-    uuid = str.scan(UUID_REGEX).first
+        uuid = str.scan(UUID_REGEX).first
 
-    raise Zm::Client::RestError, 'failed to extract uuid' if uuid.nil?
+        raise Zm::Error::RestError, 'failed to extract uuid' if uuid.nil?
 
-    jsns = { doc: { l: @id, upload: { id: uuid } } }
+        jsns = { doc: { l: @id, upload: { id: uuid } } }
 
-    soap_request = Zm::Client::SoapElement.mail(Zm::Client::SoapMailConstants::SAVE_DOCUMENT_REQUEST)
-                                          .add_attributes(jsns)
-    rep = @parent.soap_connector.invoke(soap_request)
+        soap_request = Zm::SoapRequest::SoapElement.mail(Zm::SoapRequest::SoapMailConstants::SAVE_DOCUMENT_REQUEST)
+                                                   .add_attributes(jsns)
+        rep = @parent.soap_connector.invoke(soap_request)
 
-    Zm::Client::DocumentJsnsInitializer.create(@parent, rep[:SaveDocumentResponse][:doc].first)
+        Zm::Client::DocumentJsnsInitializer.create(@parent, rep[:SaveDocumentResponse][:doc].first)
+      end
+    end
   end
 end

data/lib/zm/client/identity/identities_collection.rb

@@ -15,7 +15,7 @@ module Zm
       end
 
       def build_query
-        SoapElement.account(SoapAccountConstants::GET_IDENTITIES_REQUEST)
+        SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::GET_IDENTITIES_REQUEST)
       end
     end
   end

data/lib/zm/client/identity/identity.rb

@@ -4,7 +4,9 @@ module Zm
   module Client
     # class account identity
     class Identity < Base::Object
-      include RequestMethodsMailbox
+      include SoapRequest::RequestMethodsMailbox
+      extend Relationship
+      has_jsns_builder
 
       attr_accessor :id, :name, :zimbraPrefIdentityName, :zimbraPrefFromDisplay, :zimbraPrefFromAddress,
                     :zimbraPrefFromAddressType, :zimbraPrefReplyToEnabled, :zimbraPrefReplyToDisplay,
@@ -34,14 +36,6 @@ module Zm
         yield(new_identity) if block_given?
         new_identity
       end
-
-      private
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = IdentityJsnsBuilder.new(self)
-      end
     end
   end
 end

data/lib/zm/client/identity/identity_jsns_builder.rb

@@ -9,32 +9,32 @@ module Zm
       end
 
       def to_jsns
-        soap_request = SoapElement.account(SoapAccountConstants::CREATE_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::CREATE_IDENTITY_REQUEST)
+        node_identity = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::IDENTITY)
                                    .add_attributes({ name: @item.name, _attrs: attrs })
         soap_request.add_node(node_identity)
         soap_request
       end
 
       def to_update
-        soap_request = SoapElement.account(SoapAccountConstants::MODIFY_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::MODIFY_IDENTITY_REQUEST)
+        node_identity = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::IDENTITY)
                                    .add_attributes({ id: @item.id, _attrs: attrs })
         soap_request.add_node(node_identity)
         soap_request
       end
 
       def to_patch(hash)
-        soap_request = SoapElement.account(SoapAccountConstants::MODIFY_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::MODIFY_IDENTITY_REQUEST)
+        node_identity = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::IDENTITY)
                                    .add_attributes({ id: @item.id, _attrs: hash })
         soap_request.add_node(node_identity)
         soap_request
       end
 
       def to_delete
-        soap_request = SoapElement.account(SoapAccountConstants::DELETE_IDENTITY_REQUEST)
-        node_identity = SoapElement.create(SoapConstants::IDENTITY)
+        soap_request = SoapRequest::SoapElement.account(Zm::SoapRequest::SoapAccountConstants::DELETE_IDENTITY_REQUEST)
+        node_identity = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::IDENTITY)
                                    .add_attributes({ id: @item.id })
         soap_request.add_node(node_identity)
         soap_request

data/lib/zm/client/{base/ldap_filter.rb → ldap_filter.rb}

@@ -3,7 +3,7 @@
 module Zm
   module Client
     class LdapFilter
-      include Zm::Inspector
+      include Zm::Utils::Inspector
 
       def initialize(base_filter = nil)
         @base_filter = base_filter

data/lib/zm/client/license/licenses_collection.rb

@@ -9,7 +9,7 @@ module Zm
       end
 
       def find
-        soap_request = SoapElement.admin(SoapAdminConstants::GET_LICENSE_REQUEST)
+        soap_request = Zm::SoapRequest::SoapElement.admin(Zm::SoapRequest::SoapAdminConstants::GET_LICENSE_REQUEST)
         entry = @parent.soap_admin_connector.invoke(soap_request)[:GetLicenseResponse][:license].first
         LicenseJsnsInitializer.create(@parent, entry)
       end

data/lib/zm/client/mailbox/mailbox_item_concern.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'mailbox_item_id'
-
 module Zm
   module Client
     module MailboxItemConcern

data/lib/zm/client/message/message.rb

@@ -4,10 +4,12 @@ module Zm
   module Client
     # class message for account
     class Message < Base::Object
-      include BelongsToFolder
-      include BelongsToTag
-      include RequestMethodsMailbox
+      include Zm::Utils::BelongsToFolder
+      include Zm::Utils::BelongsToTag
+      include SoapRequest::RequestMethodsMailbox
       include MailboxItemConcern
+      extend Relationship
+      has_jsns_builder
 
       attr_accessor :d, :f, :su, :fr, :autoSendTime, :mid, :idnt, :tn, :subject, :s
       attr_reader :recipients, :attachments, :body
@@ -15,14 +17,13 @@ module Zm
       alias size s
 
       def initialize(parent)
-        @parent = parent
         @subject = ''
 
-        @recipients = Recipients.new
+        @recipients = MessageRecipients.new
         @body = Body.new
-        @attachments = AttachmentsCollection.new
+        @attachments = MessageAttachmentsCollection.new
 
-        yield(self) if block_given?
+        super
       end
 
       def download(dest_file_path, fmt: 'eml')
@@ -44,7 +45,7 @@ module Zm
       def flags
         return @flags if defined? @flags
 
-        @flags = FlagsCollection.new(self)
+        @flags = MessageFlagsCollection.new(self)
       end
 
       def create!(*args)
@@ -66,14 +67,14 @@ module Zm
       def update!(attrs)
         authorized_keys = %i[l rgb color f tn]
 
-        attrs.reject! { |k| !authorized_keys.include?(k) }
+        attrs.select! { |k| authorized_keys.include?(k) }
 
-        attrs.merge!({ op: :update, id: id })
+        attrs.merge!({ op: :update, id: })
 
         attrs.compact!
 
-        soap_request = SoapElement.mail(SoapMailConstants::ITEM_ACTION_REQUEST)
-        node_action = SoapElement.create(SoapConstants::ACTION).add_attributes(attrs)
+        soap_request = SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::ITEM_ACTION_REQUEST)
+        node_action = SoapRequest::SoapElement.create(SoapRequest::SoapConstants::ACTION).add_attributes(attrs)
         soap_request.add_node(node_action)
         @parent.soap_connector.invoke(soap_request)
       end
@@ -107,7 +108,7 @@ module Zm
       end
 
       def build_send
-        SoapElement.mail(SoapMailConstants::SEND_MSG_REQUEST)
+        SoapRequest::SoapElement.mail(SoapRequest::SoapMailConstants::SEND_MSG_REQUEST)
                    .add_attributes(jsns_builder.to_jsns)
       end
 
@@ -115,12 +116,6 @@ module Zm
       class Body
         attr_accessor :text, :html
       end
-
-      def jsns_builder
-        return @jsns_builder if defined? @jsns_builder
-
-        @jsns_builder = MessageJsnsBuilder.new(self)
-      end
     end
   end
 end