Add some basic specs and refactor model and validations

3 files changed, 15 insertions, 11 deletions

diff --git a/db/migrate/20170927161718_create_gpg_key_subkeys.rb b/db/migrate/20170927161718_create_gpg_key_subkeys.rb
index 9f69e299874..ffe06ce1231 100644
--- a/db/migrate/20170927161718_create_gpg_key_subkeys.rb
+++ b/db/migrate/20170927161718_create_gpg_key_subkeys.rb
@@ -1,11 +1,23 @@
 class CreateGpgKeySubkeys < ActiveRecord::Migration
   DOWNTIME = false
 
-  def change
+  def up
     create_table :gpg_key_subkeys do |t|
       t.binary :keyid
       t.binary :fingerprint
+
       t.references :gpg_key, null: false, index: true, foreign_key: { on_delete: :cascade }
+
+      t.index :keyid, unique: true, length: Gitlab::Database.mysql? ? 20 : nil
+      t.index :fingerprint, unique: true, length: Gitlab::Database.mysql? ? 20 : nil
     end
+
+    add_reference :gpg_signatures, :gpg_key_subkey, index: true, foreign_key: { on_delete: :nullify }
+  end
+
+  def down
+    remove_reference(:gpg_signatures, :gpg_key_subkey, index: true, foreign_key: true)
+
+    drop_table :gpg_key_subkeys
   end
 end
diff --git a/db/migrate/20170927232658_add_gpg_key_subkey_id_to_gpg_signatures.rb b/db/migrate/20170927232658_add_gpg_key_subkey_id_to_gpg_signatures.rb
deleted file mode 100644
index 74b43d732d5..00000000000
--- a/db/migrate/20170927232658_add_gpg_key_subkey_id_to_gpg_signatures.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# See http://doc.gitlab.com/ce/development/migration_style_guide.html
-# for more information on how to write migrations for GitLab.
-
-class AddGpgKeySubkeyIdToGpgSignatures < ActiveRecord::Migration
-  DOWNTIME = false
-
-  def change
-    add_reference(:gpg_signatures, :gpg_key_subkey, index: true, foreign_key: { on_delete: :nullify })
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 0beebc16cbb..b9de70b742a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -585,7 +585,9 @@ ActiveRecord::Schema.define(version: 20171004121444) do
     t.integer "gpg_key_id", null: false
   end
 
+  add_index "gpg_key_subkeys", ["fingerprint"], name: "index_gpg_key_subkeys_on_fingerprint", unique: true, using: :btree
   add_index "gpg_key_subkeys", ["gpg_key_id"], name: "index_gpg_key_subkeys_on_gpg_key_id", using: :btree
+  add_index "gpg_key_subkeys", ["keyid"], name: "index_gpg_key_subkeys_on_keyid", unique: true, using: :btree
 
   create_table "gpg_keys", force: :cascade do |t|
     t.datetime_with_timezone "created_at", null: false