From 92a3d78dcc73d9863cd69b4773613bc3308cc3ee Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Sep 2015 17:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BD=9C=E4=B8=9A=E6=88=AA?=
 =?UTF-8?q?=E6=AD=A2=E5=AE=9A=E6=97=B6=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb               |  2 ++
 app/tasks/homework_endtime_task.rb | 23 +++++++++++++++++++++++
 lib/tasks/email.rake               |  8 --------
 lib/tasks/homework_endtime.rake    | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 8 deletions(-)
 create mode 100644 app/tasks/homework_endtime_task.rb
 create mode 100644 lib/tasks/homework_endtime.rake

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a25aff6bb..4fe2478d2 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -34,8 +34,10 @@ class Mailer < ActionMailer::Base
     end
     def method_missing(name, *args, &block)
       if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
+        # with delayed_job
         @target.delay.send(name, *args, &block)
       else
+        # without delayed_job
         @target.send(name, *args, &block).deliver
       end
     end
diff --git a/app/tasks/homework_endtime_task.rb b/app/tasks/homework_endtime_task.rb
new file mode 100644
index 000000000..9b3d6e2ef
--- /dev/null
+++ b/app/tasks/homework_endtime_task.rb
@@ -0,0 +1,23 @@
+#coding=utf-8
+#
+
+class HomeworkEndtimeTask
+  def massage_for_endtime
+    desc "send a message for Job deadline"
+    task :message => :environment do
+      current_day = Date.today.day
+      homework_commons = HomeworkCommon.where("end_time >?",Date.today)
+      homework_commons.each do |homework_common|
+        if homework_common.end_time.day - Date.today < 2 && homework_common.end_time.year == Date.year
+          homework_common.course.student.each do |s|
+            homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :course_message_id => homework_common.id, :course_message_type => "HomeworkEndtime")
+          end
+        end
+      end
+    end
+    handle_asynchronously :massage_for_endtime, :run_at => HomeworkEndtimeTask.new { 1.minutes.from_now }
+  end
+
+  homwork_endtime = HomeworkEndtimeTask.new
+  homwork_endtime.massage_for_endtime
+end
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index f805d1382..5126d7a69 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -202,13 +202,5 @@ END_DESC
         Mailer.run.send_for_user_activities(user, Date.today, 1)
       end
     end
-
-    desc "send a message for Job deadline"
-    task :message => :environment do
-      users = User.where(mail_notification: 'day')
-      users.each do |user|
-        Mailer.run.send_for_user_activities(user, Date.today, 1)
-      end
-    end
   end
 end
diff --git a/lib/tasks/homework_endtime.rake b/lib/tasks/homework_endtime.rake
new file mode 100644
index 000000000..9c7f54d75
--- /dev/null
+++ b/lib/tasks/homework_endtime.rake
@@ -0,0 +1,16 @@
+#coding=utf-8
+
+namespace :homework_endtime do
+  desc "send a message for Job deadline"
+  task :message => :environment do
+    current_day = Date.today.day
+    homework_commons = HomeworkCommon.where("end_time >?",Date.today)
+    homework_commons.each do |homework_common|
+      if homework_common.end_time.day - Date.today.day < 2 && homework_common.end_time.year == Date.today.year
+        homework_common.course.student.each do |s|
+          homework_common.course_messages << CourseMessage.new(:user_id => s.student_id, :course_id => homework_common.course_id, :viewed => false, :status => true)
+        end
+      end
+    end
+  end
+end