ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reduce queries to group membership importer 

refs CORE-1738

test plan
 - group membership importer should work

Change-Id: I3678dfa3501ccb48a0de6db5fa32dd50a9c2a1c7
Reviewed-on: https://gerrit.instructure.com/161309
Reviewed-by: James Williams  <jamesw@instructure.com>
Tested-by: Jenkins
Product-Review: Rob Orton <rob@instructure.com>
QA-Review: Rob Orton <rob@instructure.com>
This commit is contained in:
Rob Orton 2018-08-20 08:55:45 -06:00
parent 621b475544
commit 96115a0997
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/sis/group_membership_importer.rb
View File

@ -65,8 +65,8 @@ module SIS
end
# can't query group.group_memberships, since that excludes deleted memberships
group_membership = GroupMembership.where(group_id: group, user_id: user).active.take
group_membership ||= GroupMembership.where(group_id: group, user_id: user).take
group_membership = GroupMembership.where(group_id: group, user_id: user).
order(Arel.sql("CASE WHEN workflow_state = 'accepted' THEN 0 ELSE 1 END")).take
group_membership ||= group.group_memberships.build(:user => user)
group_membership.sis_batch_id = @batch.id