Merge pull request #427 from openstax/cnxmod-tags

Handle cnxmod tags for Assignable exercises

Author: Dantemss

app/routines/exercises/import/assessments.rb

@@ -145,8 +145,9 @@ def exec(filename:, book_uuid:)
                 Rails.logger.warn { "Row ##{row_number} has no associated page in the book" } \
                   unless uuid_index.nil? && section_index.nil?
               else
-                exercise.tags << "context-cnxmod:#{page_uuid}"
-                exercise.tags << "assessment:#{row[pre_or_post_index].downcase == 'pre' ? 'preparedness' : 'practice'
+                is_pre = row[pre_or_post_index].downcase == 'pre'
+                exercise.tags << "context-cnxmod:#{page_uuid}" unless is_pre
+                exercise.tags << "assessment:#{is_pre ? 'preparedness' : 'practice'
                   }:https://openstax.org/orn/book:page/#{book_uuid}:#{page_uuid}" \
                   unless pre_or_post_index.nil? || row[pre_or_post_index].blank?
               end

app/routines/exercises/tag/assessments.rb

@@ -62,13 +62,14 @@ def exec(filename:, book_uuid:)
 
             pre_section_tag = "assessment:preparedness:https://openstax.org/orn/book:page/#{book_uuid}:#{page_uuid}"
             post_section_tag = "assessment:practice:https://openstax.org/orn/book:page/#{book_uuid}:#{page_uuid}"
+            cnxmod_tag = "context-cnxmod:#{page_uuid}"
 
             row_number = row_index + 1
 
             begin
-              tag pre_and_post_section_exercises, [ pre_section_tag, post_section_tag ]
+              tag pre_and_post_section_exercises, [ pre_section_tag, post_section_tag, cnxmod_tag ]
               tag pre_section_exercises, [ pre_section_tag ]
-              tag post_section_exercises, [ post_section_tag ]
+              tag post_section_exercises, [ post_section_tag, cnxmod_tag ]
             rescue StandardError => se
               Rails.logger.error { "Failed to import row ##{row_number} - #{se.message}" }
               failures[row_number] = se.to_s

spec/routines/exercises/import/assessments_spec.rb

@@ -35,10 +35,7 @@
     expect(exercises[0].publication_group.nickname).to eq 'Q1'
     expect(Set.new exercises[0].tags.map(&:to_s)).to eq Set[
       'assessment:preparedness:https://openstax.org/orn/book:page/62a49025-8cd8-407c-9cfb-c7eba55cf1c6:97af6b57-0004-4218-99c1-f2cfedea8f30',
-      'context-cnxmod:97af6b57-0004-4218-99c1-f2cfedea8f30',
-      'book-slug:college-success-concise',
       'machine-teks:dacf53a6-2b09-49f1-9926-de4efe1049e0',
-      'module-slug:college-success-concise:1-1-why-college',
       'teks:T1.1',
     ]
     expect(exercises[0].questions.first.stems.first.content).to eq 'Some question?'

spec/routines/exercises/tag/assessments_spec.rb

@@ -6,33 +6,38 @@
   let(:book_uuid)    { SecureRandom.uuid }
   let(:page_uuid)    { 'a9ce0e38-4f52-4fe0-9433-d8df95f6e3b2' }
 
-  let(:expected_pre_tag)  { "assessment:preparedness:https://openstax.org/orn/book:page/#{book_uuid}:#{page_uuid}" }
-  let(:expected_post_tag) { "assessment:practice:https://openstax.org/orn/book:page/#{book_uuid}:#{page_uuid}" }
+  let(:expected_pre_tag)    { "assessment:preparedness:https://openstax.org/orn/book:page/#{book_uuid}:#{page_uuid}" }
+  let(:expected_post_tag)   { "assessment:practice:https://openstax.org/orn/book:page/#{book_uuid}:#{page_uuid}" }
+  let(:expected_cnxmod_tag) { "context-cnxmod:#{page_uuid}" }
 
   let!(:exercises) { (1..9).map { |ii| FactoryBot.create(:publication, number: ii).publishable } }
 
   # Disable set_slug_tags!
   before { allow_any_instance_of(Exercise).to receive(:set_slug_tags!) }
 
   it 'tags exercises with the sample spreadsheet' do
-    expect { described_class.call(filename: fixture_path, book_uuid: book_uuid) }.to change { ExerciseTag.count }.by(10)
+    expect do
+      described_class.call(filename: fixture_path, book_uuid: book_uuid)
+    end.to change { ExerciseTag.count }.by(15)
 
     exercises.each(&:reload)
 
     exercises.each do |exercise|
       valid_tags = []
       valid_tags << expected_pre_tag if exercise.number <= 5
-      valid_tags << expected_post_tag if exercise.number >= 5
+      valid_tags << [expected_post_tag, expected_cnxmod_tag] if exercise.number >= 5
 
       expect(exercise.tags).to satisfy do |tags|
-        expect(tags.length).to eq exercise.number == 5 ? 2 : 1
+        expect(tags.length).to eq exercise.number < 5 ? 1 : exercise.number == 5 ? 3 : 2
         tags.all { |tag| expect(valid_tags).to include tag.name }
       end
     end
   end
 
   it 'skips exercises with no changes (idempotence)' do
-    expect { described_class.call(filename: fixture_path, book_uuid: book_uuid) }.to change { ExerciseTag.count }.by(10)
+    expect do
+      described_class.call(filename: fixture_path, book_uuid: book_uuid)
+    end.to change { ExerciseTag.count }.by(15)
 
     expect { described_class.call(filename: fixture_path, book_uuid: book_uuid) }.not_to change { ExerciseTag.count }
   end