Fix purge_date format to fast/soft forcedelete domains

This commit is contained in:
Alex Sherman 2020-01-21 18:49:09 +05:00
parent a9ce9dba51
commit 363a74248f
2 changed files with 31 additions and 2 deletions

View file

@ -93,8 +93,8 @@ module Concerns::Domain::ForceDelete # rubocop:disable Metrics/ModuleLength
end
def purge_date
force_delete_date || valid_to + Setting.expire_warning_period.days +
Setting.redemption_grace_period.days + 1.day
(force_delete_date&.beginning_of_day || valid_to + Setting.expire_warning_period.days +
Setting.redemption_grace_period.days)
end
private