Rename Academic Year Workshop subjects

apps/test/unit/code-studio/pd/workshop_dashboard/components/workshop_enrollment_school_infoTest.js

@@ -46,7 +46,7 @@ describe('Workshop Enrollment School Info', () => {
         onDelete={() => {}}
         onClickSelect={() => {}}
         workshopCourse="CS Discoveries"
-        workshopSubject="Workshop 1: Unit 3"
+        workshopSubject="Academic Year Workshop 1"
         numSessions={5}
         permissionList={new Permission(['ProgramManager'])}
       />,
@@ -92,7 +92,7 @@ describe('Workshop Enrollment School Info', () => {
         onDelete={() => {}}
         onClickSelect={() => {}}
         workshopCourse="CS Discoveries"
-        workshopSubject="Workshop 1: Unit 3"
+        workshopSubject="Academic Year Workshop 1"
         numSessions={5}
         permissionList={new Permission(['ProgramManager'])}
       />,

apps/test/unit/code-studio/pd/workshop_dashboard/components/workshop_managementTest.js

@@ -94,15 +94,15 @@ describe('WorkshopManagement', () => {
     it('uses daily results for academic year workshop past August 2018', () => {
       const surveyUrl = getSurveyUrlForProps({
         date: '2018-09-01',
-        subject: 'Workshop 1: Unit 3'
+        subject: 'Academic Year Workshop 1'
       });
       expect(surveyUrl).to.eql('/daily_survey_results/123');
     });
 
     it('uses survey results for academic year workshop before August 2018', () => {
       const surveyUrl = getSurveyUrlForProps({
         date: '2018-07-01',
-        subject: 'Workshop 1: Unit 3'
+        subject: 'Academic Year Workshop 1'
       });
       expect(surveyUrl).to.eql(null);
     });

dashboard/app/models/pd/workshop_survey.rb

@@ -111,7 +111,8 @@ def first_survey_for_user?
     pd_enrollment && (pd_enrollment.user.nil? || Pd::WorkshopSurvey.find_by_user(pd_enrollment.user).empty?)
   end
 
-  # Only show implementation questions if this is the CSD Units 2 and 3 workshop survey
+  # Only show implementation questions if this is the survey
+  # for the first CSD Academic Year Workshop of the year.
   def show_implementation_questions?
     pd_enrollment.workshop.subject == Pd::Workshop::SUBJECT_CSD_WORKSHOP_1
   end

dashboard/db/migrate/20200803211022_update_academic_year_workshop_subjects.rb

@@ -0,0 +1,92 @@
+class UpdateAcademicYearWorkshopSubjects < ActiveRecord::Migration[5.0]
+  CUTOFF_DATE = '2020-08-05'
+
+  # The top 6 subjects here are straight string changes for the names of
+  # our academic year workshops.
+  # The "Virtual Workshop #" workshops represent regional partners
+  # who have scheduled these "Virtual Workshop #" workshops instead of
+  # the more traditional "Academic Year Workshop #" workshops.
+  # This migration moves those workshops to to the more traditional
+  # workhop naming convention. These regional partners also likely have
+  # "Virtual Workshop 2/4/6/8" scheduled - we are working
+  # with this limited group to manually delete or
+  # update these workshops, as appropriate.
+  CSD_COURSE = 'CS Discoveries'.freeze
+  CSD_SUBJECTS = [
+    {from: 'Workshop 1: Unit 3', to: 'Academic Year Workshop 1'},
+    {from: 'Workshop 2: Unit 4', to: 'Academic Year Workshop 2'},
+    {from: 'Workshop 3: Unit 5', to: 'Academic Year Workshop 3'},
+    {from: 'Workshop 4: Unit 6', to: 'Academic Year Workshop 4'},
+    {from: '2-day, Workshops 1+2: Units 3 and 4', to: 'Academic Year Workshop 1 + 2'},
+    {from: '2-day, Workshops 3+4: Units 5 and 6', to: 'Academic Year Workshop 3 + 4'},
+    {from: 'Virtual Workshop 1', to: 'Academic Year Workshop 1'},
+    {from: 'Virtual Workshop 3', to: 'Academic Year Workshop 2'},
+    {from: 'Virtual Workshop 5', to: 'Academic Year Workshop 3'},
+    {from: 'Virtual Workshop 7', to: 'Academic Year Workshop 4'},
+  ].freeze
+
+  CSP_COURSE = 'CS Principles'.freeze
+  CSP_SUBJECTS = [
+    {from: 'Workshop 1: Unit 3', to: 'Academic Year Workshop 1'},
+    {from: 'Workshop 2: Unit 4 and Explore Task', to: 'Academic Year Workshop 2'},
+    {from: 'Workshop 3: Unit 5 and Create Task', to: 'Academic Year Workshop 3'},
+    {from: 'Workshop 4: Unit 5 and Multiple Choice Exam', to: 'Academic Year Workshop 4'},
+    {from: '2-day, Workshops 1+2: Units 3-4 and Explore Task', to: 'Academic Year Workshop 1 + 2'},
+    {from: '2-day, Workshops 3+4: Unit 5, Create Task, and Multiple Choice Exam', to: 'Academic Year Workshop 3 + 4'},
+    {from: 'Virtual Workshop 1', to: 'Academic Year Workshop 1'},
+    {from: 'Virtual Workshop 3', to: 'Academic Year Workshop 2'},
+    {from: 'Virtual Workshop 5', to: 'Academic Year Workshop 3'},
+    {from: 'Virtual Workshop 7', to: 'Academic Year Workshop 4'},
+  ].freeze
+
+  def up
+    CSD_SUBJECTS.each do |subject_name|
+      csd_workshops = Pd::Workshop.where(course: CSD_COURSE, subject: subject_name[:from]).
+        scheduled_start_on_or_after(CUTOFF_DATE)
+
+      csd_workshops.each do |csd_workshop|
+        csd_workshop.update(
+          subject: subject_name[:to],
+          suppress_email: true
+        )
+      end
+    end
+
+    CSP_SUBJECTS.each do |subject_name|
+      csp_workshops = Pd::Workshop.where(course: CSP_COURSE, subject: subject_name[:from]).
+        scheduled_start_on_or_after(CUTOFF_DATE)
+
+      csp_workshops.each do |csp_workshop|
+        csp_workshop.update(
+          subject: subject_name[:to],
+          suppress_email: true
+        )
+      end
+    end
+  end
+
+  # Note this won't exactly roll back the "up" version of the migration,
+  # as we don't know the state of suppress_email on the workshops where this
+  # is being applied. However, we want to suppress email in
+  # Academic Year Workshops this school year, so in the case of a problem
+  # with subject naming we'll leave the email suppression as-is.
+  def down
+    CSD_SUBJECTS.each do |subject_name|
+      csd_workshops = Pd::Workshop.where(course: CSD_COURSE, subject: subject_name[:to]).
+        scheduled_start_on_or_after(CUTOFF_DATE)
+
+      csd_workshops.each do |csd_workshop|
+        csd_workshop.update(subject: subject_name[:from])
+      end
+    end
+
+    CSP_SUBJECTS.each do |subject_name|
+      csp_workshops = Pd::Workshop.where(course: CSP_COURSE, subject: subject_name[:to]).
+        scheduled_start_on_or_after(CUTOFF_DATE)
+
+      csp_workshops.each do |csp_workshop|
+        csp_workshop.update(subject: subject_name[:from])
+      end
+    end
+  end
+end

dashboard/lib/pd/workshop_survey_constants.rb

@@ -41,14 +41,14 @@ module WorkshopSurveyConstants
       LEGACY_SUBJECT_CSP_WORKSHOP_5 => ACADEMIC_YEAR_1_2_CATEGORY,
       LEGACY_SUBJECT_CSP_WORKSHOP_6 => ACADEMIC_YEAR_3_4_CATEGORY,
 
-      SUBJECT_CSP_VIRTUAL_1 => VIRTUAL_1_CATEGORY,
-      SUBJECT_CSP_VIRTUAL_2 => VIRTUAL_2_CATEGORY,
-      SUBJECT_CSP_VIRTUAL_3 => VIRTUAL_3_CATEGORY,
-      SUBJECT_CSP_VIRTUAL_4 => VIRTUAL_4_CATEGORY,
-      SUBJECT_CSP_VIRTUAL_5 => VIRTUAL_5_CATEGORY,
-      SUBJECT_CSP_VIRTUAL_6 => VIRTUAL_6_CATEGORY,
-      SUBJECT_CSP_VIRTUAL_7 => VIRTUAL_7_CATEGORY,
-      SUBJECT_CSP_VIRTUAL_8 => VIRTUAL_8_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_1 => VIRTUAL_1_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_2 => VIRTUAL_2_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_3 => VIRTUAL_3_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_4 => VIRTUAL_4_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_5 => VIRTUAL_5_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_6 => VIRTUAL_6_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_7 => VIRTUAL_7_CATEGORY,
+      LEGACY_SUBJECT_CSP_VIRTUAL_8 => VIRTUAL_8_CATEGORY,
 
       SUBJECT_CSD_SUMMER_WORKSHOP => LOCAL_CATEGORY,
       SUBJECT_CSD_WORKSHOP_1 => ACADEMIC_YEAR_1_CATEGORY,
@@ -66,14 +66,14 @@ module WorkshopSurveyConstants
       LEGACY_SUBJECT_CSD_UNITS_1_3 => ACADEMIC_YEAR_1_2_CATEGORY,
       LEGACY_SUBJECT_CSD_UNITS_4_6 => ACADEMIC_YEAR_3_4_CATEGORY,
 
-      SUBJECT_CSD_VIRTUAL_1 => VIRTUAL_1_CATEGORY,
-      SUBJECT_CSD_VIRTUAL_2 => VIRTUAL_2_CATEGORY,
-      SUBJECT_CSD_VIRTUAL_3 => VIRTUAL_3_CATEGORY,
-      SUBJECT_CSD_VIRTUAL_4 => VIRTUAL_4_CATEGORY,
-      SUBJECT_CSD_VIRTUAL_5 => VIRTUAL_5_CATEGORY,
-      SUBJECT_CSD_VIRTUAL_6 => VIRTUAL_6_CATEGORY,
-      SUBJECT_CSD_VIRTUAL_7 => VIRTUAL_7_CATEGORY,
-      SUBJECT_CSD_VIRTUAL_8 => VIRTUAL_8_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_1 => VIRTUAL_1_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_2 => VIRTUAL_2_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_3 => VIRTUAL_3_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_4 => VIRTUAL_4_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_5 => VIRTUAL_5_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_6 => VIRTUAL_6_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_7 => VIRTUAL_7_CATEGORY,
+      LEGACY_SUBJECT_CSD_VIRTUAL_8 => VIRTUAL_8_CATEGORY,
 
       SUBJECT_CSF_201 => CSF_CATEGORY,
     }

dashboard/test/mailers/pd/workshop_mailer_test.rb

@@ -68,8 +68,8 @@ class WorkshopMailerTest < ActionMailer::TestCase
   end
 
   test 'emails are not sent for workshops with virtual workshop subject' do
-    workshop = create :pd_workshop, course: Pd::Workshop::COURSE_CSD, subject: Pd::Workshop::SUBJECT_VIRTUAL_1, num_sessions: 1
-    enrollment = create :pd_enrollment, workshop: workshop
+    workshop = build :pd_workshop, course: Pd::Workshop::COURSE_CSD, subject: Pd::Workshop::LEGACY_SUBJECT_CSD_VIRTUAL_1, num_sessions: 1
+    enrollment = build :pd_enrollment, workshop: workshop
 
     assert_no_emails do
       Pd::WorkshopMailer.organizer_cancel_receipt(enrollment).deliver_now

dashboard/test/mailers/previews/pd_workshop_mailer_preview.rb

@@ -208,7 +208,7 @@ def facilitator_pre_workshop_csp
   def facilitator_pre_workshop_csd
     mail :facilitator_pre_workshop,
       Pd::Workshop::COURSE_CSD,
-      Pd::Workshop::SUBJECT_CSD_VIRTUAL_1,
+      Pd::Workshop::SUBJECT_CSD_WORKSHOP_1,
       target: :facilitator
   end
 

dashboard/test/ui/features/plc/pd/workshop_dashboard.feature

@@ -43,7 +43,7 @@ Scenario: New workshop: CSD units 2-3 with 2 facilitators
   And I press keys "Seattle, WA" for element "input#location_address"
   And I press keys "25" for element "input#capacity"
   And I select the "CS Discoveries" option in dropdown "course"
-  And I select the "Workshop 1: Unit 3" option in dropdown "subject"
+  And I select the "Academic Year Workshop 1" option in dropdown "subject"
 
   And I wait until element "label:contains('Workshop Type Options')" is visible
   And I select the "Yes, it is funded." option in dropdown "funded"

lib/cdo/shared_constants/pd/shared_workshop_constants.rb

@@ -19,20 +19,25 @@ module SharedWorkshopConstants
     ].freeze
 
     SUBJECT_TEACHER_CON = 'Code.org TeacherCon'.freeze
+
+    # Academic Year Workshop subjects shared between CSP and CSD.
+    SUBJECT_WORKSHOP_1 = 'Academic Year Workshop 1'.freeze
+    SUBJECT_WORKSHOP_2 = 'Academic Year Workshop 2'.freeze
+    SUBJECT_WORKSHOP_3 = 'Academic Year Workshop 3'.freeze
+    SUBJECT_WORKSHOP_4 = 'Academic Year Workshop 4'.freeze
+    SUBJECT_WORKSHOP_5 = 'Academic Year Workshop 1 + 2'.freeze
+    SUBJECT_WORKSHOP_6 = 'Academic Year Workshop 3 + 4'.freeze
+
+    # Note: the original intent of this constant is to put subjects
+    # in here that will be used explicitly in JS code.
+    # See this PR for more detail:
+    # https://github.com/code-dot-org/code-dot-org/pull/29510
     SUBJECT_NAMES = {
       SUBJECT_CSF_101: SUBJECT_CSF_101 = 'Intro'.freeze,
       SUBJECT_CSF_201: SUBJECT_CSF_201 = 'Deep Dive'.freeze,
       SUBJECT_FIT: SUBJECT_FIT = 'Code.org Facilitator Weekend'.freeze,
       SUBJECT_SUMMER_WORKSHOP: SUBJECT_SUMMER_WORKSHOP = '5-day Summer'.freeze,
       SUBJECT_VIRTUAL_KICKOFF: SUBJECT_VIRTUAL_KICKOFF = 'Virtual Workshop Kickoff'.freeze,
-      SUBJECT_VIRTUAL_1: SUBJECT_VIRTUAL_1 = 'Virtual Workshop 1'.freeze,
-      SUBJECT_VIRTUAL_2: SUBJECT_VIRTUAL_2 = 'Virtual Workshop 2'.freeze,
-      SUBJECT_VIRTUAL_3: SUBJECT_VIRTUAL_3 = 'Virtual Workshop 3'.freeze,
-      SUBJECT_VIRTUAL_4: SUBJECT_VIRTUAL_4 = 'Virtual Workshop 4'.freeze,
-      SUBJECT_VIRTUAL_5: SUBJECT_VIRTUAL_5 = 'Virtual Workshop 5'.freeze,
-      SUBJECT_VIRTUAL_6: SUBJECT_VIRTUAL_6 = 'Virtual Workshop 6'.freeze,
-      SUBJECT_VIRTUAL_7: SUBJECT_VIRTUAL_7 = 'Virtual Workshop 7'.freeze,
-      SUBJECT_VIRTUAL_8: SUBJECT_VIRTUAL_8 = 'Virtual Workshop 8'.freeze,
       SUBJECT_CSP_FOR_RETURNING_TEACHERS: SUBJECT_CSP_FOR_RETURNING_TEACHERS = 'Workshop for Returning Teachers'.freeze
     }
     SUBJECTS = {
@@ -55,44 +60,28 @@ module SharedWorkshopConstants
       ],
       COURSE_CSP => [
         SUBJECT_CSP_SUMMER_WORKSHOP = SUBJECT_SUMMER_WORKSHOP,
-        SUBJECT_CSP_WORKSHOP_1 = 'Workshop 1: Unit 3'.freeze,
-        SUBJECT_CSP_WORKSHOP_2 = 'Workshop 2: Unit 4 and Explore Task'.freeze,
-        SUBJECT_CSP_WORKSHOP_3 = 'Workshop 3: Unit 5 and Create Task'.freeze,
-        SUBJECT_CSP_WORKSHOP_4 = 'Workshop 4: Unit 5 and Multiple Choice Exam'.freeze,
-        SUBJECT_CSP_WORKSHOP_5 = '2-day, Workshops 1+2: Units 3-4 and Explore Task'.freeze,
-        SUBJECT_CSP_WORKSHOP_6 = '2-day, Workshops 3+4: Unit 5, Create Task, and Multiple Choice Exam'.freeze,
+        SUBJECT_CSP_VIRTUAL_KICKOFF = SUBJECT_VIRTUAL_KICKOFF,
+        SUBJECT_CSP_WORKSHOP_1 = SUBJECT_WORKSHOP_1,
+        SUBJECT_CSP_WORKSHOP_2 = SUBJECT_WORKSHOP_2,
+        SUBJECT_CSP_WORKSHOP_3 = SUBJECT_WORKSHOP_3,
+        SUBJECT_CSP_WORKSHOP_4 = SUBJECT_WORKSHOP_4,
+        SUBJECT_CSP_WORKSHOP_5 = SUBJECT_WORKSHOP_5,
+        SUBJECT_CSP_WORKSHOP_6 = SUBJECT_WORKSHOP_6,
         SUBJECT_CSP_TEACHER_CON = SUBJECT_TEACHER_CON,
         SUBJECT_CSP_FIT = SUBJECT_FIT,
-        SUBJECT_CSP_VIRTUAL_KICKOFF = SUBJECT_VIRTUAL_KICKOFF,
-        SUBJECT_CSP_VIRTUAL_1 = SUBJECT_VIRTUAL_1,
-        SUBJECT_CSP_VIRTUAL_2 = SUBJECT_VIRTUAL_2,
-        SUBJECT_CSP_VIRTUAL_3 = SUBJECT_VIRTUAL_3,
-        SUBJECT_CSP_VIRTUAL_4 = SUBJECT_VIRTUAL_4,
-        SUBJECT_CSP_VIRTUAL_5 = SUBJECT_VIRTUAL_5,
-        SUBJECT_CSP_VIRTUAL_6 = SUBJECT_VIRTUAL_6,
-        SUBJECT_CSP_VIRTUAL_7 = SUBJECT_VIRTUAL_7,
-        SUBJECT_CSP_VIRTUAL_8 = SUBJECT_VIRTUAL_8,
-        SUBJECT_CSP_FOR_RETURNING_TEACHERS
+        SUBJECT_CSP_FOR_RETURNING_TEACHERS,
       ],
       COURSE_CSD => [
         SUBJECT_CSD_SUMMER_WORKSHOP = SUBJECT_SUMMER_WORKSHOP,
-        SUBJECT_CSD_WORKSHOP_1 = 'Workshop 1: Unit 3'.freeze,
-        SUBJECT_CSD_WORKSHOP_2 = 'Workshop 2: Unit 4'.freeze,
-        SUBJECT_CSD_WORKSHOP_3 = 'Workshop 3: Unit 5'.freeze,
-        SUBJECT_CSD_WORKSHOP_4 = 'Workshop 4: Unit 6'.freeze,
-        SUBJECT_CSD_WORKSHOP_5 = '2-day, Workshops 1+2: Units 3 and 4'.freeze,
-        SUBJECT_CSD_WORKSHOP_6 = '2-day, Workshops 3+4: Units 5 and 6'.freeze,
+        SUBJECT_CSD_VIRTUAL_KICKOFF = SUBJECT_VIRTUAL_KICKOFF,
+        SUBJECT_CSD_WORKSHOP_1 = SUBJECT_WORKSHOP_1,
+        SUBJECT_CSD_WORKSHOP_2 = SUBJECT_WORKSHOP_2,
+        SUBJECT_CSD_WORKSHOP_3 = SUBJECT_WORKSHOP_3,
+        SUBJECT_CSD_WORKSHOP_4 = SUBJECT_WORKSHOP_4,
+        SUBJECT_CSD_WORKSHOP_5 = SUBJECT_WORKSHOP_5,
+        SUBJECT_CSD_WORKSHOP_6 = SUBJECT_WORKSHOP_6,
         SUBJECT_CSD_TEACHER_CON = SUBJECT_TEACHER_CON,
         SUBJECT_CSD_FIT = SUBJECT_FIT,
-        SUBJECT_CSD_VIRTUAL_KICKOFF = SUBJECT_VIRTUAL_KICKOFF,
-        SUBJECT_CSD_VIRTUAL_1 = SUBJECT_VIRTUAL_1,
-        SUBJECT_CSD_VIRTUAL_2 = SUBJECT_VIRTUAL_2,
-        SUBJECT_CSD_VIRTUAL_3 = SUBJECT_VIRTUAL_3,
-        SUBJECT_CSD_VIRTUAL_4 = SUBJECT_VIRTUAL_4,
-        SUBJECT_CSD_VIRTUAL_5 = SUBJECT_VIRTUAL_5,
-        SUBJECT_CSD_VIRTUAL_6 = SUBJECT_VIRTUAL_6,
-        SUBJECT_CSD_VIRTUAL_7 = SUBJECT_VIRTUAL_7,
-        SUBJECT_CSD_VIRTUAL_8 = SUBJECT_VIRTUAL_8
       ],
       COURSE_CSF => [
         SUBJECT_CSF_101,
@@ -107,20 +96,48 @@ module SharedWorkshopConstants
 
     LEGACY_SUBJECTS = {
       COURSE_CSP => [
+        LEGACY_SUBJECT_CSP_WORKSHOP_1_1920 = 'Workshop 1: Unit 3'.freeze,
+        LEGACY_SUBJECT_CSP_WORKSHOP_2_1920 = 'Workshop 2: Unit 4 and Explore Task'.freeze,
+        LEGACY_SUBJECT_CSP_WORKSHOP_3_1920 = 'Workshop 3: Unit 5 and Create Task'.freeze,
+        LEGACY_SUBJECT_CSP_WORKSHOP_4_1920 = 'Workshop 4: Unit 5 and Multiple Choice Exam'.freeze,
+        LEGACY_SUBJECT_CSP_WORKSHOP_5_1920 = '2-day, Workshops 1+2: Units 3-4 and Explore Task'.freeze,
+        LEGACY_SUBJECT_CSP_WORKSHOP_6_1920 = '2-day, Workshops 3+4: Unit 5, Create Task, and Multiple Choice Exam'.freeze,
         LEGACY_SUBJECT_CSP_WORKSHOP_1 = '1-day Academic Year, Units 1 and 2'.freeze,
         LEGACY_SUBJECT_CSP_WORKSHOP_2 = '1-day Academic Year, Unit 3'.freeze,
         LEGACY_SUBJECT_CSP_WORKSHOP_3 = '1-day Academic Year, Unit 4 + Explore Prep'.freeze,
         LEGACY_SUBJECT_CSP_WORKSHOP_4 = '1-day Academic Year, Unit 5 + Create Prep'.freeze,
         LEGACY_SUBJECT_CSP_WORKSHOP_5 = '2-day Academic Year, Units 1 to 3'.freeze,
         LEGACY_SUBJECT_CSP_WORKSHOP_6 = '2-day Academic Year, Units 4 and 5 + AP Prep'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_1 = 'Virtual Workshop 1'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_2 = 'Virtual Workshop 2'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_3 = 'Virtual Workshop 3'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_4 = 'Virtual Workshop 4'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_5 = 'Virtual Workshop 5'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_6 = 'Virtual Workshop 6'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_7 = 'Virtual Workshop 7'.freeze,
+        LEGACY_SUBJECT_CSP_VIRTUAL_8 = 'Virtual Workshop 8'.freeze
       ],
       COURSE_CSD => [
+        LEGACY_SUBJECT_CSD_WORKSHOP_1_1920 = 'Workshop 1: Unit 3'.freeze,
+        LEGACY_SUBJECT_CSD_WORKSHOP_2_1920 = 'Workshop 2: Unit 4'.freeze,
+        LEGACY_SUBJECT_CSD_WORKSHOP_3_1920 = 'Workshop 3: Unit 5'.freeze,
+        LEGACY_SUBJECT_CSD_WORKSHOP_4_1920 = 'Workshop 4: Unit 6'.freeze,
+        LEGACY_SUBJECT_CSD_WORKSHOP_5_1920 = '2-day, Workshops 1+2: Units 3 and 4'.freeze,
+        LEGACY_SUBJECT_CSD_WORKSHOP_6_1920 = '2-day, Workshops 3+4: Units 5 and 6'.freeze,
         LEGACY_SUBJECT_CSD_UNITS_2_3 = '1-day Academic Year, Units 1 and 2'.freeze,
         LEGACY_SUBJECT_CSD_UNIT_3_4 = '1-day Academic Year, Unit 3'.freeze,
         LEGACY_SUBJECT_CSD_UNITS_4_5 = '1-day Academic Year, Units 4 and 5'.freeze,
         LEGACY_SUBJECT_CSD_UNIT_6 = '1-day Academic Year, Unit 6'.freeze,
         LEGACY_SUBJECT_CSD_UNITS_1_3 = '2-day Academic Year, Units 1 to 3'.freeze,
         LEGACY_SUBJECT_CSD_UNITS_4_6 = '2-day Academic Year, Units 4 to 6'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_1 = 'Virtual Workshop 1'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_2 = 'Virtual Workshop 2'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_3 = 'Virtual Workshop 3'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_4 = 'Virtual Workshop 4'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_5 = 'Virtual Workshop 5'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_6 = 'Virtual Workshop 6'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_7 = 'Virtual Workshop 7'.freeze,
+        LEGACY_SUBJECT_CSD_VIRTUAL_8 = 'Virtual Workshop 8'.freeze
       ]
     }.freeze