Update script_level URLs from /stage to /lessons and /puzzle to /levels

bin/i18n/i18n_script_utils.rb

@@ -128,7 +128,7 @@ def self.contains_malformed_link_or_image(translation)
 
   def self.get_level_url_key(script, level)
     script_level = level.script_levels.find_by_script_id(script.id)
-    path = script_level.build_script_level_path(script_level)
+    path = script_level.build_script_level_path_for_translations(script_level)
     URI.join("https://studio.code.org", path)
   end
 

cookbooks/cdo-varnish/libraries/http_cache.rb

@@ -20,8 +20,8 @@ class HttpCache
   # A list of script levels that should not be cached, even though they are
   # in a cacheable script, because they are project-backed.
   UNCACHED_SCRIPT_LEVEL_PATHS = [
-    '/s/dance/stage/1/puzzle/13',
-    '/s/dance-2019/stage/1/puzzle/10'
+    '/s/dance/lessons/1/levels/13',
+    '/s/dance-2019/lessons/1/levels/10'
   ]
 
   # A map from script name to script level URL pattern.
@@ -41,7 +41,7 @@ class HttpCache
     oceans
   ).map do |script_name|
     # Most scripts use the default route pattern.
-    [script_name, "/s/#{script_name}/stage/*"]
+    [script_name, "/s/#{script_name}/lessons/*"]
   end.to_h.merge(
     # Add the "special case" routes here.
     'hourofcode' => '/hoc/*',

cookbooks/cdo-varnish/test/shared/shared.rb

@@ -253,7 +253,7 @@ def self.setup(environment, helpers, cloudfront=false)
       it 'Handles Accept-Language behaviors' do
         skip 'Not implemented in Rack yet' unless environment.to_s == 'integration'
         # URL contains whitelisted 'Accept-Language' header
-        url = build_url 's/starwars/stage/1/puzzle'
+        url = build_url 's/starwars/lessons/1/levels'
         text_en = 'Hello World!'
         text_fr = 'Bonjour le Monde!'
         mock_response url, text_en, {'X-Varnish-Accept-Language' => 'en'}
@@ -490,17 +490,17 @@ def does_not_strip_cookies_from_png_in_path(path)
       end
 
       it 'Strips cookies from the penultimate dance level' do
-        assert strips_session_specific_cookies_from_request? '/s/dance/stage/1/puzzle/12'
-        assert strips_session_specific_cookies_from_request? '/s/dance-2019/stage/1/puzzle/9'
+        assert strips_session_specific_cookies_from_request? '/s/dance/lessons/1/levels/12'
+        assert strips_session_specific_cookies_from_request? '/s/dance-2019/lessons/1/levels/9'
       end
 
       it 'Does not strip cookies from the last dance level' do
-        refute strips_session_specific_cookies_from_request? '/s/dance/stage/1/puzzle/13'
-        refute strips_session_specific_cookies_from_request? '/s/dance-2019/stage/1/puzzle/10'
+        refute strips_session_specific_cookies_from_request? '/s/dance/lessons/1/levels/13'
+        refute strips_session_specific_cookies_from_request? '/s/dance-2019/lessons/1/levels/10'
       end
 
       it 'Strips cookies from an aquatic level' do
-        assert strips_session_specific_cookies_from_request? '/s/aquatic/stage/1/puzzle/5'
+        assert strips_session_specific_cookies_from_request? '/s/aquatic/lessons/1/levels/5'
       end
 
       # rubocop:disable Lint/NestedMethodDefinition

dashboard/app/controllers/api_controller.rb

@@ -422,7 +422,7 @@ def user_progress_for_stage
     response[:signedIn] = !current_user.nil?
 
     script = Script.get_from_cache(params[:script])
-    stage = script.lessons[params[:stage_position].to_i - 1]
+    stage = script.lessons[params[:lesson_position].to_i - 1]
     script_level = stage.cached_script_levels[params[:level_position].to_i - 1]
     level = params[:level] ? Script.cache_find_level(params[:level].to_i) : script_level.oldest_active_level
 

dashboard/app/controllers/script_levels_controller.rb

@@ -165,8 +165,8 @@ def show
   def self.get_script_level(script, params)
     if params[:chapter]
       script.get_script_level_by_chapter(params[:chapter])
-    elsif params[:stage_position]
-      script.get_script_level_by_relative_position_and_puzzle_position(params[:stage_position], params[:id], false)
+    elsif params[:lesson_position]
+      script.get_script_level_by_relative_position_and_puzzle_position(params[:lesson_position], params[:id], false)
     elsif params[:lockable_stage_position]
       script.get_script_level_by_relative_position_and_puzzle_position(params[:lockable_stage_position], params[:id], true)
     else
@@ -231,7 +231,7 @@ def stage_extras
     return head :not_found if ScriptConstants::FAMILY_NAMES.include?(params[:script_id])
 
     @script = Script.get_from_cache(params[:script_id])
-    @stage = @script.lesson_by_relative_position(params[:stage_position].to_i)
+    @stage = @script.lesson_by_relative_position(params[:lesson_position].to_i)
 
     if params[:id]
       @script_level = Script.cache_find_script_level params[:id]
@@ -247,7 +247,7 @@ def stage_extras
       return
     end
 
-    @stage = Script.get_from_cache(params[:script_id]).lesson_by_relative_position(params[:stage_position].to_i)
+    @stage = Script.get_from_cache(params[:script_id]).lesson_by_relative_position(params[:lesson_position].to_i)
     @script = @stage.script
     @stage_extras = {
       next_stage_number: @stage.next_level_number_for_lesson_extras(current_user),
@@ -269,8 +269,8 @@ def summary_for_lesson_plans
     script = Script.get_from_cache(params[:script_id])
 
     stage =
-      if params[:stage_position]
-        script.lesson_by_relative_position(params[:stage_position])
+      if params[:lesson_position]
+        script.lesson_by_relative_position(params[:lesson_position])
       else
         script.lesson_by_relative_position(params[:lockable_stage_position], true)
       end

dashboard/app/helpers/levels_helper.rb

@@ -23,19 +23,35 @@ def build_script_level_path(script_level, params = {})
       flappy_chapter_path(script_level.chapter, params)
     elsif params[:puzzle_page]
       if script_level.lesson.numbered_lesson?
-        puzzle_page_script_stage_script_level_path(script_level.script, script_level.lesson, script_level, params[:puzzle_page])
+        puzzle_page_script_lesson_script_level_path(script_level.script, script_level.lesson, script_level, params[:puzzle_page])
       else
         puzzle_page_script_lockable_stage_script_level_path(script_level.script, script_level.lesson, script_level, params[:puzzle_page])
       end
     elsif params[:sublevel_position]
-      sublevel_script_stage_script_level_path(script_level.script, script_level.lesson, script_level, params[:sublevel_position])
+      sublevel_script_lesson_script_level_path(script_level.script, script_level.lesson, script_level, params[:sublevel_position])
     elsif !script_level.lesson.numbered_lesson?
       script_lockable_stage_script_level_path(script_level.script, script_level.lesson, script_level, params)
     elsif script_level.bonus
       query_params = params.merge(level_name: script_level.level.name)
-      script_stage_extras_path(script_level.script.name, script_level.lesson.relative_position, query_params)
+      script_lesson_extras_path(script_level.script.name, script_level.lesson.relative_position, query_params)
     else
-      script_stage_script_level_path(script_level.script, script_level.lesson, script_level, params)
+      script_lesson_script_level_path(script_level.script, script_level.lesson, script_level, params)
+    end
+  end
+
+  # This is a a temporary method to help with moving translations onto the new level urls. To start this will
+  # keep translations on the old URL until foundations can do the work to bring them over to the new url
+  def build_script_level_path_for_translations(script_level)
+    if script_level.script.name == Script::HOC_NAME
+      hoc_chapter_path(script_level.chapter)
+    elsif script_level.script.name == Script::FLAPPY_NAME
+      flappy_chapter_path(script_level.chapter)
+    elsif !script_level.lesson.numbered_lesson?
+      script_lockable_stage_script_level_path(script_level.script, script_level.lesson, script_level)
+    elsif script_level.bonus
+      `/s/#{script_level.script.name}/stage/#{script_level.lesson.relative_position}/extras?level_name=#{script_level.level.name}`
+    else
+      `/s/#{script_level.script.name}/stage/#{script_level.lesson.relative_position}/puzzle/#{script_level.position}`
     end
   end
 
@@ -178,7 +194,7 @@ def app_options
     view_options(server_level_id: @level.id)
     if @script_level
       view_options(
-        stage_position: @script_level.lesson.absolute_position,
+        lesson_position: @script_level.lesson.absolute_position,
         level_position: @script_level.position,
         next_level_url: @script_level.next_level_or_redirect_path_for_user(current_user, @stage)
       )

dashboard/app/helpers/script_levels_helper.rb

@@ -20,9 +20,9 @@ def script_level_solved_response(response, script_level)
               stage_extras: true
             ).any?
         if enabled_for_stage && (enabled_for_user || enabled_for_teacher)
-          response[:redirect] = script_stage_extras_path(
+          response[:redirect] = script_lesson_extras_path(
             script_id: script_level.script.name,
-            stage_position: (@stage || script_level.lesson).absolute_position
+            lesson_position: (@stage || script_level.lesson).absolute_position
           )
         end
       end

dashboard/app/helpers/view_options_helper.rb

@@ -25,7 +25,7 @@ module ViewOptionsHelper
     :server_project_level_id,
     :game_display_name,
     :script_name,
-    :stage_position,
+    :lesson_position,
     :level_position,
     :public_caching,
     :is_13_plus,

dashboard/app/models/lesson.rb

@@ -303,7 +303,7 @@ def summarize(include_bonus_levels = false, for_edit: false)
         lesson_data[:finishText] = I18n.t('nav.header.finished_hoc')
       end
 
-      lesson_data[:lesson_extras_level_url] = script_stage_extras_url(script.name, stage_position: relative_position) unless unplugged_lesson?
+      lesson_data[:lesson_extras_level_url] = script_lesson_extras_url(script.name, lesson_position: relative_position) unless unplugged_lesson?
 
       lesson_data
     end

dashboard/app/models/levels/bubble_choice.rb

@@ -55,7 +55,7 @@ def sublevel_at(index)
   end
 
   # Returns a sublevel's position in the parent level. Can be used for generating
-  # a sublevel URL (/s/:script_name/stage/:stage_pos/puzzle/:puzzle_pos/sublevel/:sublevel_pos).
+  # a sublevel URL (/s/:script_name/lessons/:stage_pos/levels/:puzzle_pos/sublevel/:sublevel_pos).
   # @param [Level] sublevel
   # @return [Integer] The sublevel's position (i.e., its index + 1) under the parent level.
   def sublevel_position(sublevel)

dashboard/app/models/script_level.rb

@@ -256,7 +256,7 @@ def next_level_or_redirect_path_for_user(
     elsif bonus
       # If we got to this bonus level from another lesson's lesson extras, go back
       # to that lesson
-      script_stage_extras_path(script.name, (extras_lesson || lesson).relative_position)
+      script_lesson_extras_path(script.name, (extras_lesson || lesson).relative_position)
     else
       level_to_follow ? build_script_level_path(level_to_follow) : script_completion_redirect(script)
     end
@@ -527,7 +527,7 @@ def self.summarize_as_bonus_for_teacher_panel(script, bonus_level_ids, student)
       {
         # Some lessons have a lesson extras option without any bonus levels. In
         # these cases, they just display previous lesson challenges. These should
-        # be displayed as "perfect." Example level: /s/express-2020/stage/28/extras
+        # be displayed as "perfect." Example level: /s/express-2020/lessons/28/extras
         id: '-1',
         bonus: true,
         user_id: student.id,

dashboard/config/routes.rb

@@ -221,8 +221,8 @@
 
   # quick links for cartoon network arabic
   get '/flappy/lang/ar', to: 'home#set_locale', as: 'flappy/lang/ar', locale: 'ar-SA', user_return_to: '/flappy/1'
-  get '/playlab/lang/ar', to: 'home#set_locale', as: 'playlab/lang/ar', locale: 'ar-SA', user_return_to: '/s/playlab/stage/1/puzzle/1'
-  get '/artist/lang/ar', to: 'home#set_locale', as: 'artist/lang/ar', locale: 'ar-SA', user_return_to: '/s/artist/stage/1/puzzle/1'
+  get '/playlab/lang/ar', to: 'home#set_locale', as: 'playlab/lang/ar', locale: 'ar-SA', user_return_to: '/s/playlab/lessons/1/levels/1'
+  get '/artist/lang/ar', to: 'home#set_locale', as: 'artist/lang/ar', locale: 'ar-SA', user_return_to: '/s/artist/lessons/1/levels/1'
 
   # /lang/xx shortcut for all routes
   get '/lang/:locale', to: 'home#set_locale', user_return_to: '/'
@@ -284,15 +284,15 @@
   end
 
   # CSP 20-21 lockable lessons with lesson plan redirects
-  get '/s/csp1-2020/lockable/2(*all)', to: redirect(path: '/s/csp1-2020/stage/14%{all}')
-  get '/s/csp2-2020/lockable/1(*all)', to: redirect(path: '/s/csp2-2020/stage/9%{all}')
-  get '/s/csp3-2020/lockable/1(*all)', to: redirect(path: '/s/csp3-2020/stage/11%{all}')
-  get '/s/csp4-2020/lockable/1(*all)', to: redirect(path: '/s/csp4-2020/stage/15%{all}')
-  get '/s/csp5-2020/lockable/1(*all)', to: redirect(path: '/s/csp5-2020/stage/18%{all}')
-  get '/s/csp6-2020/lockable/1(*all)', to: redirect(path: '/s/csp6-2020/stage/6%{all}')
-  get '/s/csp7-2020/lockable/1(*all)', to: redirect(path: '/s/csp7-2020/stage/11%{all}')
-  get '/s/csp9-2020/lockable/1(*all)', to: redirect(path: '/s/csp9-2020/stage/9%{all}')
-  get '/s/csp10-2020/lockable/1(*all)', to: redirect(path: '/s/csp10-2020/stage/14%{all}')
+  get '/s/csp1-2020/lockable/2(*all)', to: redirect(path: '/s/csp1-2020/lessons/14%{all}')
+  get '/s/csp2-2020/lockable/1(*all)', to: redirect(path: '/s/csp2-2020/lessons/9%{all}')
+  get '/s/csp3-2020/lockable/1(*all)', to: redirect(path: '/s/csp3-2020/lessons/11%{all}')
+  get '/s/csp4-2020/lockable/1(*all)', to: redirect(path: '/s/csp4-2020/lessons/15%{all}')
+  get '/s/csp5-2020/lockable/1(*all)', to: redirect(path: '/s/csp5-2020/lessons/18%{all}')
+  get '/s/csp6-2020/lockable/1(*all)', to: redirect(path: '/s/csp6-2020/lessons/6%{all}')
+  get '/s/csp7-2020/lockable/1(*all)', to: redirect(path: '/s/csp7-2020/lessons/11%{all}')
+  get '/s/csp9-2020/lockable/1(*all)', to: redirect(path: '/s/csp9-2020/lessons/9%{all}')
+  get '/s/csp10-2020/lockable/1(*all)', to: redirect(path: '/s/csp10-2020/lessons/14%{all}')
 
   resources :lessons, only: [:edit, :update]
   resources :resources, only: [:create, :update]
@@ -308,6 +308,9 @@
     end
   end
 
+  # Redirects from old /stage url to new /lessons url for levels
+  get '/s/:script_name/stage/:position/puzzle/:number(*all)', to: redirect(path: '/s/%{script_name}/lessons/%{position}/levels/%{number}%{all}')
+
   resources :scripts, path: '/s/' do
     # /s/xxx/reset
     get 'reset', to: 'script_levels#reset'
@@ -323,31 +326,29 @@
       get 'instructions'
     end
 
-    ## TODO: Once we move levels over to /lessons as well combine the routing rules
-    resources :lessons, only: [:show], param: 'position' do
+    # /s/xxx/lessons/yyy
+    resources :lessons, only: [:show], path: "/lessons", param: 'position', format: false do
       get 'student', to: 'lessons#student_lesson_plan'
-    end
-
-    # /s/xxx/stage/yyy/puzzle/zzz
-    resources :stages, only: [], path: "/stage", param: 'position', format: false do
       get 'extras', to: 'script_levels#stage_extras', format: false
       get 'summary_for_lesson_plans', to: 'script_levels#summary_for_lesson_plans', format: false
-      resources :script_levels, only: [:show], path: "/puzzle", format: false do
+
+      # /s/xxx/lessons/yyy/levels/zzz
+      resources :script_levels, only: [:show], path: "/levels", format: false do
         member do
-          # /s/xxx/stage/yyy/puzzle/zzz/page/ppp
+          # /s/xxx/lessons/yyy/levels/zzz/page/ppp
           get 'page/:puzzle_page', to: 'script_levels#show', as: 'puzzle_page', format: false
-          # /s/xxx/stage/yyy/puzzle/zzz/sublevel/sss
+          # /s/xxx/lessons/yyy/levels/zzz/sublevel/sss
           get 'sublevel/:sublevel_position', to: 'script_levels#show', as: 'sublevel', format: false
         end
       end
     end
 
-    # /s/xxx/lockable/yyy/puzzle/zzz
+    # /s/xxx/lockable/yyy/levels/zzz
     resources :lockable_stages, only: [], path: "/lockable", param: 'position', format: false do
       get 'summary_for_lesson_plans', to: 'script_levels#summary_for_lesson_plans', format: false
-      resources :script_levels, only: [:show], path: "/puzzle", format: false do
+      resources :script_levels, only: [:show], path: "/levels", format: false do
         member do
-          # /s/xxx/stage/yyy/puzzle/zzz/page/ppp
+          # /s/xxx/lockable/yyy/levels/zzz/page/ppp
           get 'page/:puzzle_page', to: 'script_levels#show', as: 'puzzle_page', format: false
         end
       end
@@ -685,8 +686,8 @@
   get '/api/section_progress/:section_id', to: 'api#section_progress', as: 'section_progress'
   get '/dashboardapi/section_level_progress/:section_id', to: 'api#section_level_progress', as: 'section_level_progress'
   get '/api/user_progress/:script', to: 'api#user_progress', as: 'user_progress'
-  get '/api/user_progress/:script/:stage_position/:level_position', to: 'api#user_progress_for_stage', as: 'user_progress_for_stage'
-  get '/api/user_progress/:script/:stage_position/:level_position/:level', to: 'api#user_progress_for_stage', as: 'user_progress_for_stage_and_level'
+  get '/api/user_progress/:script/:lesson_position/:level_position', to: 'api#user_progress_for_stage', as: 'user_progress_for_stage'
+  get '/api/user_progress/:script/:lesson_position/:level_position/:level', to: 'api#user_progress_for_stage', as: 'user_progress_for_stage_and_level'
   put '/api/firehose_unreachable', to: 'api#firehose_unreachable'
   namespace :api do
     api_methods.each do |action|

dashboard/test/controllers/api/v1/assessments_controller_test.rb

@@ -251,7 +251,7 @@ class Api::V1::AssessmentsControllerTest < ActionController::TestCase
             "stage" => script.name,
             "puzzle" => 1,
             "question" => "Long assessment 1",
-            "url" => "http://test.host/s/#{script.name}/stage/1/puzzle/1?section_id=#{@section.id}&user_id=#{@student_1.id}",
+            "url" => "http://test.host/s/#{script.name}/lessons/1/levels/1?section_id=#{@section.id}&user_id=#{@student_1.id}",
             "multi_correct" => 1,
             "multi_count" => 4,
             "match_correct" => 1,
@@ -335,7 +335,7 @@ class Api::V1::AssessmentsControllerTest < ActionController::TestCase
               "stage" => script.name,
               "puzzle" => 1,
               "question" => "Long assessment 1",
-              "url" => "http://test.host/s/#{script.name}/stage/1/puzzle/1?section_id=#{@section.id}&user_id=#{@student_1.id}",
+              "url" => "http://test.host/s/#{script.name}/lessons/1/levels/1?section_id=#{@section.id}&user_id=#{@student_1.id}",
               "multi_correct" => 1,
               "multi_count" => 2,
               "match_correct" => 0,