zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-30 22:46:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2578 from internetee/2561-fix-force-delete-conflicts

Browse source 
Refactored and corrected code for domain force delete
This commit is contained in:
Timo Võhmar 2023-05-18 14:55:25 +03:00 • committed by GitHub
commit f34e5c99ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 224 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/models/concerns/email_verifable.rb
View file

@ -16,21 +16,19 @@ module EmailVerifable
end
def need_to_start_force_delete?
flag = false
ValidationEvent::INVALID_EVENTS_COUNT_BY_LEVEL.each do |level, count|
flag = true if validation_events.count >= count && validate_email_data(level: level, count: count)
ValidationEvent::INVALID_EVENTS_COUNT_BY_LEVEL.any? do |level, count|
validation_events.count >= count && validate_email_data(level: level, count: count)
end
flag
end
def need_to_lift_force_delete?
validation_events.failed.empty? ||
ValidationEvent::REDEEM_EVENTS_COUNT_BY_LEVEL.any? do |level, count|
validation_events.order(created_at: :desc).limit(count).all? do |event|
event.check_level == level.to_s && event.successful?
end
end
return true if validation_events.failed.empty?
ValidationEvent::REDEEM_EVENTS_COUNT_BY_LEVEL.any? do |level, count|
validation_events.order(created_at: :desc)
.limit(count)
.all? { |event| event.check_level == level.to_s && event.successful? }
end
end
def correct_email_format