Message#from_s3 takes List instance

Author: amatsuda

app/models/message.rb

@@ -91,11 +91,11 @@ def from_mail(mail, list, list_seq)
   end
 
   class << self
-    def from_s3(list_name, list_seq, s3_client = Aws::S3::Client.new(region: BLADE_BUCKET_REGION))
-      obj = s3_client.get_object(bucket: BLADE_BUCKET_NAME, key: "#{list_name}/#{list_seq}")
+    def from_s3(list, list_seq, s3_client = Aws::S3::Client.new(region: BLADE_BUCKET_REGION))
+      obj = s3_client.get_object(bucket: BLADE_BUCKET_NAME, key: "#{list.name}/#{list_seq}")
 
       m = self.from_string(obj.body.read)
-      m.list_id = List.find_by_name(list_name).id
+      m.list_id = list.id
       m.list_seq = list_seq
       m
     end
@@ -140,7 +140,7 @@ def count_recursively(count = 0)
   end
 
   def reload_from_s3(s3_client = Aws::S3::Client.new(region: BLADE_BUCKET_REGION))
-    m = Message.from_s3(List.find(self.list_id).name, self.list_seq, s3_client)
+    m = Message.from_s3(List.find(self.list_id), self.list_seq, s3_client)
 
     self.body = m.body
     self.subject = m.subject

import.rb

@@ -7,19 +7,19 @@
   opts.on('--to TO', Integer)
 end.parse!(into: params)
 
-list = params[:list]
+list = List.find_by_name(params[:list])
 
 Message.transaction do
   (params[:from]..params[:to]).each do |seq|
     begin
       message = Message.from_s3(list, seq)
       message.save!
     rescue ActiveRecord::RecordNotUnique
-      STDERR.puts("#{list}:#{seq} already exists in Postgres")
+      STDERR.puts("#{list.name}:#{seq} already exists in Postgres")
     rescue Aws::S3::Errors::NoSuchKey
-      STDERR.puts("#{list}:#{seq} doesn't exist in S3")
+      STDERR.puts("#{list.name}:#{seq} doesn't exist in S3")
     rescue StandardError => e
-      STDERR.puts("failed to import #{list}:#{seq}: #{e}")
+      STDERR.puts("failed to import #{list.name}:#{seq}: #{e}")
     end
   end
 end

test/models/message_test.rb

@@ -38,7 +38,7 @@ class MessageTest < ActiveSupport::TestCase
 
 Hello, world!
 END_OF_BODY
-    Message.from_s3('ruby-list', 1234, s3_client)
+    Message.from_s3(List.find_by_name('ruby-list'), 1234, s3_client)
   end
 
   test 'reload_from_s3' do