Merge pull request #219 from razeware/WEB-6508

WEB-6508: Validate presence of ref in text lesson
razeware · Oct 4, 2023 · 01750b4 · 01750b4
2 parents 55a0c36 + f3116c9
commit 01750b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/models/lessons_validator.rb b/app/models/lessons_validator.rb
@@ -23,7 +23,7 @@ def check_unique_refs(record, attribute, value)
       lesson.segments.each { |segment| ref_counts[segment.ref] += 1 }
       non_unique_refs = ref_counts.select { |_, count| count > 1 }.keys
 
-      non_unique_refs.each { |ref| record.errors.add(attribute, "segment ref #{ref} is not unique") }
+      non_unique_refs.each { |ref| record.errors.add(attribute, "(#{lesson.title}) segment ref #{ref} is not unique") }
     end
   end
 end
diff --git a/app/models/text.rb b/app/models/text.rb
@@ -12,7 +12,11 @@ class Text
   attr_accessor :title, :ordinal, :ref, :description, :authors, :markdown_file, :root_path, :free, :kind
 
   attr_markdown :body, source: :markdown_file, file: true, wrapper_class: :wrapper_class
-  validates :title, :ordinal, :markdown_file, presence: true
+  validates :title, :ordinal, :ref, :markdown_file, presence: true
+  validate do |text|
+    # Check the ref is a string
+    errors.add(:ref, 'must be a string') unless text.ref.is_a?(String)
+  end
 
   def initialize(attributes = {})
     super