Merge branch 'dev_cxt2' into dev_aliyun

5 years ago · 0625f9a727
parent 4f71c3e0f7 a4f365183d
commit 0625f9a727
4 changed files with 15 additions and 17 deletions
--- 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
--- 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
--- 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
--- a/app/views/user_mailer/course_message_email.html.erb
+++ b/app/views/user_mailer/course_message_email.html.erb
@ -1,7 +1,7 @@
 <html>
 <head>
  <meta charset="utf-8">
-  <title><%= @course.name %>通知</title>
+  <title><%= @course.name %> 发布了新的帖子</title>
  <style type="text/css">
    /* 验证链接页面 */
    body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
@ -36,22 +36,15 @@
      <p style="color:#333; font-size:16px; margin-bottom:15px;font-weight: bold">
        您好！
      </p>
-      <p style="color:#333;">
-        您正在注册Educoder，请在10分钟内在注册页输入此验证码，并进行下一步操作。
-        如非你本人操作，请忽略此邮件。
+      <p style="color:#333; ">
+        您参与的课堂：<%= @course.name %>，有新的帖子发布了：<a href="https://www.educoder.net/courses/<%= @course.id %>/boards/<%= @message.board_id %>/messages/<%= @message.id %>" style="font-weight: normal; color:#ff7500;"><%= @message.subject %></a>
      </p>
-      <div  style="text-align: center;">
-        <div style="display:block; height: 45px; line-height:45px;padding:0 30px; width:100px; font-size: 20px;  font-weight: bold; background:#ffd9d9; color:#e72c37; margin:30px auto;">
-          <p><%= @code %></p>
-        </div>
+      <div style="text-align: center; margin-top:40px;">
        <span style="font-weight: normal;color:#666;">
            此邮件为系统所发，请勿直接回复。<br/>
    要解决问题或了解您的帐户详情，您可以访问 <a href="https://www.educoder.net/help?index=5" style="font-weight: normal; color:#ff7500;">帮助中心</a>。
            </span>
      </div>
-      <p style="color:#666; margin-top:30px;">
-        如果您并未发过此请求，则可能是因为其他用户在注册时误输了您的邮件地址，而使您收到了这封邮件，那么您可以放心的忽略此邮件，无需进一步采取任何操作。
-      </p>
    </div>
    <div style="padding:20px; color:#333; line-height: 1.9;background:#46484c;border:1px solid #ddd; border-top:none; width: 558px;">
      <a href="https:///www.educoder.net/"  style="font-weight: normal; color:#fff;">www.educoder.net</a>