various review comments

arkirchner · arkirchner · commit 7897f3c01363 · 2025-06-12T15:13:34.000+02:00
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
diff --git a/app/controllers/request_for_comments_controller.rb b/app/controllers/request_for_comments_controller.rb
@@ -2,7 +2,7 @@
 
 class RequestForCommentsController < ApplicationController
   include CommonBehavior
-  before_action :set_request_for_comment, only: %i[show mark_as_solved set_thank_you_note clear_question]
+  before_action :set_request_for_comment, only: %i[show mark_as_solved set_thank_you_note clear_question report]
   before_action :set_study_group_grouping,
     only: %i[index my_comment_requests rfcs_with_my_comments rfcs_for_exercise]
 
@@ -162,6 +162,15 @@ def create
     authorize!
   end
 
+  # POST /request_for_comments/1/report
+  def report
+    authorize!
+
+    ReportMailer.with(reported_content: @request_for_comment).report_content.deliver_later
+
+    redirect_to(request_for_comment_path(@request_for_comment), notice: t('.report.reported'))
+  end
+
   private
 
   # Use callbacks to share common setup or constraints between actions.
diff --git a/app/policies/report_policy.rb b/app/policies/report_policy.rb
diff --git a/app/policies/request_for_comment_policy.rb b/app/policies/request_for_comment_policy.rb
@@ -41,6 +41,16 @@ def rfcs_with_my_comments?
     everyone
   end
 
+  def report?
+    report_receiver_configured? && !author?
+  end
+
+  private
+
+  def report_receiver_configured?
+    CodeOcean::Config.new(:code_ocean).read.dig(:content_moderation, :report_emails).present?
+  end
+
   def rfc_visibility
     # The consumer with the most restricted visibility determines the visibility of the RfC
     case [@user.consumer.rfc_visibility, @record.author.consumer.rfc_visibility]
diff --git a/app/views/reports/_button.html.slim b/app/views/reports/_button.html.slim
diff --git a/app/views/request_for_comments/_report.html.slim b/app/views/request_for_comments/_report.html.slim
@@ -0,0 +1,4 @@
+.text-end
+  = button_to t('.report'), report_request_for_comment_path(request_for_comment),
+      data: {confirm: t('.confirm')},
+      class: 'btn btn-light btn-sm'
diff --git a/app/views/request_for_comments/show.html.slim b/app/views/request_for_comments/show.html.slim
@@ -28,8 +28,8 @@
       .text
         - question = @request_for_comment.question
         = question.presence || t('request_for_comments.no_question')
-      .text-end
-        = render('reports/button', reported_content: @request_for_comment)
+      - if policy(@request_for_comment).report?
+        = render('report', request_for_comment: @request_for_comment)
 
     - if policy(@request_for_comment).mark_as_solved? && !@request_for_comment.solved?
       = render('mark_as_solved')
diff --git a/config/locales/de/report.yml b/config/locales/de/report.yml
@@ -5,7 +5,3 @@ de:
       prolog: 'Die folgenden Inhalte wurden als unangemessen gemeldet:'
       subject: 'Spam Report: Ein %{content_name} in CodeOcean wurde als unangemessen markiert.'
       take_action: Bitte ergreifen Sie gegebenenfalls Maßnahmen.
-  reports:
-    confirm: Möchten Sie diesen Inhalt melden?
-    report: Melden
-    reported: Vielen Dank, dass Sie uns auf dieses Problem aufmerksam gemacht haben. Wir werden uns in Kürze darum kümmern.
diff --git a/config/locales/de/request_for_comment.yml b/config/locales/de/request_for_comment.yml
@@ -42,6 +42,10 @@ de:
     no_output: Keine Ausgabe.
     no_question: Der/die Autor:in hat keine Frage zu dieser Anfrage gestellt.
     passed: Erfolgreich
+    report:
+      confirm: Möchten Sie diesen Inhalt melden?
+      report: Melden
+      reported: Vielen Dank, dass Sie uns auf dieses Problem aufmerksam gemacht haben. Wir werden uns in Kürze darum kümmern.
     runtime_output: Programmausgabe
     send_thank_you_note: Senden
     show_all: Alle Anfragen anzeigen
diff --git a/config/locales/en/report.yml b/config/locales/en/report.yml
@@ -5,7 +5,3 @@ en:
       prolog: 'The following content has been reported as inappropriate:'
       subject: 'Spam Report: A %{content_name} on CodeOcean has been marked as inappropriate.'
       take_action: Please take action if required.
-  reports:
-    confirm: Do you want to report this content?
-    report: Report
-    reported: Thank you for letting us know about this issue. We will look into the matter shorty.
diff --git a/config/locales/en/request_for_comment.yml b/config/locales/en/request_for_comment.yml
@@ -42,6 +42,10 @@ en:
     no_output: No output.
     no_question: The author did not enter a question for this request.
     passed: Passed
+    report:
+      confirm: Do you want to report this content?
+      report: Report
+      reported: Thank you for letting us know about this issue. We will look into the matter shortly.
     runtime_output: Runtime Output
     send_thank_you_note: Send
     show_all: All requests
diff --git a/config/routes.rb b/config/routes.rb
@@ -21,6 +21,7 @@
       get :mark_as_solved, defaults: {format: :json}
       post :set_thank_you_note, defaults: {format: :json}
       post :clear_question
+      post :report
     end
   end
   resources :comments, defaults: {format: :json}
@@ -150,8 +151,6 @@
 
   match '/forgot_password', as: 'forgot_password', to: 'internal_users#forgot_password', via: %i[get post]
 
-  resources :reports, only: :create
-
   resources :sessions, only: %i[create destroy new]
   resources :webauthn_credential_authentication, only: %i[new create]
 
diff --git a/spec/factories/comment.rb b/spec/factories/comment.rb
@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :comment do
     file { create(:rfc).file }
-    factory :learner
+    user factory: :learner
     row { 1 }
     text { "comment on file #{file.id} on #{row}" }
   end
diff --git a/spec/policies/report_policy_spec.rb b/spec/policies/report_policy_spec.rb
diff --git a/spec/policies/request_for_comment_policy_spec.rb b/spec/policies/request_for_comment_policy_spec.rb
@@ -307,4 +307,26 @@
       end
     end
   end
+
+  permissions(:report?) do
+    let(:user) { build_stubbed(:external_user) }
+
+    it 'allows anyone to report RfCs' do
+      %i[admin external_user teacher].each do |factory_name|
+        expect(policy).to permit(create(factory_name), Comment.new)
+      end
+    end
+
+    it 'dose not allow reports when no report email is configured' do
+      codeocean_config = instance_double(CodeOcean::Config)
+      allow(CodeOcean::Config).to receive(:new).with(:code_ocean).and_return(codeocean_config)
+      allow(codeocean_config).to receive(:read).and_return({})
+
+      expect(policy).not_to permit(user, RequestForComment.new)
+    end
+
+    it 'dose not allow reports of your own content' do
+      expect(policy).not_to permit(user, Comment.new(user: user))
+    end
+  end
 end
diff --git a/spec/system/request_for_comments_filter_system_spec.rb b/spec/system/request_for_comments_filter_system_spec.rb
@@ -44,10 +44,10 @@
 
     expect do
       accept_confirm do
-        click_on I18n.t('reports.report')
+        click_on I18n.t('request_for_comments.report.report')
       end
 
-      expect(page).to have_text(I18n.t('reports.reported'))
+      expect(page).to have_text(I18n.t('request_for_comments.report.reported'))
     end.to have_enqueued_mail(ReportMailer, :report_content)
       .with(params: {reported_content: request_for_comment}, args: [])
   end
