Merge remote-tracking branch 'origin/master' into 1177-bulk-force-delete

CHANGELOG.md

@@ -1,3 +1,8 @@
+05.01.2021
+* Fixed ok/inactive bug together with disclosed contact atribute handling [#1786](https://github.com/internetee/registry/pull/1786)
+* Ident data to simplified domain list in registrant APO 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
 * fix for REPP logging and registrar portal communication [#1782](https://github.com/internetee/registry/pull/1782)
 

Gemfile.lock

@@ -264,7 +264,7 @@ GEM
     mime-types-data (3.2020.0512)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.2)
     monetize (1.9.4)
       money (~> 6.12)
@@ -281,8 +281,9 @@ GEM
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
     nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.0)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nori (2.6.0)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
@@ -320,6 +321,7 @@ GEM
       erubis
       que (~> 0.8)
       sinatra
+    racc (1.5.2)
     rack (2.2.3)
     rack-oauth2 (1.16.0)
       activesupport

app/models/domain.rb

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

app/models/epp/domain.rb

@@ -27,7 +27,7 @@ class Epp::Domain < Domain
     active_techs = tech_domain_contacts.select { |x| !x.marked_for_destruction? }
 
     # 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?
         add_epp_error('2304', nil, nil, I18n.t(:contact_is_not_valid, value: x.code))
         ok = false

lib/serializers/registrant_api/domain.rb

@@ -59,7 +59,8 @@ module Serializers
           registrant_verification_asked_at: domain.registrant_verification_asked_at,
           registrar: { name: domain.registrar.name, website: domain.registrar.website },
           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