address comments

Author: abcampo-iry

app/controllers/api/projects_controller.rb

@@ -63,7 +63,7 @@ def show_context
     private
 
     def set_auth_cookie_for_scratch
-      return unless @project.project_type == Project::Types::CODE_EDITOR_SCRATCH
+      return unless @project.scratch_project?
       return unless Flipper.enabled?(:cat_mode, school)
 
       cookies[:scratch_auth] = {

app/controllers/api/scratch/projects_controller.rb

@@ -18,7 +18,7 @@ def create
         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?
+        return render json: { error: I18n.t('errors.project.remixing.invalid_params') }, status: :bad_request if remix_params.dig(:scratch_component, :content).blank?
 
         remix_origin = request.origin || request.referer
 
@@ -55,30 +55,25 @@ def source_project_identifier
       end
 
       def create_params
-        {}.tap do |hash|
-          hash[:identifier] = source_project_identifier
-          scratch_content = scratch_content_params
-          hash[:scratch_component] = { content: scratch_content } if scratch_content.present?
-        end
+        {
+          identifier: source_project_identifier,
+          scratch_component: { content: scratch_content_params }
+        }
       end
 
       def load_original_project(identifier)
         project_loader = ProjectLoader.new(identifier, [params[:locale]])
         original_project = project_loader.load
 
         raise ActiveRecord::RecordNotFound, I18n.t('errors.project.not_found') unless original_project
-        raise ActiveRecord::RecordNotFound, I18n.t('errors.project.not_found') unless valid_original_project?(original_project)
+        raise ActiveRecord::RecordNotFound, I18n.t('errors.project.not_found') unless original_project.scratch_project?
 
         original_project
       end
 
       def scratch_content_params
         params.slice(:meta, :targets, :monitors, :extensions).to_unsafe_h
       end
-
-      def valid_original_project?(project)
-        project.project_type == Project::Types::CODE_EDITOR_SCRATCH
-      end
     end
   end
 end

app/models/project.rb

@@ -82,6 +82,10 @@ def media
     images + videos + audio
   end
 
+  def scratch_project?
+    project_type == Types::CODE_EDITOR_SCRATCH
+  end
+
   private
 
   def check_unique_not_null

lib/concepts/project/operations/create_remix.rb

@@ -23,7 +23,7 @@ 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] = if scratch_project?(original_project)
+        response[:project] = if original_project.scratch_project?
                                create_scratch_remix(original_project, params, user_id, remix_origin)
                              else
                                create_remix(original_project, params, user_id, remix_origin)
@@ -57,7 +57,7 @@ def create_remix(original_project, params, user_id, remix_origin)
       def create_scratch_remix(original_project, params, user_id, remix_origin)
         remix = format_project(original_project, params, user_id, remix_origin)
         scratch_component = params.fetch(:scratch_component)
-        remix.build_scratch_component(content: scratch_component[:content] || scratch_component['content'])
+        remix.build_scratch_component(content: scratch_component[:content])
 
         remix
       end
@@ -73,10 +73,6 @@ def format_project(original_project, params, user_id, remix_origin)
           proj.lesson_id = nil # Only the original can have a lesson id
         end
       end
-
-      def scratch_project?(project)
-        project.project_type == Project::Types::CODE_EDITOR_SCRATCH
-      end
     end
   end
 end