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

app/controllers/exercise_questions_controller.rb

@@ -347,36 +347,20 @@ class ExerciseQuestionsController < ApplicationController
 
         #当试卷已发布时（试卷的总状态),当标准答案修改时，如有已提交的学生，需重新计算分数.
 
-        # if @exercise.exercise_status == 2
-        #   ex_users_committed = @exercise.exercise_users.exercise_user_committed
-        #   if ex_users_committed.size > 0
-        #     ex_users_committed.each do |ex_user|
-        #       user = ex_user.user
-        #       objective_score = calculate_student_score(@exercise,user)[:total_score]
-        #       subjective_score = ex_user.subjective_score
-        #       total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
-        #       total_score = objective_score + total_score_subjective_score
-        #       ex_user.update_attributes(objective_score:objective_score,score:total_score)
-        #     end
-        #   end
-        # end
-        ex_users_committed = @exercise.exercise_users.exercise_user_committed
-        if ex_users_committed.size > 0
-          ex_users_committed.each do |ex_user|
-            user = ex_user.user
-            objective_score = calculate_student_score(@exercise,user)[:total_score]
-            subjective_score = ex_user.subjective_score
-            total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
-            total_score = objective_score + total_score_subjective_score
-            ex_user.update_attributes(objective_score:objective_score,score:total_score)
+        if @exercise.exercise_status == 2
+          ex_users_committed = @exercise.exercise_users.exercise_user_committed
+          if ex_users_committed.size > 0
+            ex_users_committed.each do |ex_user|
+              user = ex_user.user
+              objective_score = calculate_student_score(@exercise,user)[:total_score]
+              subjective_score = ex_user.subjective_score
+              total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+              total_score = objective_score + total_score_subjective_score
+              ex_user.update_attributes(objective_score:objective_score,score:total_score)
+            end
           end
         end
-
-        if @exercise_question.save
-          normal_status(0,"试卷更新成功！")
-        else
-          normal_status(-1,"试卷更新失败！")
-        end
+        normal_status(0,"试卷更新成功！")
       rescue Exception => e
         uid_logger_error(e.message)
         tip_exception("页面调用失败！")

app/controllers/homework_commons_controller.rb

@@ -106,9 +106,10 @@ class HomeworkCommonsController < ApplicationController
 
     student_works = @homework.all_works
     @all_member_count = student_works.size
-    if @homework.publish_time.blank? || (@homework.publish_time > Time.now)
+
+    if @homework.publish_time.nil? || (@homework.publish_time > Time.now)
       @student_works = []
-      if params[:format] == "xlsx" || params[:format] == "zip"
+      if (params[:format] == "xlsx") || (params[:format] == "zip")
         normal_status(-1,"作业未发布")
       end
     else
@@ -196,7 +197,7 @@ class HomeworkCommonsController < ApplicationController
       end
 
       if params[:format] == "xlsx"
-        complete_works = @work_excel.where("work_status > 0").size
+        complete_works = @work_excel.present? ? @work_excel.where("work_status > 0").size : 0
         if @user_course_identity >= Course::STUDENT
           tip_exception(403, "无权限操作")
         elsif complete_works == 0
@@ -216,8 +217,13 @@ class HomeworkCommonsController < ApplicationController
         if @user_course_identity >= Course::STUDENT
           tip_exception(403, "无权限操作")
         else
-          zip_works = @work_excel.where("work_status > 0")
-          status = checkfileSize(zip_works)
+          if @work_excel.present?
+            zip_works = @work_excel&.where("work_status > 0")
+            status = checkfileSize(zip_works)
+          else
+            status = -1
+          end
+
           if status == 0
             respond_to do |format|
               format.zip{

app/controllers/shixuns_controller.rb

@@ -180,6 +180,7 @@ class ShixunsController < ApplicationController
 				end
 
 				# 同步配置
+				logger.info("########-shixun_service_configs_count: #{@shixun.shixun_service_configs.pluck(:id, :shixun_id)}")
 				@shixun.shixun_service_configs.each do |config|
 					ShixunServiceConfig.create!(:shixun_id => @new_shixun.id,
 																			:cpu_limit => config.cpu_limit,

app/helpers/exercises_helper.rb

@@ -382,6 +382,9 @@ module ExercisesHelper
               end
               answers_content.update_all(:score => q_score_1)
               score1 = score1 + q.question_score
+            else
+              answers_content.update_all(:score => -1.0)
+              score1 += 0.0
             end
           else
             score1 += 0.0
@@ -403,6 +406,9 @@ module ExercisesHelper
                 if i_standard_answer.include?(u.answer_text.downcase)  #该空的标准答案包含用户的答案才有分数
                   u.update_column('score',q_score_2)
                   score2 = score2 + q_score_2
+                else
+                  u.update_column('score',-1.0)
+                  score2 += 0.0
                 end
               end
             else
@@ -413,6 +419,9 @@ module ExercisesHelper
                   u.update_column("score",q_score_2)
                   score2 = score2 + q_score_2
                   st_answer_text.delete(u_answer_text)
+                else
+                  u.update_column('score',-1.0)
+                  score2 += 0.0
                 end
               end
             end

app/jobs/exercise_publish_notify_job.rb

@@ -6,6 +6,7 @@ class ExercisePublishNotifyJob < ApplicationJob
     exercise = Exercise.find_by(id: exercise_id)
     return if exercise.blank?
     user = exercise.user
+    course = exercise.course
 
     if group_ids.present?
       students = course.students.where(course_group_id: group_ids)

app/jobs/graduation_task_publish_notify_job.rb

@@ -5,6 +5,8 @@ class GraduationTaskPublishNotifyJob < ApplicationJob
   def perform(graduation_task_id)
     task = GraduationTask.find_by(id: graduation_task_id)
     return if task.blank?
+    course = task.course
+    return if course.blank?
 
     attrs = %i[
       user_id trigger_user_id container_id container_type parent_container_id parent_container_type
@@ -18,7 +20,7 @@ class GraduationTaskPublishNotifyJob < ApplicationJob
       viewed: 0, tiding_type: 'GraduationTask'
     }
     Tiding.bulk_insert(*attrs) do |worker|
-      task.course.course_members.pluck(:user_id).uniq.find_each do |user_id|
+      course.course_members.pluck(:user_id).uniq.find_each do |user_id|
         worker.add same_attrs.merge(user_id: user_id)
       end
     end

app/jobs/submit_graduation_work_notify_job.rb

@@ -19,11 +19,12 @@ class SubmitGraduationWorkNotifyJob < ApplicationJob
         next unless User.exists?(id: user_id)
 
         work = task.graduation_works.find_by(user_id: user_id)
-        next if work.blank?
+        member = course.students.find_by(user_id: user_id)
+        next if work.blank? || member.blank?
 
         attrs = same_attrs.merge(trigger_user_id: user_id, container_id: work.id)
 
-        course.course_member(user_id).member_teachers.find_each do |teacher|
+        member.member_teachers.find_each do |teacher|
           worker.add attrs.merge(user_id: teacher.user_id)
         end
       end

app/jobs/submit_student_work_notify_job.rb

@@ -19,11 +19,12 @@ class SubmitStudentWorkNotifyJob < ApplicationJob
         next unless User.exists?(id: user_id)
 
         work = homework.student_works.find_by(user_id: user_id)
-        next if work.blank?
+        member = course.students.find_by(user_id: user_id)
+        next if work.blank? || member.blank?
 
         attrs = same_attrs.merge(trigger_user_id: user_id, container_id: work.id)
 
-        course.course_member(user_id).member_teachers.find_each do |teacher|
+        member.member_teachers.find_each do |teacher|
           worker.add attrs.merge(user_id: teacher.user_id)
         end
       end

app/models/course_member.rb

@@ -146,11 +146,11 @@ class CourseMember < ApplicationRecord
   def member_teachers
     teacher_groups = course.teacher_course_groups
     if teacher_groups.count > 0
-      member_ids = teacher_groups.where(course_group_id: self.try(:course_group_id)).pluck(:course_member_id)
+      member_ids = teacher_groups.where(course_group_id: self.try(:course_group_id)).pluck(:course_member_id).compact
 
-      none_group_teachers = teacher_groups.pluck(:course_member_id).size > 0 ? teacher_groups.pluck(:course_member_id).join(',') : -1
-      teachers = course.teachers.where("members.id not in (#{none_group_teachers}) or
-                                            members.id in (#{member_ids.size > 0 ? member_ids.join(',') : -1})")
+      none_group_teachers = teacher_groups.pluck(:course_member_id).size > 0 ? teacher_groups.pluck(:course_member_id).compact.join(',') : -1
+      teachers = course.teachers.where("course_members.id not in (#{none_group_teachers}) or
+                                            course_members.id in (#{member_ids.size > 0 ? member_ids.join(',') : -1})")
     else
       teachers = course.teachers
     end

db/migrate/20190703090511_add_index_for_shixun_services.rb

@@ -0,0 +1,9 @@
+class AddIndexForShixunServices < ActiveRecord::Migration[5.2]
+  def change
+    sql = %Q(delete from shixun_service_configs where (shixun_id, mirror_repository_id) in
+            (select * from (select shixun_id, mirror_repository_id from shixun_service_configs group by shixun_id, mirror_repository_id having count(*) > 1) a)
+            and id not in (select * from (select min(id) from shixun_service_configs group by shixun_id, mirror_repository_id having count(*) > 1 order by id) b))
+    ActiveRecord::Base.connection.execute sql
+    add_index :shixun_service_configs, [:shixun_id, :mirror_repository_id], unique: true, name: "shixun_id_mirror_id_unique"
+  end
+end