Merge pull request #34967 from lifo/am-handle-duplicate-emails

Update test schema.rb to reflect the recent changes

4 files changed, 9 insertions, 10 deletions

diff --git a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
index 3537a983ef..2cde3db8a0 100644
--- a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
+++ b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb
@@ -28,8 +28,7 @@ module Rails
       end
 
       def create_inbound_email(mail)
-        ActionMailbox::InboundEmail.create! raw_email: \
-          { io: StringIO.new(mail.to_s), filename: "inbound.eml", content_type: "message/rfc822" }
+        ActionMailbox::InboundEmail.create_and_extract_message_id!(mail.to_s)
       end
   end
 end
diff --git a/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb b/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb
index e697748f82..550cc0e4e5 100644
--- a/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb
+++ b/actionmailbox/db/migrate/20180917164000_create_action_mailbox_tables.rb
@@ -8,7 +8,7 @@ class CreateActionMailboxTables < ActiveRecord::Migration[6.0]
       t.datetime :created_at, precision: 6, null: false
       t.datetime :updated_at, precision: 6, null: false
 
-      t.index [ :message_id, :message_checksum ], unique: true
+      t.index [ :message_id, :message_checksum ], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
     end
   end
 end
diff --git a/actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailroom_tables.rb b/actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailroom_tables.rb
index f587f37095..550cc0e4e5 100644
--- a/actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailroom_tables.rb
+++ b/actionmailbox/test/dummy/db/migrate/20180208205311_create_action_mailroom_tables.rb
@@ -5,10 +5,10 @@ class CreateActionMailboxTables < ActiveRecord::Migration[6.0]
       t.string  :message_id, null: false
       t.string  :message_checksum, null: false
 
-      t.datetime :created_at, precision: 6
-      t.datetime :updated_at, precision: 6
+      t.datetime :created_at, precision: 6, null: false
+      t.datetime :updated_at, precision: 6, null: false
 
-      t.index [ :message_id, :message_checksum ], unique: true
+      t.index [ :message_id, :message_checksum ], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
     end
   end
 end
diff --git a/actionmailbox/test/dummy/db/schema.rb b/actionmailbox/test/dummy/db/schema.rb
index 4aba92bfc6..8a11c3fbe1 100644
--- a/actionmailbox/test/dummy/db/schema.rb
+++ b/actionmailbox/test/dummy/db/schema.rb
@@ -14,10 +14,10 @@ ActiveRecord::Schema.define(version: 2018_02_12_164506) do
 
   create_table "action_mailbox_inbound_emails", force: :cascade do |t|
     t.integer "status", default: 0, null: false
-    t.string "message_id"
-    t.string "message_checksum"
-    t.datetime "created_at", precision: 6
-    t.datetime "updated_at", precision: 6
+    t.string "message_id", null: false
+    t.string "message_checksum", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.index ["message_id", "message_checksum"], name: "index_action_mailbox_inbound_emails_uniqueness", unique: true
   end