zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-31 09:53:56 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'story/115405945-clean_expired_pendings' into staging

Browse source
This commit is contained in:
Vladimir Krylov 2016-03-14 17:58:41 +02:00
commit ec03169bb6
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/models/domain.rb
View file

@ -352,7 +352,8 @@ class Domain < ActiveRecord::Base
end end
# state change shouln't be # state changes may be done low-level - no validation
# in this metod we still save PaperTrail log.
def clean_pendings_lowlevel def clean_pendings_lowlevel
statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION) statuses.delete(DomainStatus::PENDING_DELETE_CONFIRMATION)
statuses.delete(DomainStatus::PENDING_UPDATE) statuses.delete(DomainStatus::PENDING_UPDATE)
@ -361,13 +362,21 @@ class Domain < ActiveRecord::Base
status_notes[DomainStatus::PENDING_UPDATE] = '' status_notes[DomainStatus::PENDING_UPDATE] = ''
status_notes[DomainStatus::PENDING_DELETE] = '' status_notes[DomainStatus::PENDING_DELETE] = ''
update_columns( hash = {
registrant_verification_token: nil, registrant_verification_token: nil,
registrant_verification_asked_at: nil, registrant_verification_asked_at: nil,
pending_json: {}, pending_json: {},
status_notes: status_notes, status_notes: status_notes,
statuses: statuses.presence || [DomainStatus::OK] statuses: statuses.presence || [DomainStatus::OK]
) }
# papertrail
self.attributes = hash
record_create
clear_version_instance!
reset_transaction_id
update_columns(hash)
end end
def pending_update! def pending_update!