From b4b43afa56ac8d5eb8a30f556c40879809afe5b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Wed, 29 Apr 2020 16:24:35 +0300
Subject: [PATCH] Reduce complexity for dispute whois generation

---
 app/models/dispute.rb | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/app/models/dispute.rb b/app/models/dispute.rb
index 754fc4208..b9cabdeaa 100644
--- a/app/models/dispute.rb
+++ b/app/models/dispute.rb
@@ -26,10 +26,6 @@ class Dispute < ApplicationRecord
     dispute.update(closed: true) if dispute.present?
   end
 
-  def for_active_domain?
-    Domain.where(name: domain_name).any?
-  end
-
   def set_expiry_date
     return if starts_at.blank?
 
@@ -44,11 +40,7 @@ class Dispute < ApplicationRecord
     return if starts_at > Time.zone.today
 
     wr = Whois::Record.find_or_initialize_by(name: domain_name)
-    if for_active_domain?
-      wr.json['status'] << 'disputed' unless wr.json['status'].include? 'disputed'
-    else
-      wr.json = generate_json(wr) # we need @json to bind to class
-    end
+    wr.json = generate_json(wr)
     wr.save
   end
 
@@ -75,12 +67,12 @@ class Dispute < ApplicationRecord
   end
 
   def generate_json(record)
+    status_arr = (record.json['status'] ||= [])
     h = HashWithIndifferentAccess.new(name: domain_name, status: ['disputed'])
     return h if record.json.blank?
+    return record.json if status_arr.include? 'disputed'
 
-    status_arr = (record.json['status'] ||= [])
-    status_arr.push('disputed') unless status_arr.include? 'disputed'
-
+    status_arr.push('disputed')
     record.json['status'] = status_arr
     record.json
   end