Story#105418634 Update Whois json

app/models/whois_record.rb

@@ -41,17 +41,17 @@ class WhoisRecord < ActiveRecord::Base
 
     @disclosed = []
     h[:name]       = domain.name
-    h[:registrant] = domain.registrant.name
+    h[:status]     = domain.statuses.map { |x| status_map[x] || x }
-    h[:status] = domain.statuses.map { |x| status_map[x] || x }.join(', ')
     h[:registered] = domain.registered_at.try(:to_s, :iso8601)
-    h[:updated_at] = domain.updated_at.try(:to_s, :iso8601)
+    h[:changed]    = domain.updated_at.try(:to_s, :iso8601)
-    h[:valid_to] = domain.valid_to.try(:to_s, :iso8601)
+    h[:expire]     = domain.valid_to.try(:to_date).try(:to_s)
+    h[:outzone]    = nil
+    h[:delete]     = domain.force_delete_at.try(:to_s, :iso8601)
 
-    # update registar triggers when adding new attributes
+
-    h[:registrar] = domain.registrar.name
+    h[:registrant]       = domain.registrant.name
-    h[:registrar_phone] = domain.registrar.phone
+    h[:registrant_email] = domain.registrant.email
-    h[:registrar_address] = domain.registrar.address
+    h[:changed]          = domain.registrant.updated_at.try(:to_s, :iso8601)
-    h[:registrar_update_at] = domain.registrar.updated_at.try(:to_s, :iso8601)
 
     h[:admin_contacts] = []
     domain.admin_contacts.each do |ac|
@@ -59,7 +59,6 @@ class WhoisRecord < ActiveRecord::Base
       h[:admin_contacts] << {
           name: ac.name,
           email: ac.email,
-        registrar: ac.registrar.name,
           created_at: ac.created_at.try(:to_s, :iso8601)
       }
     end
@@ -69,17 +68,24 @@ class WhoisRecord < ActiveRecord::Base
       h[:tech_contacts] << {
           name: tc.name,
           email: tc.email,
-        registrar: tc.registrar.name,
           created_at: tc.created_at.try(:to_s, :iso8601)
       }
     end
-    h[:nameservers] = []
+
-    domain.nameservers.each do |ns|
+    # update registar triggers when adding new attributes
-      h[:nameservers] << {
+    h[:registrar]         = domain.registrar.name
-        hostname: ns.hostname,
+    h[:registrar_url]     = domain.registrar.url
-        updated_at: ns.updated_at.try(:to_s, :iso8601)
+    h[:registrar_phone]   = domain.registrar.phone
-      }
+    h[:registrar_address] = domain.registrar.address
-    end
+    h[:registrar_changed] = domain.registrar.updated_at.try(:to_s, :iso8601)
+
+    h[:nameservers]         = domain.nameservers.pluck(:hostname).uniq.select(&:present?)
+    h[:nameservers_changed] = domain.nameservers.pluck(:updated_at).max.try(:to_s, :iso8601)
+
+    h[:dnssec_keys]    = domain.dnskeys.map{|key| "#{key.flags} #{key.protocol} #{key.alg} #{key.public_key}" }
+    h[:dnssec_changed] = domain.dnskeys.pluck(:updated_at).max.try(:to_s, :iso8601) rescue nil
+
+
     h[:disclosed] = @disclosed
     h
   end