Refactor id resolving method to a more generic function

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/storage.rb b/lib/storage.rb
index 660b300..37083fa 100644
--- a/lib/storage.rb
+++ b/lib/storage.rb
@@ -93,8 +93,8 @@ module Ag::Storage
     content
   end
 
-  def resolve_message_id(list, message_id = nil)
-    return nil if message_id == nil
+  def resolve_by_field(list, field, value)
+    return nil if value == nil
 
     result = $es.search(
       index: 'ml-' + list,
@@ -102,7 +102,7 @@ module Ag::Storage
         query: {
           filtered: {
             filter: {
-              term: { raw_message_id: message_id }
+              term: { field => value }
             }
           }
         },
@@ -111,10 +111,17 @@ module Ag::Storage
     )
 
     return nil if result['hits']['total'] == 0
-
     result['hits']['hits'].first['_id']
   end
 
+  def resolve_message_id(list, message_id = nil)
+    resolve_by_field(list, :raw_message_id, message_id)
+  end
+
+  def resolve_filename(list, filename)
+    resolve_by_field(list, :raw_filename, filename)
+  end
+
   def store(list, message, filename)
     content = get_content(message, filename)