Update app/services/proforma_service/convert_exercise_to_task.rb

Co-authored-by: Sebastian Serth <[email protected]>

Author: kkoehn

app/services/proforma_service/convert_exercise_to_task.rb

@@ -77,8 +77,7 @@ def uuid
     end
 
     def model_solutions
-      model_solutions_files = @exercise.files.filter {|file| file.role == 'reference_implementation' }.group_by {|file| xml_id_from_file(file).first }
-      model_solutions_files.map do |xml_id, files|
+      @exercise.files.filter(&:reference_implementation?).group_by {|file| xml_id_from_file(file).first }.map do |xml_id, files|
         ProformaXML::ModelSolution.new(
           id: xml_id,
           files: files.map {|file| model_solution_file(file) }

app/services/proforma_service/convert_task_to_exercise.rb

@@ -107,7 +107,7 @@ def task_files
     def codeocean_file_from_task_file(file, parent_object = nil)
       extension = File.extname(file.filename)
       # checking the last element of xml_id_path array for file.id
-      codeocean_file = @exercise.files.where('array_length(xml_id_path, 1) IS NOT NULL AND xml_id_path[array_length(xml_id_path, 1)] = ?', file.id).first_or_initialize
+      codeocean_file = @exercise.files.detect {|f| f.xml_id_path.last == file.id } || @exercise.files.new
       codeocean_file.assign_attributes(
         context: @exercise,
         file_type: file_type(extension),

spec/services/proforma_service/convert_exercise_to_task_spec.rb

@@ -126,7 +126,7 @@
       end
 
       context 'when xml_id_path is set for file' do
-        let(:file) { create(:file, xml_id_path: ['foobar']) }
+        let(:file) { create(:file, xml_id_path: ['foobar'], context: create(:dummy)) }
 
         it 'does not change xml_id_path' do
           expect { convert_to_task.execute }.not_to change(file.reload, :xml_id_path)

spec/services/proforma_service/convert_task_to_exercise_spec.rb

@@ -564,9 +564,9 @@
               description: 'exercise-description')
           end
           let(:co_files) do
-            [create(:file, xml_id_path: ['id'], role: 'regular_file'),
-             create(:file, xml_id_path: %w[ms-id ms-file-id], role: 'reference_implementation'),
-             create(:test_file, xml_id_path: %w[test-id test-file-id])]
+            [build(:file, xml_id_path: ['id'], role: 'regular_file'),
+             build(:file, xml_id_path: %w[ms-id ms-file-id], role: 'reference_implementation'),
+             build(:test_file, xml_id_path: %w[test-id test-file-id])]
           end
 
           it 'reuses existing file' do