Merge pull request #495 from digineo/refactor_caller_id

Refactor Cti::CallerId

app/models/cti/caller_id.rb

@@ -18,22 +18,16 @@ module Cti
 =end
 
     def self.maybe_add(data)
-      records = Cti::CallerId.where(
+      record = find_or_initialize_by(
         caller_id: data[:caller_id],
         level:     data[:level],
         object:    data[:object],
         o_id:      data[:o_id],
         user_id:   data[:user_id],
       )
-      return if records[0]
+      return record if !record.new_record?
-      Cti::CallerId.create(
+      record.comment = data[:comment]
-        caller_id: data[:caller_id],
+      record.save!
-        comment: data[:comment],
-        level: data[:level],
-        object: data[:object],
-        o_id: data[:o_id],
-        user_id: data[:user_id],
-      )
     end
 
 =begin
@@ -47,28 +41,11 @@ returns
 =end
 
     def self.lookup(caller_id)
-      result = Cti::CallerId.where(
+      where(caller_id: caller_id)
-        caller_id: caller_id,
+        .group(:user_id, :id) \
-        level: 'known',
+        # first known, then maybe, last others
-      ).group(:user_id, :id).order(id: 'DESC').limit(20)
+        .order("level != 'known', level != 'maybe', id DESC")
-      if !result[0]
+        .limit(20)
-        result = Cti::CallerId.where(
-          caller_id: caller_id,
-          level: 'maybe',
-        ).group(:user_id, :id).order(id: 'DESC').limit(20)
-      end
-      if !result[0]
-        result = Cti::CallerId.where(
-          caller_id: caller_id,
-        ).order('id DESC').limit(20)
-      end
-
-      # in case do lookups in external sources
-      if !result[0]
-        # ...
-      end
-
-      result
     end
 
 =begin
@@ -145,9 +122,9 @@ returns
 =end
 
     def self.rebuild
-      Cti::CallerId.delete_all
+      transaction do
-      map = config
+        delete_all
-      map.each { |item|
+        config.each { |item|
           level = item[:level]
           model = item[:model]
           item[:model].find_each(batch_size: 500) do |record|
@@ -155,6 +132,7 @@ returns
           end
         }
       end
+    end
 
 =begin