Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/models/hack.rb

@@ -3,6 +3,8 @@ class Hack < ApplicationRecord
   # diffcult: 难度 1：简单；2：中等； 3：困难
   # 编程题
   validates_length_of :name, maximum: 60
+  validates :description, presence: { message: "描述不能为空" }
+  validates :name, presence: { message: "名称不能为空" }
   # 测试集
   has_many :hack_sets, ->{order("position asc")}, :dependent => :destroy
   # 代码

app/models/hack_set.rb

@@ -1,6 +1,7 @@
 class HackSet < ApplicationRecord
-  validates :input, presence: { message: "测试集输入不能为空" }
+  #validates :input, presence: { message: "测试集输入不能为空" }
   validates :output, presence: { message: "测试集输出不能为空" }
+  validates_uniqueness_of :input, scope: [:hack_id, :input], message: "多个测试集的输入不能相同"
   # 编程题测试集
   belongs_to :hack
 end