1 files changed, 144 insertions, 81 deletions

diff --git a/spec/finders/abuse_reports_finder_spec.rb b/spec/finders/abuse_reports_finder_spec.rb
index ee93d042ca2..0b641d0cb08 100644
--- a/spec/finders/abuse_reports_finder_spec.rb
+++ b/spec/finders/abuse_reports_finder_spec.rb
@@ -2,142 +2,205 @@
 
 require 'spec_helper'
 
-RSpec.describe AbuseReportsFinder, '#execute' do
-  let_it_be(:user1) { create(:user) }
-  let_it_be(:user2) { create(:user) }
-  let_it_be(:reporter) { create(:user) }
-  let_it_be(:abuse_report_1) { create(:abuse_report, id: 20, category: 'spam', user: user1) }
-  let_it_be(:abuse_report_2) do
-    create(:abuse_report, :closed, id: 30, category: 'phishing', user: user2, reporter: reporter)
-  end
+RSpec.describe AbuseReportsFinder, feature_category: :insider_threat do
+  let_it_be(:user_1) { create(:user) }
+  let_it_be(:user_2) { create(:user) }
 
-  let(:params) { {} }
+  let_it_be(:reporter_1) { create(:user) }
+  let_it_be(:reporter_2) { create(:user) }
 
-  subject { described_class.new(params).execute }
+  let_it_be(:abuse_report_1) do
+    create(:abuse_report, :open, category: 'spam', user: user_1, reporter: reporter_1, id: 1)
+  end
 
-  context 'when params is empty' do
-    it 'returns all abuse reports' do
-      expect(subject).to match_array([abuse_report_1, abuse_report_2])
-    end
+  let_it_be(:abuse_report_2) do
+    create(:abuse_report, :closed, category: 'phishing', user: user_2, reporter: reporter_2, id: 2)
   end
 
-  context 'when params[:user_id] is present' do
-    let(:params) { { user_id: user2 } }
+  let(:params) { {} }
 
-    it 'returns abuse reports for the specified user' do
-      expect(subject).to match_array([abuse_report_2])
-    end
-  end
+  subject(:finder) { described_class.new(params).execute }
 
-  shared_examples 'returns filtered reports' do |filter_field|
-    it "returns abuse reports filtered by #{filter_field}_id" do
-      expect(subject).to match_array(filtered_reports)
+  describe '#execute' do
+    context 'when params is empty' do
+      it 'returns all abuse reports' do
+        expect(finder).to match_array([abuse_report_1, abuse_report_2])
+      end
     end
 
-    context "when no user has username = params[:#{filter_field}]" do
-      before do
-        allow(User).to receive_message_chain(:by_username, :pick)
-          .with(params[filter_field])
-          .with(:id)
-          .and_return(nil)
+    shared_examples 'returns filtered reports' do |filter_field|
+      it "returns abuse reports filtered by #{filter_field}_id" do
+        expect(finder).to match_array(filtered_reports)
       end
 
-      it 'returns all abuse reports' do
-        expect(subject).to match_array([abuse_report_1, abuse_report_2])
+      context "when no user has username = params[:#{filter_field}]" do
+        before do
+          allow(User).to receive_message_chain(:by_username, :pick)
+            .with(params[filter_field])
+            .with(:id)
+            .and_return(nil)
+        end
+
+        it 'returns all abuse reports' do
+          expect(finder).to match_array([abuse_report_1, abuse_report_2])
+        end
       end
     end
-  end
 
-  context 'when params[:user] is present' do
-    it_behaves_like 'returns filtered reports', :user do
-      let(:params) { { user: user1.username } }
-      let(:filtered_reports) { [abuse_report_1] }
+    context 'when params[:user] is present' do
+      it_behaves_like 'returns filtered reports', :user do
+        let(:params) { { user: user_1.username } }
+        let(:filtered_reports) { [abuse_report_1] }
+      end
     end
-  end
 
-  context 'when params[:reporter] is present' do
-    it_behaves_like 'returns filtered reports', :reporter do
-      let(:params) { { reporter: reporter.username } }
-      let(:filtered_reports) { [abuse_report_2] }
+    context 'when params[:reporter] is present' do
+      it_behaves_like 'returns filtered reports', :reporter do
+        let(:params) { { reporter: reporter_1.username } }
+        let(:filtered_reports) { [abuse_report_1] }
+      end
     end
-  end
 
-  context 'when params[:status] is present' do
-    context 'when value is "open"' do
+    context 'when params[:status] = open' do
       let(:params) { { status: 'open' } }
 
       it 'returns only open abuse reports' do
-        expect(subject).to match_array([abuse_report_1])
+        expect(finder).to match_array([abuse_report_1])
       end
     end
 
-    context 'when value is "closed"' do
+    context 'when params[:status] = closed' do
       let(:params) { { status: 'closed' } }
 
       it 'returns only closed abuse reports' do
-        expect(subject).to match_array([abuse_report_2])
+        expect(finder).to match_array([abuse_report_2])
       end
     end
 
-    context 'when value is not a valid status' do
+    context 'when params[:status] is not a valid status' do
       let(:params) { { status: 'partial' } }
 
       it 'defaults to returning open abuse reports' do
-        expect(subject).to match_array([abuse_report_1])
+        expect(finder).to match_array([abuse_report_1])
       end
     end
 
-    context 'when abuse_reports_list feature flag is disabled' do
-      before do
-        stub_feature_flags(abuse_reports_list: false)
-      end
+    context 'when params[:category] is present' do
+      let(:params) { { category: 'phishing' } }
 
-      it 'does not filter by status' do
-        expect(subject).to match_array([abuse_report_1, abuse_report_2])
+      it 'returns abuse reports with the specified category' do
+        expect(subject).to match_array([abuse_report_2])
       end
     end
-  end
 
-  context 'when params[:category] is present' do
-    let(:params) { { category: 'phishing' } }
+    describe 'aggregating reports' do
+      context 'when multiple open reports exist' do
+        let(:params) { { status: 'open' } }
 
-    it 'returns abuse reports with the specified category' do
-      expect(subject).to match_array([abuse_report_2])
-    end
-  end
+        # same category and user as abuse_report_1 -> will get aggregated
+        let_it_be(:abuse_report_3) do
+          create(:abuse_report, :open, category: abuse_report_1.category, user: abuse_report_1.user, id: 3)
+        end
 
-  describe 'sorting' do
-    let(:params) { { sort: 'created_at_asc' } }
+        # different category, but same user as abuse_report_1 -> won't get aggregated
+        let_it_be(:abuse_report_4) do
+          create(:abuse_report, :open, category: 'phishing', user: abuse_report_1.user, id: 4)
+        end
 
-    it 'returns reports sorted by the specified sort attribute' do
-      expect(subject).to eq [abuse_report_1, abuse_report_2]
-    end
+        it 'aggregates open reports by user and category' do
+          expect(finder).to match_array([abuse_report_1, abuse_report_4])
+        end
+
+        it 'sorts by aggregated_count in descending order and created_at in descending order' do
+          expect(finder).to eq([abuse_report_1, abuse_report_4])
+        end
+
+        it 'returns count with aggregated reports' do
+          expect(finder[0].count).to eq(2)
+        end
+
+        context 'when a different sorting attribute is given' do
+          let(:params) { { status: 'open', sort: 'created_at_desc' } }
 
-    context 'when sort is not specified' do
-      let(:params) { {} }
+          it 'returns reports sorted by the specified sort attribute' do
+            expect(subject).to eq([abuse_report_4, abuse_report_1])
+          end
+        end
 
-      it "returns reports sorted by #{described_class::DEFAULT_SORT}" do
-        expect(subject).to eq [abuse_report_2, abuse_report_1]
+        context 'when params[:sort] is invalid' do
+          let(:params) { { status: 'open', sort: 'invalid' } }
+
+          it 'sorts reports by aggregated_count in descending order' do
+            expect(finder).to eq([abuse_report_1, abuse_report_4])
+          end
+        end
       end
-    end
 
-    context 'when sort is not supported' do
-      let(:params) { { sort: 'superiority' } }
+      context 'when multiple closed reports exist' do
+        let(:params) { { status: 'closed' } }
+
+        # same user and category as abuse_report_2 -> won't get aggregated
+        let_it_be(:abuse_report_5) do
+          create(:abuse_report, :closed, category: abuse_report_2.category, user: abuse_report_2.user, id: 5)
+        end
+
+        it 'does not aggregate closed reports' do
+          expect(finder).to match_array([abuse_report_2, abuse_report_5])
+        end
+
+        it 'sorts reports by created_at in descending order' do
+          expect(finder).to eq([abuse_report_5, abuse_report_2])
+        end
+
+        context 'when a different sorting attribute is given' do
+          let(:params) { { status: 'closed', sort: 'created_at_asc' } }
 
-      it "returns reports sorted by #{described_class::DEFAULT_SORT}" do
-        expect(subject).to eq [abuse_report_2, abuse_report_1]
+          it 'returns reports sorted by the specified sort attribute' do
+            expect(subject).to eq([abuse_report_2, abuse_report_5])
+          end
+        end
+
+        context 'when params[:sort] is invalid' do
+          let(:params) { { status: 'closed', sort: 'invalid' } }
+
+          it 'sorts reports by created_at in descending order' do
+            expect(finder).to eq([abuse_report_5, abuse_report_2])
+          end
+        end
       end
     end
 
-    context 'when abuse_reports_list feature flag is disabled' do
-      let_it_be(:abuse_report_3) { create(:abuse_report, id: 10) }
-
+    context 'when legacy view is enabled' do
       before do
         stub_feature_flags(abuse_reports_list: false)
       end
 
-      it 'returns reports sorted by id in descending order' do
-        expect(subject).to eq [abuse_report_2, abuse_report_1, abuse_report_3]
+      context 'when params is empty' do
+        it 'returns all abuse reports' do
+          expect(subject).to match_array([abuse_report_1, abuse_report_2])
+        end
+      end
+
+      context 'when params[:user_id] is present' do
+        let(:params) { { user_id: user_1 } }
+
+        it 'returns abuse reports for the specified user' do
+          expect(subject).to match_array([abuse_report_1])
+        end
+      end
+
+      context 'when sorting' do
+        it 'returns reports sorted by id in descending order' do
+          expect(subject).to match_array([abuse_report_2, abuse_report_1])
+        end
+      end
+
+      context 'when any of the new filters are present such as params[:status]' do
+        let(:params) { { status: 'open' } }
+
+        it 'returns all abuse reports' do
+          expect(subject).to match_array([abuse_report_1, abuse_report_2])
+        end
       end
     end
   end