Merge branch 'master' into 952-revoking-cert-does-not-stop-user-from-logging-in

app/models/auction.rb

@@ -23,10 +23,19 @@ class Auction < ApplicationRecord
     save!
   end
 
+  def whois_deadline
+    registration_deadline.to_s
+  end
+
   def mark_as_no_bids
     no_bids!
   end
 
+  def mark_deadline(registration_deadline)
+    self.registration_deadline = registration_deadline
+    save!
+  end
+
   def mark_as_payment_received
     self.status = self.class.statuses[:payment_received]
     generate_registration_code
@@ -69,4 +78,4 @@ class Auction < ApplicationRecord
   def registration_code_matches?(code)
     registration_code == code
   end
-end
+end

app/models/whois/record.rb

@@ -16,7 +16,8 @@ module Whois
       elsif auction.awaiting_payment? || auction.payment_received?
         update!(json: { name: auction.domain,
                         status: ['PendingRegistration'],
-                        disclaimer: self.class.disclaimer })
+                        disclaimer: self.class.disclaimer,
+                        registration_deadline: auction.whois_deadline })
       end
     end
   end