Followup for issue zammad#1394 - Reindex elastic search not possible …

…because of <null>/Twitter::NullObject.

app/models/observer/ticket/article/communicate_sms/background_job.rb

@@ -6,6 +6,7 @@ def initialize(id)
   def perform
     article = Ticket::Article.find(@article_id)
 
+    # set retry count
     article.preferences['delivery_retry'] ||= 0
     article.preferences['delivery_retry'] += 1
 

app/models/observer/ticket/article/communicate_telegram/background_job.rb

@@ -7,8 +7,8 @@ def perform
     article = Ticket::Article.find(@article_id)
 
     # set retry count
-    record.preferences['delivery_retry'] ||= 0
-    record.preferences['delivery_retry'] += 1
+    article.preferences['delivery_retry'] ||= 0
+    article.preferences['delivery_retry'] += 1
 
     ticket = Ticket.lookup(id: article.ticket_id)
     log_error(article, "Can't find ticket.preferences for Ticket.find(#{article.ticket_id})") if !ticket.preferences

app/models/observer/ticket/article/communicate_twitter/background_job.rb

@@ -7,8 +7,8 @@ def perform
     article = Ticket::Article.find(@article_id)
 
     # set retry count
-    record.preferences['delivery_retry'] ||= 0
-    record.preferences['delivery_retry'] += 1
+    article.preferences['delivery_retry'] ||= 0
+    article.preferences['delivery_retry'] += 1
 
     ticket = Ticket.lookup(id: article.ticket_id)
     log_error(article, "Can't find ticket.preferences for Ticket.find(#{article.ticket_id})") if !ticket.preferences
@@ -62,7 +62,7 @@ def perform
           mention_ids.push user.id
         end
         article.to = to
-        article.preferences['twitter'] = {
+        article.preferences['twitter'] = TweetBase.preferences_cleanup(
           mention_ids: mention_ids,
           geo: tweet.geo,
           retweeted: tweet.retweeted?,
@@ -74,7 +74,7 @@ def perform
           favorited: tweet.favorited?,
           truncated: tweet.truncated?,
           created_at: tweet.created_at,
-        }
+        )
       end
     else
       raise "Unknown tweet type '#{tweet.class}'"

db/migrate/20180628000001_fixed_twitter_ticket_article_preferences5.rb → db/migrate/20180806000001_fixed_twitter_ticket_article_preferences6.rb

@@ -1,4 +1,4 @@
-class FixedTwitterTicketArticlePreferences5 < ActiveRecord::Migration[5.0]
+class FixedTwitterTicketArticlePreferences6 < ActiveRecord::Migration[5.0]
   def up
 
     # return if it's a new setup
@@ -21,7 +21,7 @@ def up
             next
           end
           if sub_level.class == Twitter::Place || sub_level.class == Twitter::Geo
-            value[sub_key] = sub_level.attrs
+            value[sub_key] = sub_level.to_h
             changed = true
             next
           end
@@ -31,6 +31,17 @@ def up
           changed = true
         end
       end
+
+      if article.preferences[:twitter]&.key?(:geo) && article.preferences[:twitter][:geo].nil?
+        article.preferences[:twitter][:geo] = {}
+        changed = true
+      end
+
+      if article.preferences[:twitter]&.key?(:place) && article.preferences[:twitter][:place].nil?
+        article.preferences[:twitter][:place] = {}
+        changed = true
+      end
+
       next if !changed
 
       article.save!

lib/tweet_base.rb

@@ -208,7 +208,7 @@ def to_article(tweet, user, ticket, channel)
     end
 
     article_preferences = {
-      twitter: twitter_preferences,
+      twitter: self.class.preferences_cleanup(twitter_preferences),
       links: [
         {
           url: "https://twitter.com/statuses/#{tweet.id}",
@@ -228,7 +228,7 @@ def to_article(tweet, user, ticket, channel)
       type_id:     Ticket::Article::Type.find_by(name: article_type).id,
       sender_id:   Ticket::Article::Sender.find_by(name: 'Customer').id,
       internal:    false,
-      preferences: preferences_cleanup(article_preferences),
+      preferences: article_preferences,
     )
   end
 
@@ -366,7 +366,7 @@ def direct_message_limit_reached(tweet, factor = 1)
     false
   end
 
-  def preferences_cleanup(preferences)
+  def self.preferences_cleanup(preferences)
 
     # replace Twitter::NullObject with nill to prevent elasticsearch index issue
     preferences.each_value do |value|
@@ -378,14 +378,22 @@ def preferences_cleanup(preferences)
           next
         end
         if sub_level.class == Twitter::Place || sub_level.class == Twitter::Geo
-          value[sub_key] = sub_level.attrs
+          value[sub_key] = sub_level.to_h
           next
         end
         next if sub_level.class != Twitter::NullObject
 
         value[sub_key] = nil
       end
     end
+
+    if preferences[:geo].blank?
+      preferences[:geo] = {}
+    end
+    if preferences[:place].blank?
+      preferences[:place] = {}
+    end
+
     preferences
   end
 

test/unit/ticket_article_twitter_test.rb

@@ -56,7 +56,7 @@ class TicketArticleTwitter < ActiveSupport::TestCase
       from: '@example',
       body: 'some tweet',
       internal: false,
-      preferences: TweetBase.new.preferences_cleanup(preferences),
+      preferences: TweetBase.preferences_cleanup(preferences),
       updated_by_id: 1,
       created_by_id: 1,
     )
@@ -97,7 +97,7 @@ class TicketArticleTwitter < ActiveSupport::TestCase
       from: '@example',
       body: 'some tweet',
       internal: false,
-      preferences: TweetBase.new.preferences_cleanup(preferences),
+      preferences: TweetBase.preferences_cleanup(preferences),
       updated_by_id: 1,
       created_by_id: 1,
     )