Code cleanup.

app/models/application_model.rb

@@ -47,7 +47,7 @@ class ApplicationModel < ActiveRecord::Base
 
     # do noting, use id as it is
     return if !Setting.get('system_init_done')
-    return if Setting.get('import_mode') && import_class_list.include?( self.class.to_s )
+    return if Setting.get('import_mode') && import_class_list.include?(self.class.to_s)
 
     self[:id] = nil
   end
@@ -589,7 +589,7 @@ returns
 
   def self.latest_change
     key        = "#{new.class.name}_latest_change"
-    updated_at = Cache.get( key )
+    updated_at = Cache.get(key)
 
     # if we do not have it cached, do lookup
     if !updated_at
@@ -739,11 +739,13 @@ class OwnModel < ApplicationModel
 serve methode to configure and enable search index support for this model
 
 class Model < ApplicationModel
-  search_index_support ignore_attributes: {
-    create_article_type_id:   true,
-    create_article_sender_id: true,
-    article_count:            true,
-  }
+  search_index_support
+    ignore_attributes: {
+      create_article_type_id:   true,
+      create_article_sender_id: true,
+      article_count:            true,
+    },
+    ignore_ids: [1,2,4]
 
 end
 
@@ -763,11 +765,13 @@ update search index, if configured - will be executed automatically
 =end
 
   def search_index_update
-    return if !self.class.search_index_support_config
+    config = self.class.search_index_support_config
+    return if !config
+    return if config[:ignore_ids] && config[:ignore_ids].include?(id)
 
     # start background job to transfer data to search index
     return if !SearchIndexBackend.enabled?
-    Delayed::Job.enqueue( ApplicationModel::BackgroundJobSearchIndex.new( self.class.to_s, id ) )
+    Delayed::Job.enqueue(ApplicationModel::BackgroundJobSearchIndex.new(self.class.to_s, id))
   end
 
 =begin
@@ -780,7 +784,10 @@ delete search index object, will be executed automatically
 =end
 
   def search_index_destroy
-    return if !self.class.search_index_support_config
+    config = self.class.search_index_support_config
+    return if !config
+    return if config[:ignore_ids] && config[:ignore_ids].include?(id)
+
     SearchIndexBackend.remove(self.class.to_s, id)
   end
 
@@ -796,7 +803,7 @@ reload search index with full data
     return if !@search_index_support_config
     all_ids = select('id').all.order('created_at DESC')
     all_ids.each { |item_with_id|
-      item = find( item_with_id.id )
+      item = find(item_with_id.id)
       item.search_index_update_backend
     }
   end
@@ -979,10 +986,10 @@ log object update history with all updated attributes, if configured - will be e
         value_id[0] = value[0]
         value_id[1] = value[1]
 
-        if respond_to?( attribute_name ) && send(attribute_name)
+        if respond_to?(attribute_name) && send(attribute_name)
           relation_class = send(attribute_name).class
           if relation_class && value_id[0]
-            relation_model = relation_class.lookup( id: value_id[0] )
+            relation_model = relation_class.lookup(id: value_id[0])
             if relation_model
               if relation_model['name']
                 value_str[0] = relation_model['name']
@@ -992,7 +999,7 @@ log object update history with all updated attributes, if configured - will be e
             end
           end
           if relation_class && value_id[1]
-            relation_model = relation_class.lookup( id: value_id[1] )
+            relation_model = relation_class.lookup(id: value_id[1])
             if relation_model
               if relation_model['name']
                 value_str[1] = relation_model['name']
@@ -1059,7 +1066,7 @@ store attachments for this object
     self.attachments_buffer = attachments
 
     # update if object already exists
-    return if !( id && id != 0 )
+    return if !(id && id != 0)
 
     attachments_buffer_check
   end

app/models/application_model/history_log_base.rb

@@ -6,7 +6,7 @@ module ApplicationModel::HistoryLogBase
 create history entry for this object
 
   organization = Organization.find(123)
-  result = organization.history_log( 'created', user_id )
+  result = organization.history_log('created', user_id)
 
 returns
 
@@ -77,19 +77,19 @@ returns
 
   def history_get(fulldata = false)
     if !fulldata
-      return History.list( self.class.name, self['id'] )
+      return History.list(self.class.name, self['id'])
     end
 
     # get related objects
-    history = History.list( self.class.name, self['id'], nil, true )
+    history = History.list(self.class.name, self['id'], nil, true)
     history[:list].each {|item|
-      record = Kernel.const_get( item['object'] ).find( item['o_id'] )
+      record = Kernel.const_get(item['object']).find(item['o_id'])
 
-      history[:assets] = record.assets( history[:assets] )
+      history[:assets] = record.assets(history[:assets])
 
       if item['related_object']
-        record = Kernel.const_get( item['related_object'] ).find( item['related_o_id'] )
-        history[:assets] = record.assets( history[:assets] )
+        record = Kernel.const_get(item['related_object']).find(item['related_o_id'])
+        history[:assets] = record.assets(history[:assets])
       end
     }
     {

app/models/application_model/search_index_base.rb

@@ -74,7 +74,8 @@ returns
 
 lookup name of ref. objects
 
-  attributes = search_index_attribute_lookup(attributes, Ticket)
+  ticket = Ticket.find(123)
+  attributes = ticket.search_index_attribute_lookup(attributes, Ticket)
 
 returns
 
@@ -95,14 +96,14 @@ returns
       attribute_name = attribute_name[ 0, attribute_name.length - 3 ]
 
       # check if attribute method exists
-      next if !ref_object.respond_to?( attribute_name )
+      next if !ref_object.respond_to?(attribute_name)
 
       # check if method has own class
       relation_class = ref_object.send(attribute_name).class
       next if !relation_class
 
       # lookup ref object
-      relation_model = relation_class.lookup( id: value )
+      relation_model = relation_class.lookup(id: value)
       next if !relation_model
 
       # get name of ref object

app/models/authorization.rb

@@ -10,7 +10,7 @@ class Authorization < ApplicationModel
   validates     :provider, presence: true
 
   def self.find_from_hash(hash)
-    auth = Authorization.find_by( provider: hash['provider'], uid: hash['uid'] )
+    auth = Authorization.find_by(provider: hash['provider'], uid: hash['uid'])
     if auth
 
       # update auth tokens
@@ -28,7 +28,7 @@ class Authorization < ApplicationModel
 
       # update image if needed
       if hash['info']['image']
-        user = User.find( auth.user_id )
+        user = User.find(auth.user_id)
 
         # save/update avatar
         avatar = Avatar.add(

app/models/avatar.rb

@@ -62,7 +62,7 @@ add a avatar
 
     # lookups
     if data[:object]
-      object_id = ObjectLookup.by_name( data[:object] )
+      object_id = ObjectLookup.by_name(data[:object])
     end
 
     # add initial avatar
@@ -159,7 +159,7 @@ add a avatar
     end
 
     # check if avatar need to be updated
-    record[:store_hash] = Digest::MD5.hexdigest( data[:resize][:content] )
+    record[:store_hash] = Digest::MD5.hexdigest(data[:resize][:content])
     if avatar_already_exists && avatar_already_exists.store_hash == record[:store_hash]
       avatar_already_exists.touch
       return
@@ -179,7 +179,7 @@ add a avatar
         created_by_id: data[:created_by_id],
       )
       record[:store_full_id] = store_full.id
-      record[:store_hash]    = Digest::MD5.hexdigest( data[:full][:content] )
+      record[:store_hash]    = Digest::MD5.hexdigest(data[:full][:content])
     end
     if data[:resize]
       store_resize = Store.add(
@@ -193,7 +193,7 @@ add a avatar
         created_by_id: data[:created_by_id],
       )
       record[:store_resize_id] = store_resize.id
-      record[:store_hash]      = Digest::MD5.hexdigest( data[:resize][:content] )
+      record[:store_hash]      = Digest::MD5.hexdigest(data[:resize][:content] )
     end
 
     # update existing
@@ -218,8 +218,8 @@ set avatars as default
 
 =end
 
-  def self.set_default( object_name, o_id, avatar_id )
-    object_id = ObjectLookup.by_name( object_name )
+  def self.set_default(object_name, o_id, avatar_id)
+    object_id = ObjectLookup.by_name(object_name)
     avatar = Avatar.find_by(
       object_lookup_id: object_id,
       o_id: o_id,

app/models/observer/ticket/article/communicate_email.rb

@@ -9,15 +9,15 @@ class Observer::Ticket::Article::CommunicateEmail < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is customer, do not communication
-    sender = Ticket::Article::Sender.lookup( id: record.sender_id )
+    sender = Ticket::Article::Sender.lookup(id: record.sender_id)
     return 1 if sender.nil?
     return 1 if sender['name'] == 'Customer'
 
     # only apply on emails
-    type = Ticket::Article::Type.lookup( id: record.type_id )
+    type = Ticket::Article::Type.lookup(id: record.type_id)
     return if type['name'] != 'email'
 
     # send background job
-    Delayed::Job.enqueue( Observer::Ticket::Article::CommunicateEmail::BackgroundJob.new( record.id ) )
+    Delayed::Job.enqueue(Observer::Ticket::Article::CommunicateEmail::BackgroundJob.new(record.id))
   end
 end

app/models/observer/ticket/article/fillup_from_email.rb

@@ -9,22 +9,22 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is customer, do not change anything
-    sender = Ticket::Article::Sender.lookup( id: record.sender_id )
+    sender = Ticket::Article::Sender.lookup(id: record.sender_id)
     return if sender.nil?
     return if sender['name'] == 'Customer'
 
     # set email attributes
-    type = Ticket::Article::Type.lookup( id: record.type_id )
+    type = Ticket::Article::Type.lookup(id: record.type_id)
     return if type['name'] != 'email'
 
     # set subject if empty
-    ticket = Ticket.lookup( id: record.ticket_id )
+    ticket = Ticket.lookup(id: record.ticket_id)
     if !record.subject || record.subject == ''
       record.subject = ticket.title
     end
 
     # clean subject
-    record.subject = ticket.subject_clean( record.subject )
+    record.subject = ticket.subject_clean(record.subject)
 
     # generate message id, force it in prodution, in test allow to set it for testing reasons
     if !record.message_id || Rails.env.production?
@@ -43,7 +43,7 @@ class Observer::Ticket::Article::FillupFromEmail < ActiveRecord::Observer
     system_sender = "#{email_address.realname} <#{email_address.email}>"
     if Setting.get('ticket_define_email_from') == 'AgentNameSystemAddressName'
       seperator = Setting.get('ticket_define_email_from_seperator')
-      sender    = User.find( record.created_by_id )
+      sender    = User.find(record.created_by_id)
       record.from = "#{sender.firstname} #{sender.lastname} #{seperator} #{system_sender}"
     else
       record.from = system_sender

app/models/observer/ticket/article/signature_detection.rb

@@ -11,16 +11,16 @@ class Observer::Ticket::Article::SignatureDetection < ActiveRecord::Observer
     return if Setting.get('import_mode')
 
     # if sender is not customer, do not change anything
-    sender = Ticket::Article::Sender.lookup( id: record.sender_id )
+    sender = Ticket::Article::Sender.lookup(id: record.sender_id)
     return if !sender
     return if sender['name'] != 'Customer'
 
     # set email attributes
-    type = Ticket::Article::Type.lookup( id: record.type_id )
+    type = Ticket::Article::Type.lookup(id: record.type_id)
     return if type['name'] != 'email'
 
     # add queue job to update current signature of user id
-    Delayed::Job.enqueue( Observer::Ticket::Article::SignatureDetection::BackgroundJob.new( record.created_by_id ) )
+    Delayed::Job.enqueue(Observer::Ticket::Article::SignatureDetection::BackgroundJob.new(record.created_by_id))
 
     # user
     user = User.lookup(id: record.created_by_id)

app/models/observer/ticket/close_time.rb

@@ -22,8 +22,8 @@ class Observer::Ticket::CloseTime < ActiveRecord::Observer
     return true if record.close_time
 
     # check if ticket is closed now
-    state = Ticket::State.lookup( id: record.state_id )
-    state_type = Ticket::StateType.lookup( id: state.state_type_id )
+    state = Ticket::State.lookup(id: record.state_id)
+    state_type = Ticket::StateType.lookup(id: state.state_type_id)
     return true if state_type.name != 'closed'
 
     # set close_time

app/models/observer/ticket/notification.rb

@@ -27,7 +27,7 @@ class Observer::Ticket::Notification < ActiveRecord::Observer
     list_objects.each {|_ticket_id, item|
 
       # send background job
-      Delayed::Job.enqueue( Observer::Ticket::Notification::BackgroundJob.new( item, via_web ) )
+      Delayed::Job.enqueue(Observer::Ticket::Notification::BackgroundJob.new(item, via_web))
     }
   end
 
@@ -59,7 +59,7 @@ class Observer::Ticket::Notification < ActiveRecord::Observer
 
       # get current state of objects
       if event[:name] == 'Ticket::Article'
-        article = Ticket::Article.lookup( id: event[:id] )
+        article = Ticket::Article.lookup(id: event[:id])
 
         # next if article is already deleted
         next if !article
@@ -76,7 +76,7 @@ class Observer::Ticket::Notification < ActiveRecord::Observer
         end
 
       elsif event[:name] == 'Ticket'
-        ticket = Ticket.lookup( id: event[:id] )
+        ticket = Ticket.lookup(id: event[:id])
 
         # next if ticket is already deleted
         next if !ticket