From 3e929a895c73818d6a0052ffe9ce4f4c17f9be58 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Wed, 3 Feb 2016 11:26:55 +0200
Subject: [PATCH 1/3] Story#112965483 - skip generating whoises for reserved
 and blocked domains if domain exists

---
 app/models/blocked_domain.rb  | 2 ++
 app/models/reserved_domain.rb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/models/blocked_domain.rb b/app/models/blocked_domain.rb
index 079926512..9f2b62aee 100644
--- a/app/models/blocked_domain.rb
+++ b/app/models/blocked_domain.rb
@@ -19,6 +19,8 @@ class BlockedDomain < ActiveRecord::Base
   end
 
   def generate_data
+    next if Domain.where(name: name).any?
+
     @json = generate_json
     @body = generate_body
     update_whois_server
diff --git a/app/models/reserved_domain.rb b/app/models/reserved_domain.rb
index d477f2524..4695b0bcd 100644
--- a/app/models/reserved_domain.rb
+++ b/app/models/reserved_domain.rb
@@ -30,6 +30,8 @@ class ReservedDomain < ActiveRecord::Base
   end
 
   def generate_data
+    next if Domain.where(name: name).any?
+
     @json = generate_json
     @body = generate_body
     update_whois_server

From 2fea2975f6c778071634b5103dffc1f6c13c1892 Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Wed, 3 Feb 2016 11:35:26 +0200
Subject: [PATCH 2/3] Story#112965483 - skip removing whoises for reserved and
 blocked domains if domain exists

---
 app/models/blocked_domain.rb  | 2 ++
 app/models/reserved_domain.rb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/models/blocked_domain.rb b/app/models/blocked_domain.rb
index 9f2b62aee..a52f80248 100644
--- a/app/models/blocked_domain.rb
+++ b/app/models/blocked_domain.rb
@@ -48,6 +48,8 @@ class BlockedDomain < ActiveRecord::Base
   end
 
   def remove_data
+    next if Domain.where(name: name).any?
+
     Whois::Record.where(name: name).delete_all
   end
 end
diff --git a/app/models/reserved_domain.rb b/app/models/reserved_domain.rb
index 4695b0bcd..070d9fca8 100644
--- a/app/models/reserved_domain.rb
+++ b/app/models/reserved_domain.rb
@@ -59,6 +59,8 @@ class ReservedDomain < ActiveRecord::Base
   end
 
   def remove_data
+    next if Domain.where(name: name).any?
+
     Whois::Record.where(name: name).delete_all
   end
 

From 54c86e15a32c14eb8a1bac70c264ca462efc4e7d Mon Sep 17 00:00:00 2001
From: Vladimir Krylov <vladimir.krylov@perfectline.co>
Date: Wed, 3 Feb 2016 12:20:42 +0200
Subject: [PATCH 3/3] Story#112965483 - we need to return from method, no
 iteration here

---
 app/models/blocked_domain.rb  | 4 ++--
 app/models/reserved_domain.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/blocked_domain.rb b/app/models/blocked_domain.rb
index a52f80248..f5ca0371c 100644
--- a/app/models/blocked_domain.rb
+++ b/app/models/blocked_domain.rb
@@ -19,7 +19,7 @@ class BlockedDomain < ActiveRecord::Base
   end
 
   def generate_data
-    next if Domain.where(name: name).any?
+    return if Domain.where(name: name).any?
 
     @json = generate_json
     @body = generate_body
@@ -48,7 +48,7 @@ class BlockedDomain < ActiveRecord::Base
   end
 
   def remove_data
-    next if Domain.where(name: name).any?
+    return if Domain.where(name: name).any?
 
     Whois::Record.where(name: name).delete_all
   end
diff --git a/app/models/reserved_domain.rb b/app/models/reserved_domain.rb
index 070d9fca8..c5d0cf9f2 100644
--- a/app/models/reserved_domain.rb
+++ b/app/models/reserved_domain.rb
@@ -30,7 +30,7 @@ class ReservedDomain < ActiveRecord::Base
   end
 
   def generate_data
-    next if Domain.where(name: name).any?
+    return if Domain.where(name: name).any?
 
     @json = generate_json
     @body = generate_body
@@ -59,7 +59,7 @@ class ReservedDomain < ActiveRecord::Base
   end
 
   def remove_data
-    next if Domain.where(name: name).any?
+    return if Domain.where(name: name).any?
 
     Whois::Record.where(name: name).delete_all
   end