Merge branch 'master' of https://github.com/internetee/registry into 1857-covered-registry-by-tests

app/models/concerns/domain/registry_lockable.rb

@@ -12,6 +12,7 @@ module Concerns
           statuses << DomainStatus::SERVER_DELETE_PROHIBITED
           statuses << DomainStatus::SERVER_TRANSFER_PROHIBITED
           self.locked_by_registrant_at = Time.zone.now
+          alert_registrar_lock_changes!(lock: true)
 
           save!
         end
@@ -42,10 +43,21 @@ module Concerns
           statuses.delete(DomainStatus::SERVER_DELETE_PROHIBITED)
           statuses.delete(DomainStatus::SERVER_TRANSFER_PROHIBITED)
           self.locked_by_registrant_at = nil
+          alert_registrar_lock_changes!(lock: false)
 
           save!
         end
       end
+
+      def alert_registrar_lock_changes!(lock: true)
+        translation = lock ? 'locked' : 'unlocked'
+        registrar.notifications.create!(
+          text: I18n.t("notifications.texts.registrar_#{translation}",
+                       domain_name: name),
+          attached_obj_id: name,
+          attached_obj_type: self.class.name
+        )
+      end
     end
   end
 end

app/models/epp/contact.rb

@@ -42,17 +42,12 @@ class Epp::Contact < Contact
       )
     end
 
-    def check_availability(codes)
+    def check_availability(codes, reg:)
       codes = [codes] if codes.is_a?(String)
-
       res = []
-      codes.each do |x|
-        contact = find_by_epp_code(x)
-        if contact
-          res << { code: contact.code, avail: 0, reason: 'in use' }
-        else
-          res << { code: x, avail: 1 }
-        end
+      codes.map { |c| c.include?(':') ? c : "#{reg}:#{c}" }.map { |c| c.strip.upcase }.each do |x|
+        c = find_by_epp_code(x)
+        res << (c ? { code: c.code, avail: 0, reason: 'in use' } : { code: x, avail: 1 })
       end
 
       res

app/models/notification.rb

@@ -25,6 +25,10 @@ class Notification < ApplicationRecord
     ''
   end
 
+  def registry_lock?
+    text.include?('has been locked') || text.include?('has been unlocked')
+  end
+
   private
 
   def set_defaults

app/models/whois_record.rb

@@ -97,7 +97,9 @@ class WhoisRecord < ApplicationRecord
   end
 
   def destroy_whois_record
-    Whois::Record.without_auctions.where(name: name).delete_all
+    return if Auction.find_by(domain: name).present?
+
+    Whois::Record.where(name: name).delete_all
   end
 
   private