extract get_script_level helper

code-dot-org · Jan 26, 2021 · 4b0b0c0 · 4b0b0c0
1 parent fcdffd2
commit 4b0b0c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/dashboard/app/controllers/teacher_feedbacks_controller.rb b/dashboard/app/controllers/teacher_feedbacks_controller.rb
@@ -21,8 +21,7 @@ def index
     end
 
     @feedbacks_as_student_with_level_info = @feedbacks_as_student.map do |feedback|
-      script_level = feedback.level.script_levels.find {|sl| sl.script_id == feedback.script_id}
-      feedback.attributes.merge(script_level&.summary_for_feedback)
+      feedback.attributes.merge(feedback&.get_script_level&.summary_for_feedback)
     end
   end
 

diff --git a/dashboard/app/models/teacher_feedback.rb b/dashboard/app/models/teacher_feedback.rb
@@ -41,6 +41,12 @@ def validate_script_and_script_level
     end
   end
 
+  # Finds the script level associated with this object, using script id and
+  # level id.
+  def get_script_level
+    level.script_levels.find {|sl| sl.script_id == script_id}
+  end
+
   def self.get_student_level_feedback(student_id, level_id, teacher_id)
     where(
       student_id: student_id,