From 7edf48c885e6bced344f125c8e8304a04866f0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Tue, 17 Nov 2020 11:51:45 +0200
Subject: [PATCH] Fix some CC issues

---
 .../repp/v1/contacts_controller.rb            |   6 ++-
 .../v1/registrar/nameservers_controller.rb    |   2 +-
 lib/serializers/registrant_api/.DS_Store      | Bin 0 -> 6148 bytes
 lib/serializers/repp/contact.rb               |  44 ++++++++----------
 4 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 lib/serializers/registrant_api/.DS_Store

diff --git a/app/controllers/repp/v1/contacts_controller.rb b/app/controllers/repp/v1/contacts_controller.rb
index 959d4f6c7..144be01c6 100644
--- a/app/controllers/repp/v1/contacts_controller.rb
+++ b/app/controllers/repp/v1/contacts_controller.rb
@@ -15,7 +15,8 @@ module Repp
 
       ## GET /repp/v1/contacts/1
       def show
-        serializer = ::Serializers::Repp::Contact.new(@contact, show_address: Contact.address_processing?)
+        serializer = ::Serializers::Repp::Contact.new(@contact,
+                                                      show_address: Contact.address_processing?)
         render_success(data: serializer.to_json)
       end
 
@@ -82,7 +83,8 @@ module Repp
         return contacts.pluck(:code) unless details
 
         contacts = contacts.map do |contact|
-          serializer = ::Serializers::Repp::Contact.new(contact, show_address: Contact.address_processing?)
+          serializer = ::Serializers::Repp::Contact.new(contact,
+                                                        show_address: Contact.address_processing?)
           serializer.to_json
         end
 
diff --git a/app/controllers/repp/v1/registrar/nameservers_controller.rb b/app/controllers/repp/v1/registrar/nameservers_controller.rb
index fb00d92c0..47004d97b 100644
--- a/app/controllers/repp/v1/registrar/nameservers_controller.rb
+++ b/app/controllers/repp/v1/registrar/nameservers_controller.rb
@@ -34,7 +34,7 @@ module Repp
           params.permit(data: [
                           :type, :id,
                           { domains: [],
-                            attributes: [:hostname, { ipv4: [], ipv6: [] }] },
+                            attributes: [:hostname, { ipv4: [], ipv6: [] }] }
                         ])
         end
 
diff --git a/lib/serializers/registrant_api/.DS_Store b/lib/serializers/registrant_api/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/lib/serializers/repp/contact.rb b/lib/serializers/repp/contact.rb
index fe08a6f7d..8a3cad616 100644
--- a/lib/serializers/repp/contact.rb
+++ b/lib/serializers/repp/contact.rb
@@ -8,35 +8,29 @@ module Serializers
         @show_address = show_address
       end
 
-      def to_json
-        json = {
-          id: contact.code,
-          name: contact.name,
-          ident: {
-            code: contact.ident,
-            type: contact.ident_type,
-            country_code: contact.ident_country_code,
-          },
-          email: contact.email,
-          phone: contact.phone,
-          fax: contact.fax,
-          auth_info: contact.auth_info,
-          statuses: contact.statuses,
-          disclosed_attributes: contact.disclosed_attributes,
-        }
+      def to_json(_obj)
+        json = { id: contact.code, name: contact.name, ident: ident,
+                 email: contact.email, phone: contact.phone, fax: contact.fax,
+                 auth_info: contact.auth_info, statuses: contact.statuses,
+                 disclosed_attributes: contact.disclosed_attributes }
 
-        return json unless @show_address
-
-        json[:address] = {
-          street: contact.street,
-          zip: contact.zip,
-          city: contact.city,
-          state: contact.state,
-          country_code: contact.country_code,
-        }
+        json[:address] = address if @show_address
 
         json
       end
+
+      def ident
+        {
+          code: contact.ident,
+          type: contact.ident_type,
+          country_code: contact.ident_country_code,
+        }
+      end
+
+      def address
+        { street: contact.street, zip: contact.zip, city: contact.city,
+          state: contact.state, country_code: contact.country_code }
+      end
     end
   end
 end