update

Author: abcampo-iry

app/controllers/api/scratch/projects_controller.rb

@@ -17,10 +17,13 @@ def create
         original_project = load_original_project(source_project_identifier)
         return render json: { error: I18n.t('errors.admin.unauthorized') }, status: :unauthorized unless current_ability.can?(:show, original_project)
 
+        remix_params = create_params
+        return render json: { error: I18n.t('errors.project.remixing.invalid_params') }, status: :bad_request if remix_params[:scratch_component].blank?
+
         remix_origin = request.origin || request.referer
 
         result = Project::CreateRemix.call(
-          params: create_params,
+          params: remix_params,
           user_id: current_user.id,
           original_project:,
           remix_origin:
@@ -73,8 +76,7 @@ def scratch_content_params
       end
 
       def valid_original_project?(project)
-        project.project_type == Project::Types::CODE_EDITOR_SCRATCH &&
-          (scratch_content_params.present? || project.scratch_component.present?)
+        project.project_type == Project::Types::CODE_EDITOR_SCRATCH
       end
     end
   end

lib/concepts/project/operations/create_remix.rb

@@ -23,21 +23,54 @@ def validate_params(response, _params, user_id, original_project, remix_origin)
       end
 
       def remix_project(response, params, user_id, original_project, remix_origin)
-        response[:project] = create_remix(original_project, params, user_id, remix_origin)
+        response[:project] = if scratch_project?(original_project)
+                               create_scratch_remix(original_project, params, user_id, remix_origin)
+                             else
+                               create_remix(original_project, params, user_id, remix_origin)
+                             end
         response[:project].save!
         response
       end
 
       def create_remix(original_project, params, user_id, remix_origin)
         remix = format_project(original_project, params, user_id, remix_origin)
-        copy_media_attachments(original_project, remix)
 
-        (params[:components].presence || original_project.components).each do |component|
-          remix.components.build(record_attributes(component).slice(:name, :extension, :content))
+        original_project.images.each do |image|
+          remix.images.attach(image.blob)
         end
 
-        scratch_component = params[:scratch_component] || original_project.scratch_component
-        remix.build_scratch_component(content: record_attributes(scratch_component)[:content]) if scratch_component.present?
+        original_project.videos.each do |video|
+          remix.videos.attach(video.blob)
+        end
+
+        original_project.audio.each do |audio_file|
+          remix.audio.attach(audio_file.blob)
+        end
+
+        params[:components].each do |component|
+          remix.components.build(component.slice(:name, :extension, :content))
+        end
+
+        remix
+      end
+
+      def create_scratch_remix(original_project, params, user_id, remix_origin)
+        remix = format_project(original_project, params, user_id, remix_origin)
+
+        original_project.images.each do |image|
+          remix.images.attach(image.blob)
+        end
+
+        original_project.videos.each do |video|
+          remix.videos.attach(video.blob)
+        end
+
+        original_project.audio.each do |audio_file|
+          remix.audio.attach(audio_file.blob)
+        end
+
+        scratch_component = params.fetch(:scratch_component)
+        remix.build_scratch_component(content: scratch_component[:content] || scratch_component['content'])
 
         remix
       end
@@ -54,14 +87,8 @@ def format_project(original_project, params, user_id, remix_origin)
         end
       end
 
-      def record_attributes(record)
-        (record.respond_to?(:attributes) ? record.attributes : record.to_h).symbolize_keys
-      end
-
-      def copy_media_attachments(original_project, remix)
-        original_project.images.each { |image| remix.images.attach(image.blob) }
-        original_project.videos.each { |video| remix.videos.attach(video.blob) }
-        original_project.audio.each { |audio_file| remix.audio.attach(audio_file.blob) }
+      def scratch_project?(project)
+        project.project_type == Project::Types::CODE_EDITOR_SCRATCH
       end
     end
   end

spec/concepts/project/create_remix_spec.rb

@@ -129,22 +129,6 @@
       end
     end
 
-    context 'when empty components are submitted' do
-      let(:remix_params) do
-        {
-          name: 'My remixed project',
-          components: []
-        }
-      end
-
-      it 'falls back to the original components' do
-        remixed_project = create_remix[:project]
-
-        expect(remixed_project.components.map { |component| component_props(component) })
-          .to eq(original_project.components.map { |component| component_props(component) })
-      end
-    end
-
     context 'when the original project has Scratch content' do
       let!(:original_project) do
         create(:project, project_type: Project::Types::CODE_EDITOR_SCRATCH, locale: nil)
@@ -162,15 +146,6 @@
         create(:scratch_component, project: original_project, content: original_scratch_project)
       end
 
-      context 'when new Scratch content is not provided' do
-        let(:remix_params) { { name: 'My remixed project' } }
-
-        it 'copies the original Scratch component' do
-          expect(create_remix[:project].scratch_component.content.to_h)
-            .to eq(original_scratch_project.deep_stringify_keys)
-        end
-      end
-
       context 'when new Scratch content is provided' do
         let(:remixed_scratch_project) do
           {

spec/features/scratch/creating_a_scratch_project_spec.rb

@@ -104,12 +104,10 @@ def make_request(query: request_query, request_headers: headers, request_params:
       expect(response).to have_http_status(:unauthorized)
     end
 
-    it 'responds 404 Not Found when no Scratch content exists on the original and none is submitted' do
-      original_project.scratch_component.destroy!
-
+    it 'responds 400 Bad Request when no Scratch content is submitted' do
       make_request(request_params: {})
 
-      expect(response).to have_http_status(:not_found)
+      expect(response).to have_http_status(:bad_request)
     end
 
     it 'creates a remix, associates it to the current user, and returns the new identifier' do