From d71d9730bd74f9bf29455578401cb2fa91c1227e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 20 Nov 2015 09:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=81=E7=A7=BB=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...copy_forge_activities_to_org_activities.rb | 2 +- ...opy_course_activities_to_org_activities.rb | 20 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb b/db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb index d3ded425e..5fbd5469a 100644 --- a/db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb +++ b/db/migrate/20151116020842_copy_forge_activities_to_org_activities.rb @@ -3,7 +3,7 @@ class CopyForgeActivitiesToOrgActivities < ActiveRecord::Migration count = ForgeActivity.all.count/30 + 1 for i in 1 ... count do transaction do - ForgeActivity.page(i).per(30).each do + ForgeActivity.page(i).per(30).each do |forge_act| OrgActivity.create(:user_id => forge_act.user_id, :org_act_id => forge_act.forge_act_id, :org_act_type => forge_act.forge_act_type, diff --git a/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb b/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb index e616064e7..08f952afa 100644 --- a/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb +++ b/db/migrate/20151118031602_copy_course_activities_to_org_activities.rb @@ -4,13 +4,19 @@ class CopyCourseActivitiesToOrgActivities < ActiveRecord::Migration for i in 1 ... count do transaction do CourseActivity.page(i).per(30).each do |course_act| - OrgActivity.create(:user_id => course_act.user_id, - :org_act_type => course_act.course_act_type, - :org_act_id => course_act.course_act_id, - :container_id => course_act.course_id, - :container_type => "Course", - :created_at => course_act.created_at, - :updated_at => course_act.updated_at) + if course_act.course_act_type == 'Message' && !course_act.course_act.parent_id.nil? + org_activity = OrgActivity.where("org_act_type = 'Message' and org_act_id = #{course_act.course_act.parent.id}").first + org_activity.created_at = course_act.created_at + org_activity.save + else + OrgActivity.create(:user_id => course_act.user_id, + :org_act_id => course_act.course_act_id, + :org_act_type => course_act.course_act_type, + :container_id => course_act.course_id, + :container_type => 'Course', + :created_at => course_act.created_at, + :updated_at => course_act.updated_at) + end end end end