Update data returned, add tests

Author: jamiebenstead

app/models/school_project.rb

@@ -19,6 +19,10 @@ def transition_status_to!(new_status, user_id)
     state_machine.transition_to!(new_status, metadata: { changed_by: user_id })
   end
 
+  def unread_feedback?
+    feedback.exists?(read_at: nil)
+  end
+
   # Add convenience methods for each state
   def unsubmitted?
     state_machine.in_state?(:unsubmitted)

app/views/api/lessons/student_index.json.jbuilder

@@ -3,7 +3,7 @@
 json.array!(@lessons_with_users_and_remixes) do |lesson_with_user, remix|
   lesson, user = lesson_with_user
   json.partial! 'lesson', lesson: lesson, user: user
-  json.status(lesson.project&.school_project&.status)
-  json.unread_feedback_count(remix&.school_project&.feedback&.where(read_at: nil)&.count || 0)
+  json.status(remix&.school_project&.status)
+  json.has_unread_feedback(remix&.school_project&.unread_feedback?)
   json.remix_identifier(remix.identifier) if remix.present?
 end

spec/features/lesson/listing_lessons_spec.rb

@@ -259,9 +259,10 @@
       expect(data.size).to eq(0)
     end
 
-    it 'includes unread_feedback_count when the user is a student' do
+    it 'includes has_unread_feedback when the user is a student' do
       authenticated_in_hydra_as(student)
       create(:class_student, school_class:, student_id: student.id)
+
       student_project = create(
         :project,
         school:,
@@ -271,13 +272,17 @@
         user_id: student.id
       )
       school_project = student_project.school_project
+
+      # 1 unread feedback
       create(
         :feedback,
         school_project: school_project,
         user_id: teacher.id,
         content: 'Unread',
         read_at: nil
       )
+
+      # 1 read feedback
       create(
         :feedback,
         school_project: school_project,
@@ -288,16 +293,24 @@
 
       get('/api/lessons', headers:)
       data = JSON.parse(response.body, symbolize_names: true)
-      expect(data.first[:unread_feedback_count]).to eq(1)
+
+      expect(data.first[:has_unread_feedback]).to be(true)
     end
 
     it 'includes status when the user is a student' do
       authenticated_in_hydra_as(student)
       create(:class_student, school_class:, student_id: student.id)
 
-      lesson.project.update!(school: school)
-      school_project = lesson.project.school_project
+      student_project = create(
+        :project,
+        school:,
+        lesson:,
+        parent: lesson.project,
+        remixed_from_id: lesson.project.id,
+        user_id: student.id
+      )
 
+      school_project = student_project.school_project
       school_project.transition_status_to!(:submitted, teacher.id)
 
       get('/api/lessons', headers:)
@@ -311,7 +324,14 @@
       authenticated_in_hydra_as(student)
       create(:class_student, school_class:, student_id: student.id)
 
-      lesson.project.update!(school: school)
+      create(
+        :project,
+        school:,
+        lesson:,
+        parent: lesson.project,
+        remixed_from_id: lesson.project.id,
+        user_id: student.id
+      )
 
       get('/api/lessons', headers:)
       data = JSON.parse(response.body, symbolize_names: true)

spec/models/school_project_spec.rb

@@ -4,10 +4,14 @@
 
 RSpec.describe SchoolProject do
   let(:state_machine) { instance_double(SchoolProjectStateMachine) }
-  let(:school_project) { create(:school_project, school:, project:) }
-  let(:project) { create(:project, school:, user_id: student.id) }
+  let(:school_class) { create(:school_class, school:, teacher_ids: [teacher.id]) }
+  let(:lesson) { create(:lesson, school:, school_class:, user_id: teacher.id) }
+  let(:school_project) { create(:school_project, school:, project: remix) }
   let(:student) { create(:student, school:) }
   let(:school) { create(:school) }
+  let(:teacher) { create(:teacher, school:) }
+  let(:teacher_project) { create(:project, school:, user_id: teacher.id, lesson:) }
+  let(:remix) { create(:project, school:, user_id: student.id, remixed_from_id: teacher_project.id) }
 
   before do
     allow(school_project).to receive(:state_machine).and_return(state_machine)
@@ -20,7 +24,7 @@
 
   describe '#status' do
     it 'defaults to unsubmitted' do
-      new_school_project = create(:school_project, school:, project:)
+      new_school_project = create(:school_project, school:, project: teacher_project)
       expect(new_school_project.status).to eq('unsubmitted')
     end
 
@@ -73,4 +77,32 @@
       expect(state_machine).to have_received(:history)
     end
   end
+
+  describe '#unread_feedback?' do
+    it 'returns true if there is unread feedback for the school project' do
+      create_list(
+        :feedback,
+        3,
+        school_project: school_project,
+        read_at: nil,
+        content: 'Unread',
+        user_id: teacher.id
+      )
+
+      create_list(
+        :feedback,
+        2,
+        school_project: school_project,
+        read_at: Time.current,
+        content: 'Read',
+        user_id: teacher.id
+      )
+
+      expect(school_project.unread_feedback?).to be true
+    end
+
+    it 'returns false when there is no feedback' do
+      expect(school_project.unread_feedback?).to be false
+    end
+  end
 end