From a81caf66b86ceef130906e8c70d3a262f64a2bee Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 19 Jul 2019 18:12:32 +0800 Subject: [PATCH 1/2] modify search api --- app/models/searchable/shixun.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/searchable/shixun.rb b/app/models/searchable/shixun.rb index bc19967a2..a564be388 100644 --- a/app/models/searchable/shixun.rb +++ b/app/models/searchable/shixun.rb @@ -47,7 +47,8 @@ module Searchable::Shixun author_name: user.real_name, author_school_name: user.school_name, visits_count: visits, - challenges_count: challenges_count + challenges_count: challenges_count, + study_count: myshixuns_count } end From d19cf56e383ceefb6fbe86e9501a5d8ee93d61fa Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 19 Jul 2019 18:23:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20190309085449_migrate_course_members.rb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/db/migrate/20190309085449_migrate_course_members.rb b/db/migrate/20190309085449_migrate_course_members.rb index 1d28eb5d1..d677e4bd4 100644 --- a/db/migrate/20190309085449_migrate_course_members.rb +++ b/db/migrate/20190309085449_migrate_course_members.rb @@ -19,15 +19,13 @@ class MigrateCourseMembers < ActiveRecord::Migration[5.2] ActiveRecord::Base.transaction do begin - Member.where("course_id != -1").find_each do |member| - if member.course && member.user - puts(member.id) - member.member_roles.each do |role| - course_member_role = role.role_id == 3 ? 1 : (role.role_id == 9 ? 2 : (role.role_id == 7 ? 3 : 4)) - member_group_id = role.role_id == 10 ? member.course_group_id : 0 - CourseMember.create!(course_id: member.course_id, user_id: member.user_id, course_group_id: member_group_id.to_i, - graduation_group_id: member.graduation_group_id.to_i, role: course_member_role, is_active: role.is_current) - end + Member.where("course_id != -1").includes(:member_roles).find_each(batch_size: 500) do |member| + puts(member.id) + member.member_roles.each do |role| + course_member_role = role.role_id == 3 ? 1 : (role.role_id == 9 ? 2 : (role.role_id == 7 ? 3 : 4)) + member_group_id = role.role_id == 10 ? member.course_group_id : 0 + CourseMember.create!(course_id: member.course_id, user_id: member.user_id, course_group_id: member_group_id, + graduation_group_id: member.graduation_group_id, role: course_member_role, is_active: role.is_current) end end rescue Exception => e