diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index c1e08d440..66c294c06 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -207,7 +207,7 @@ class MessagesController < ApplicationController
def notify_course_students message, course
course.students.includes(:user).each do |student|
- UserMailer.course_message_email(student&.user&.mail, message.id).deliver_now if student&.user&.mail
+ UserMailer.course_message_email(student&.user&.mail, message.id).deliver_later if student&.user&.mail
end
end
end
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index 5cd9d787c..6e957b4df 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -12,6 +12,6 @@ class UserMailer < ApplicationMailer
def course_message_email(mail, message_id)
@message = Message.find_by(id: message_id)
@course = @message&.board&.course
- mail(to: mail, subject: '课堂通知') if @message.present? && @course.present?
+ mail(to: mail, subject: '课堂发布了新的帖子') if @message.present? && @course.present?
end
end
diff --git a/app/services/duplicate_course_service.rb b/app/services/duplicate_course_service.rb
index acff0a726..fa57a8901 100644
--- a/app/services/duplicate_course_service.rb
+++ b/app/services/duplicate_course_service.rb
@@ -94,8 +94,8 @@ class DuplicateCourseService < ApplicationService
exercise = course.exercises.create!(attrs.merge(user_id: user.id))
origin_exercise.exercise_questions.find_each do |origin_question|
- question_attrs = origin_question.as_json(only: %i[question_title question_type question_number question_score])
- question_attrs[:question_type] ||= 1
+ question_attrs = origin_question.as_json(only: %i[question_title question_type question_number question_score shixun_name shixun_id is_ordered level])
+ # question_attrs[:question_type] ||= 1
question = exercise.exercise_questions.create!(question_attrs)
exercise_choice_map = {}
@@ -103,15 +103,20 @@ class DuplicateCourseService < ApplicationService
choice_attrs = { choice_position: index + 1, choice_text: origin_choice.choice_text }
choice = question.exercise_choices.create!(choice_attrs)
- exercise_choice_map[origin_choice.id] = choice.id
+ # exercise_choice_map[origin_choice.id] = choice.id 标准答案中存的是choice_position, 直接取原题的exercise_choice_id就行
end
origin_question.exercise_standard_answers.find_each do |origin_answer|
question.exercise_standard_answers.create!(
- exercise_choice_id: exercise_choice_map[origin_answer.exercise_choice_id],
+ exercise_choice_id: origin_answer.exercise_choice_id,
answer_text: origin_answer.answer_text
)
end
+
+ origin_question.exercise_shixun_challenges.each_with_index do |sc, index|
+ question.exercise_shixun_challenges.create!({position: index+1, challenge_id: sc.challenge_id,
+ shixun_id: sc.shixun_id, question_score: sc.question_score})
+ end
end
origin_exercise.exercise_bank.increment!(:quotes) if exercise.exercise_bank
diff --git a/app/views/user_mailer/course_message_email.html.erb b/app/views/user_mailer/course_message_email.html.erb
index 66c75414b..4b09f180c 100644
--- a/app/views/user_mailer/course_message_email.html.erb
+++ b/app/views/user_mailer/course_message_email.html.erb
@@ -1,7 +1,7 @@
- <%= @course.name %>通知
+ <%= @course.name %> 发布了新的帖子