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

Move expiration logic from domain's callback to epp::domain.new_from_epp

Browse source 
#186
This commit is contained in:
Artur Beljajev 2016-10-28 14:55:29 +03:00
parent ad0220088a
commit 0de7512adc
4 changed files with 37 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/domain.rb
View file

@ -77,7 +77,6 @@ class Domain < ActiveRecord::Base
end
before_create :generate_auth_info
before_create :set_validity_dates
before_create -> { self.reserved = in_reserved_list?; nil }
before_save :manage_automatic_statuses
@ -546,13 +545,6 @@ class Domain < ActiveRecord::Base
end
# rubocop:enable Lint/Loop
def set_validity_dates
self.registered_at = Time.zone.now
self.valid_from = Time.zone.now
# we need + 1 day as this is more correct from juridical side
self.valid_to = valid_from.utc.beginning_of_day + self.class.convert_period_to_time(period, period_unit) + 1.day
end
# rubocop:disable Metrics/AbcSize
# rubocop:disable Metrics/MethodLength
def set_force_delete

3
app/models/epp/domain.rb
View file

@ -51,6 +51,9 @@ class Epp::Domain < Domain
class << self
def new_from_epp(frame, current_user)
domain = Epp::Domain.new
domain.registered_at = Time.zone.now
domain.valid_from = Time.zone.now
domain.expire_time = domain.valid_from.beginning_of_day + convert_period_to_time(domain.period, domain.period_unit) + 1.day
domain.attributes = domain.attrs_from(frame, current_user)
domain.attach_default_contacts
domain