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

Merge remote-tracking branch 'origin/master' into repp-domains

Browse source
This commit is contained in:
Karl Erik Õunapuu 2021-01-06 11:13:38 +02:00
commit d53622ebc8
No known key found for this signature in database
GPG key ID: C9DD647298A34764
4 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGELOG.md
View file

@ -1,3 +1,11 @@
06.01.2021
* Reverted Nokogiri bump due to dependency conflicts in production [#1787](https://github.com/internetee/registry/pull/1787)
05.01.2021
* Fixed ok/inactive bug together with disclosed contact attribute handling [#1786](https://github.com/internetee/registry/pull/1786)
* Ident data to simplified domain list in registrant API to help with sorting and filtering [#1783](https://github.com/internetee/registry/pull/1783)
* Bumped Nokogiri to 1.11.0 [#1785](https://github.com/internetee/registry/pull/1785)
23.12.2020 23.12.2020
* fix for REPP logging and registrar portal communication [#1782](https://github.com/internetee/registry/pull/1782) * fix for REPP logging and registrar portal communication [#1782](https://github.com/internetee/registry/pull/1782)

2
app/models/domain.rb
View file

@ -574,7 +574,7 @@ class Domain < ApplicationRecord
if statuses.empty? && valid? if statuses.empty? && valid?
statuses << DomainStatus::OK statuses << DomainStatus::OK
elsif (statuses.length > 1 && active?) || !valid? elsif (statuses.length > 1) || !valid?
statuses.delete(DomainStatus::OK) statuses.delete(DomainStatus::OK)
end end

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

@ -29,7 +29,7 @@ class Epp::Domain < Domain
active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? } active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? }
# validate registrant here as well # validate registrant here as well
([registrant] + active_admins + active_techs).each do |x| ([Contact.find_by(code: registrant.code)] + active_admins + active_techs).each do |x|
unless x.valid? unless x.valid?
add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code)) add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code))
ok = false ok = false

3
lib/serializers/registrant_api/domain.rb
View file

@ -59,7 +59,8 @@ module Serializers
registrant_verification_asked_at: domain.registrant_verification_asked_at, registrant_verification_asked_at: domain.registrant_verification_asked_at,
registrar: { name: domain.registrar.name, website: domain.registrar.website }, registrar: { name: domain.registrar.name, website: domain.registrar.website },
registrant: { name: domain.registrant.name, id: domain.registrant.uuid, registrant: { name: domain.registrant.name, id: domain.registrant.uuid,
phone: domain.registrant.phone, email: domain.registrant.email } phone: domain.registrant.phone, email: domain.registrant.email,
ident: domain.registrant.ident }
} }
end end