initial tests and fixing

Author: loiswells97

app/controllers/api/lessons_controller.rb

@@ -42,15 +42,13 @@ def create_copy
     end
 
     def create_from_project
-      remix_origin = request.origin || request.referer
-
-      # authorize the project if it exists
+      # authorize the project
       if lesson_params[:project_identifier].present?
         project = Project.find_by(identifier: lesson_params[:project_identifier])
         authorize! :update, project if project
       end
 
-      result = Lesson::CreateFromProject.call(lesson_params:, remix_origin:)
+      result = Lesson::CreateFromProject.call(lesson_params:)
 
       if result.success?
         @lesson_with_user = result[:lesson].with_user

app/models/lesson.rb

@@ -78,9 +78,9 @@ def user_is_the_school_teacher_for_the_school_class
   end
 
   def project_belongs_to_the_same_school
-    return unless project && school && project.school_id != school.id
+    return unless (project && (school || project&.school) && project&.school_id != school&.id)
 
-    errors.add(:project, "must belong to the same school (#{school.id}) as the lesson (#{id})")
+    errors.add(:project, "must belong to the same school (#{school&.id}) as the lesson (#{id})")
   end
 
   def project_belongs_to_the_same_user

lib/concepts/lesson/operations/create_from_project.rb

@@ -3,9 +3,9 @@
 class Lesson
   class CreateFromProject
     class << self
-      def call(lesson_params:, remix_origin:)
+      def call(lesson_params:)
         response = OperationResponse.new
-        response[:lesson] = build_lesson_from_project(lesson_params, remix_origin)
+        response[:lesson] = build_lesson_from_project(lesson_params)
         response[:lesson].save!
         response
       rescue StandardError => e
@@ -17,7 +17,7 @@ def call(lesson_params:, remix_origin:)
 
       private
 
-      def build_lesson_from_project(lesson_params, _remix_origin)
+      def build_lesson_from_project(lesson_params)
         project = Project.find_by(identifier: lesson_params[:project_identifier])
         lesson = Lesson.new(
           name: project.name

spec/factories/lesson.rb

@@ -6,7 +6,7 @@
     sequence(:name) { |n| "Lesson #{n}" }
     description { 'Description' }
     visibility { 'teachers' }
-    project { create(:project, user_id:, name:) }
+    project { create(:project, user_id:, name:, school: school || school_class&.school) }
 
     trait :with_project_components do
       transient do

spec/models/lesson_spec.rb

@@ -68,8 +68,19 @@
       expect(lesson).to be_invalid
     end
 
+    it 'requires the user id to match the user_id on the project' do
+      lesson.project = build(:project, user_id: SecureRandom.uuid)
+      expect(lesson).to be_invalid
+    end
+
+    it 'requires the project to belong to the same school as the lesson' do
+      lesson.project = build(:project, school: create(:school))
+      expect(lesson).to be_invalid
+    end
+
     context 'when the lesson has a school' do
       before do
+        lesson.project.update!(school:)
         lesson.update!(school:)
       end
 
@@ -84,6 +95,7 @@
 
     context 'when the lesson has a school_class' do
       before do
+        lesson.project.update!(school:)
         lesson.update!(school_class: create(:school_class, teacher_ids: [teacher.id], school:))
       end