From 15e090c3b1710f13ab63ecf25c2bfa5023e54043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Tue, 1 Dec 2020 12:53:30 +0200
Subject: [PATCH] Fix CC issue

---
 lib/serializers/registrant_api/domain.rb | 32 +++++++++---------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/lib/serializers/registrant_api/domain.rb b/lib/serializers/registrant_api/domain.rb
index 29362ad5c..f8d5bb830 100644
--- a/lib/serializers/registrant_api/domain.rb
+++ b/lib/serializers/registrant_api/domain.rb
@@ -8,26 +8,8 @@ module Serializers
         @simplify = simplify
       end
 
-      def to_json
-        if @simplify
-          return {
-            id: domain.uuid,
-            name: domain.name,
-            registered_at: domain.registered_at,
-            valid_to: domain.valid_to,
-            outzone_at: domain.outzone_at,
-            registrant_verification_asked_at: domain.registrant_verification_asked_at,
-            statuses: domain.statuses,
-            registrar: {
-              name: domain.registrar.name,
-              website: domain.registrar.website,
-            },
-            registrant: {
-              name: domain.registrant.name,
-              id: domain.registrant.uuid,
-            },
-          }
-        end
+      def to_json(_obj = nil)
+        return simple_object if @simplify
 
         {
           id: domain.uuid,
@@ -70,6 +52,16 @@ module Serializers
 
       private
 
+      def simple_object
+        {
+          id: domain.uuid, name: domain.name, registered_at: domain.registered_at,
+          valid_to: domain.valid_to, outzone_at: domain.outzone_at, statuses: domain.statuses,
+          registrant_verification_asked_at: domain.registrant_verification_asked_at,
+          registrar: { name: domain.registrar.name, website: domain.registrar.website },
+          registrant: { name: domain.registrant.name, id: domain.registrant.uuid }
+        }
+      end
+
       def dnssec_keys
         domain.dnskeys.map do |key|
           "#{key.flags} #{key.protocol} #{key.alg} #{key.public_key}"