From 43170c696c296d81ddbd5c99be8916462eb8bc0d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 29 Aug 2015 17:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=80=BB=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/course_message.rb                  |  2 +-
 db/migrate/20150829023459_forge_messages.rb   |  1 -
 .../20150829070453_about_message_alls.rb      | 31 -------------
 .../20150829081822_update_message_time.rb     | 46 +++++++++++++++++++
 4 files changed, 47 insertions(+), 33 deletions(-)
 delete mode 100644 db/migrate/20150829070453_about_message_alls.rb
 create mode 100644 db/migrate/20150829081822_update_message_time.rb

diff --git a/app/models/course_message.rb b/app/models/course_message.rb
index de1be1a20..4f62d24c2 100644
--- a/app/models/course_message.rb
+++ b/app/models/course_message.rb
@@ -11,7 +11,7 @@ class CourseMessage < ActiveRecord::Base
   validates :course_id,presence: true
   validates :course_message_id,presence: true
   validates :course_message_type, presence: true
-  validates :content, length: {maximum: 1000}
+  validates_length_of :content, :maximum => 100
   after_create :add_user_message
 
   def add_user_message
diff --git a/db/migrate/20150829023459_forge_messages.rb b/db/migrate/20150829023459_forge_messages.rb
index e0e00e123..c468ad68f 100644
--- a/db/migrate/20150829023459_forge_messages.rb
+++ b/db/migrate/20150829023459_forge_messages.rb
@@ -76,6 +76,5 @@ class ForgeMessages < ActiveRecord::Migration
   end
 
   def down
-    ForgeMessages.destroy_all
   end
 end
diff --git a/db/migrate/20150829070453_about_message_alls.rb b/db/migrate/20150829070453_about_message_alls.rb
deleted file mode 100644
index 6f8acae38..000000000
--- a/db/migrate/20150829070453_about_message_alls.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-class AboutMessageAlls < ActiveRecord::Migration
-  def up
-    forge_count = ForgeMessage.all.count / 30 + 2
-    transaction do
-      for i in 1 ... forge_count do i
-      ForgeMessage.page(i).per(30).each do |forge_message|
-        message = MessageAll.new
-        message.message_id = forge_message.forge_message_id
-        message.message_type = forge_message.forge_message_type
-        message.user_id = forge_message.user_id
-        message.save
-      end
-      end
-    end
-
-    course_count = CourseMessage.all.count / 30 + 2
-    transaction do
-      for i in 1 ... course_count do i
-      CourseMessage.page(i).per(30).each do |course_message|
-        message = MessageAll.new
-        message.message_id = course_message.course_message_id
-        message.message_type = course_message.course_message_type
-        message.save
-      end
-      end
-    end
-  end
-
-  def down
-  end
-end
diff --git a/db/migrate/20150829081822_update_message_time.rb b/db/migrate/20150829081822_update_message_time.rb
new file mode 100644
index 000000000..0bbc4458c
--- /dev/null
+++ b/db/migrate/20150829081822_update_message_time.rb
@@ -0,0 +1,46 @@
+class UpdateMessageTime < ActiveRecord::Migration
+  def up
+    course_count = CourseMessage.all.count / 30 + 1
+    transaction do
+      for i in 1 ... course_count do i
+      CourseMessage.page(i).per(30).each do |cmessage|
+        if cmessage.course_message
+          if cmessage.course_message.respond_to?("created_at")
+            cmessage.created_at = cmessage.course_message.created_at
+          elsif cmessage.course_message.respond_to?("created_on")
+            cmessage.created_at = cmessage.course_message.created_on
+          end
+          cmessage.save
+
+          course_all_message = MessageAll.where("message_type = '#{cmessage.class.to_s}' and message_id = '#{cmessage.id}'").first
+          course_all_message.created_at = cmessage.created_at
+          course_all_message.save
+        end
+      end
+      end
+    end
+
+    forge_count = ForgeMessage.all.count / 30 + 2
+    transaction do
+      for i in 1 ... forge_count do i
+      ForgeMessage.page(i).per(30).each do |fmessage|
+        if fmessage.forge_message
+          if fmessage.forge_message.respond_to?("created_at")
+            fmessage.created_at = fmessage.forge_message.created_at
+          elsif fmessage.forge_message.respond_to?("created_on")
+            fmessage.created_at = fmessage.forge_message.created_on
+          end
+          fmessage.save
+
+          forge_all_message = MessageAll.where("message_type = '#{fmessage.class.to_s}' and message_id = '#{fmessage.id}'").first
+          forge_all_message.created_at = fmessage.created_at
+          forge_all_message.save
+        end
+      end
+      end
+    end
+  end
+
+  def down
+  end
+end