Merge branch '213013_group_level_security_reports_schema_changes' into 'master'

Group level security reports schema changes

See merge request gitlab-org/gitlab!29498

db/migrate/20200414112444_add_group_id_to_vulnerability_exports.rb

+# frozen_string_literal: true
+
+class AddGroupIdToVulnerabilityExports < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    add_column :vulnerability_exports, :group_id, :integer
+    change_column_null :vulnerability_exports, :project_id, true
+  end
+end

db/migrate/20200414114611_add_group_id_index_and_fk_to_vulnerability_exports.rb

+# frozen_string_literal: true
+
+class AddGroupIdIndexAndFkToVulnerabilityExports < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  GROUP_ID_INDEX_NAME = 'index_vulnerability_exports_on_group_id_not_null'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index(:vulnerability_exports, :group_id, where: 'group_id IS NOT NULL', name: GROUP_ID_INDEX_NAME)
+    add_concurrent_foreign_key(:vulnerability_exports, :namespaces, column: :group_id)
+  end
+
+  def down
+    remove_foreign_key(:vulnerability_exports, column: :group_id)
+    remove_concurrent_index_by_name(:vulnerability_exports, GROUP_ID_INDEX_NAME)
+  end
+end

db/migrate/20200414115801_change_project_index_on_vulnerability_exports.rb

+# frozen_string_literal: true
+
+class ChangeProjectIndexOnVulnerabilityExports < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  OLD_INDEX_NAME = 'index_vulnerability_exports_on_project_id_and_id'
+  NEW_INDEX_NAME = 'index_vulnerability_exports_on_project_id_not_null'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index(:vulnerability_exports, :project_id, where: 'project_id IS NOT NULL', name: NEW_INDEX_NAME)
+    remove_concurrent_index_by_name(:vulnerability_exports, OLD_INDEX_NAME)
+  end
+
+  def down
+    add_concurrent_index(:vulnerability_exports, [:project_id, :id], unique: true, name: OLD_INDEX_NAME)
+    remove_concurrent_index_by_name(:vulnerability_exports, NEW_INDEX_NAME)
+  end
+end

db/structure.sql

@@ -6695,10 +6695,11 @@ CREATE TABLE public.vulnerability_exports (
     finished_at timestamp with time zone,
     status character varying(255) NOT NULL,
     file character varying(255),
-    project_id bigint NOT NULL,
+    project_id bigint,
     author_id bigint NOT NULL,
     file_store integer,
-    format smallint DEFAULT 0 NOT NULL
+    format smallint DEFAULT 0 NOT NULL,
+    group_id integer
 );
 
 CREATE SEQUENCE public.vulnerability_exports_id_seq
@@ -10487,7 +10488,9 @@ CREATE INDEX index_vulnerabilities_on_updated_by_id ON public.vulnerabilities US
 
 CREATE INDEX index_vulnerability_exports_on_author_id ON public.vulnerability_exports USING btree (author_id);
 
-CREATE UNIQUE INDEX index_vulnerability_exports_on_project_id_and_id ON public.vulnerability_exports USING btree (project_id, id);
+CREATE INDEX index_vulnerability_exports_on_group_id_not_null ON public.vulnerability_exports USING btree (group_id) WHERE (group_id IS NOT NULL);
+
+CREATE INDEX index_vulnerability_exports_on_project_id_not_null ON public.vulnerability_exports USING btree (project_id) WHERE (project_id IS NOT NULL);
 
 CREATE INDEX index_vulnerability_feedback_on_author_id ON public.vulnerability_feedback USING btree (author_id);
 
@@ -11026,6 +11029,9 @@ ALTER TABLE ONLY public.design_management_versions
 ALTER TABLE ONLY public.geo_event_log
     ADD CONSTRAINT fk_c1f241c70d FOREIGN KEY (upload_deleted_event_id) REFERENCES public.geo_upload_deleted_events(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY public.vulnerability_exports
+    ADD CONSTRAINT fk_c3d3cb5d0f FOREIGN KEY (group_id) REFERENCES public.namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY public.geo_event_log
     ADD CONSTRAINT fk_c4b1c1f66e FOREIGN KEY (repository_deleted_event_id) REFERENCES public.geo_repository_deleted_events(id) ON DELETE CASCADE;
 
@@ -13308,6 +13314,9 @@ COPY "schema_migrations" (version) FROM STDIN;
 20200411125656
 20200413072059
 20200413230056
+20200414112444
+20200414114611
+20200414115801
 20200414144547
 20200415153154
 20200415160722

ee/app/models/vulnerabilities/export.rb

@@ -4,7 +4,8 @@ module Vulnerabilities
   class Export < ApplicationRecord
     self.table_name = "vulnerability_exports"
 
-    belongs_to :project, optional: false
+    belongs_to :project
+    belongs_to :group
     belongs_to :author, optional: false, class_name: 'User'
 
     mount_uploader :file, AttachmentUploader
@@ -15,7 +16,8 @@ module Vulnerabilities
       csv: 0
     }
 
-    validates :project, presence: true
+    validates :project, presence: true, unless: :group
+    validates :group, presence: true, unless: :project
     validates :status, presence: true
     validates :format, presence: true
     validates :file, presence: true, if: :finished?

ee/changelogs/unreleased/213013_group_level_security_reports_schema_changes.yml

+---
+title: Add `group_id` column into vulnerability_exports table
+merge_request: 29498
+author:
+type: added

ee/spec/factories/vulnerabilities/exports.rb

@@ -33,5 +33,10 @@ FactoryBot.define do
       finished_at { Time.now }
       status { 'failed' }
     end
+
+    trait :group do
+      project { nil }
+      group
+    end
   end
 end

ee/spec/models/vulnerabilities/export_spec.rb

@@ -6,7 +6,8 @@ describe Vulnerabilities::Export do
   it { is_expected.to define_enum_for(:format) }
 
   describe 'associations' do
-    it { is_expected.to belong_to(:project).required }
+    it { is_expected.to belong_to(:project) }
+    it { is_expected.to belong_to(:group) }
     it { is_expected.to belong_to(:author).class_name('User').required }
   end
 
@@ -22,6 +23,16 @@ describe Vulnerabilities::Export do
 
       it { is_expected.to validate_presence_of(:file) }
     end
+
+    context 'when the group is not set' do
+      it { is_expected.to validate_presence_of(:project) }
+    end
+
+    context 'when the project is not set' do
+      subject { build(:vulnerability_export, :group) }
+
+      it { is_expected.to validate_presence_of(:group) }
+    end
   end
 
   describe '#status' do