Use statuses previously defined, improve message

- Remove unused index

app/models/alert_management/alert.rb

@@ -20,7 +20,6 @@ module AlertManagement
       resolved: 2,
       ignored: 3
     }.freeze
-    private_constant :STATUSES
 
     STATUS_DESCRIPTIONS = {
       triggered: 'Investigation has not started',

db/migrate/20210429024843_add_escalation_policies.rb

@@ -5,12 +5,11 @@ class AddEscalationPolicies < ActiveRecord::Migration[6.0]
 
   disable_ddl_transaction!
 
-  POLICY_PROJECT_INDEX_NAME = 'index_on_project_escalation_policy'
   UNIQUE_INDEX_NAME = 'index_on_project_id_escalation_policy_name_unique'
 
   def up
     create_table_with_constraints :incident_management_escalation_policies do |t|
-      t.references :project, index: { name: POLICY_PROJECT_INDEX_NAME }, null: false, foreign_key: { on_delete: :cascade }
+      t.references :project, index: false, null: false, foreign_key: { on_delete: :cascade }
       t.text :name, null: false
       t.text :description, null: true
 

db/structure.sql

@@ -23614,8 +23614,6 @@ CREATE INDEX index_on_pages_metadata_not_migrated ON project_pages_metadata USIN
 
 CREATE UNIQUE INDEX index_on_policy_schedule_status_elapsed_time_escalation_rules ON incident_management_escalation_rules USING btree (policy_id, oncall_schedule_id, status, elapsed_time);
 
-CREATE INDEX index_on_project_escalation_policy ON incident_management_escalation_policies USING btree (project_id);
-
 CREATE INDEX index_on_project_escalation_rule ON incident_management_escalation_rules USING btree (policy_id);
 
 CREATE UNIQUE INDEX index_on_project_id_escalation_policy_name_unique ON incident_management_escalation_policies USING btree (project_id, name);

ee/app/models/incident_management/escalation_rule.rb

@@ -7,13 +7,13 @@ module IncidentManagement
     belongs_to :policy, class_name: 'EscalationPolicy', inverse_of: 'rules', foreign_key: 'policy_id'
     belongs_to :oncall_schedule, class_name: 'OncallSchedule', inverse_of: 'rotations', foreign_key: 'oncall_schedule_id'
 
-    enum status: { acknowledged: 1, resolved: 2 }
+    enum status: AlertManagement::Alert::STATUSES.slice(:acknowledged, :resolved)
 
     validates :status, presence: true
     validates :elapsed_time,
               presence: true,
               numericality: { only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 24.hours }
 
-    validates :policy_id, uniqueness: { scope: [:oncall_schedule_id, :status, :elapsed_time] }
+    validates :policy_id, uniqueness: { scope: [:oncall_schedule_id, :status, :elapsed_time], message: _('Must have a unique policy, status, and elapsed time') }
   end
 end

ee/spec/models/incident_management/escalation_policy_spec.rb

@@ -7,6 +7,8 @@ RSpec.describe IncidentManagement::EscalationPolicy do
 
   subject { build(:incident_management_escalation_policy) }
 
+  it { is_expected.to be_valid }
+
   describe 'associations' do
     it { is_expected.to belong_to(:project) }
     it { is_expected.to have_many(:rules) }
@@ -14,6 +16,7 @@ RSpec.describe IncidentManagement::EscalationPolicy do
 
   describe 'validations' do
     it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_presence_of(:rules) }
     it { is_expected.to validate_uniqueness_of(:name).scoped_to(:project_id) }
     it { is_expected.to validate_length_of(:name).is_at_most(72) }
     it { is_expected.to validate_length_of(:description).is_at_most(160) }

ee/spec/models/incident_management/escalation_rule_spec.rb

@@ -8,6 +8,8 @@ RSpec.describe IncidentManagement::EscalationRule do
 
   subject { build(:incident_management_escalation_rule, policy: policy) }
 
+  it { is_expected.to be_valid }
+
   describe 'associations' do
     it { is_expected.to belong_to(:policy) }
     it { is_expected.to belong_to(:oncall_schedule) }
@@ -17,6 +19,6 @@ RSpec.describe IncidentManagement::EscalationRule do
     it { is_expected.to validate_presence_of(:status) }
     it { is_expected.to validate_presence_of(:elapsed_time) }
     it { is_expected.to validate_numericality_of(:elapsed_time).is_greater_than_or_equal_to(1).is_less_than_or_equal_to(24.hours) }
-    it { is_expected.to validate_uniqueness_of(:policy_id).scoped_to([:oncall_schedule_id, :status, :elapsed_time] ) }
+    it { is_expected.to validate_uniqueness_of(:policy_id).scoped_to([:oncall_schedule_id, :status, :elapsed_time] ).with_message('Must have a unique policy, status, and elapsed time') }
   end
 end

locale/gitlab.pot

@@ -21308,6 +21308,9 @@ msgstr ""
 msgid "Multiple uploaders found: %{uploader_types}"
 msgstr ""
 
+msgid "Must have a unique policy, status, and elapsed time"
+msgstr ""
+
 msgid "Must match with the %{codeStart}external_url%{codeEnd} in %{codeStart}/etc/gitlab/gitlab.rb%{codeEnd}."
 msgstr ""