Use authorized_for()

seek4science · Nov 22, 2023 · e79aa83 · e79aa83
1 parent 05a748a
commit e79aa83
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/isa_exporter.rb b/lib/isa_exporter.rb
@@ -642,7 +642,7 @@ def group_samples_by_input_and_parameter_value(sample_type)
 
     def process_sequence_input(inputs, type)
       input_ids = inputs.map { |input| input[:id] }
-      authorized_sample_ids = Sample.where(id: input_ids).select { |s| s.can_view?(@current_user) }.map(&:id).compact
+      authorized_sample_ids = Sample.where(id: input_ids).authorized_for(:view, @current_user).map(&:id)
       input_ids.map do |input_id|
         if authorized_sample_ids.include?(input_id)
           { '@id': "##{type}/#{input_id}" }
@@ -696,7 +696,7 @@ def convert_parameter_values(sample_group_hash, isa_parameter_value_attributes)
 
     def extract_sample_ids(input_obj_list, type)
       sample_ids = input_obj_list.map { |io| io[:id] }
-      authorized_sample_ids = Sample.where(id: sample_ids).select { |sample| sample.can_view?(@current_user) }.map(&:id)
+      authorized_sample_ids = Sample.where(id: sample_ids).authorized_for(:view, @current_user).map(&:id)
 
       sample_ids.map do |s_id|
         if authorized_sample_ids.include?(s_id)