diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2016-08-09 18:39:13 +0200 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2016-08-09 18:39:13 +0200 |
| commit | c90d167b5ec020138f7d72cb1006d1436c980a2a (patch) | |
| tree | 34d399c2e664d76dd90d492fe6a540a4e2cd0398 /app | |
| parent | 08ecf0e78e1f0f3073fb0d2fa3dfa8d29acbbd04 (diff) | |
| download | gitlab-ce-c90d167b5ec020138f7d72cb1006d1436c980a2a.tar.gz | |
Create Member.expired scope.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/member.rb | 1 | ||||
| -rw-r--r-- | app/workers/remove_expired_members_worker.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index bcb6e32d53a..84bbbffe718 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -31,6 +31,7 @@ class Member < ActiveRecord::Base scope :non_invite, -> { where(invite_token: nil) } scope :request, -> { where.not(requested_at: nil) } scope :has_access, -> { where('access_level > 0') } + scope :expired, -> { where('expires_at <= ?', Time.current) } scope :guests, -> { where(access_level: GUEST) } scope :reporters, -> { where(access_level: REPORTER) } diff --git a/app/workers/remove_expired_members_worker.rb b/app/workers/remove_expired_members_worker.rb index 2d773ec72df..cf765af97ce 100644 --- a/app/workers/remove_expired_members_worker.rb +++ b/app/workers/remove_expired_members_worker.rb @@ -2,7 +2,7 @@ class RemoveExpiredMembersWorker include Sidekiq::Worker def perform - Member.where('expires_at <= ?', Time.current).find_each do |member| + Member.expired.find_each do |member| begin Members::AuthorizedDestroyService.new(member).execute rescue => ex |