From a782b19d284c70dea7535b91b2b6414b60a80a1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= <karlerik@kreative.ee>
Date: Tue, 13 Oct 2020 14:43:45 +0300
Subject: [PATCH] Deserializers: Mirror ContactCreate from ContactUpdate

---
 app/controllers/repp/v1/base_controller.rb    | 12 ++++++++----
 .../repp/v1/contacts_controller.rb            |  4 ++--
 lib/deserializers/xml/contact_create.rb       | 19 +------------------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/app/controllers/repp/v1/base_controller.rb b/app/controllers/repp/v1/base_controller.rb
index 714fb3a47..3cd636eb2 100644
--- a/app/controllers/repp/v1/base_controller.rb
+++ b/app/controllers/repp/v1/base_controller.rb
@@ -37,10 +37,14 @@ module Repp
       end
 
       def format_epp_errors
-        @epp_errors.each_with_index do |errors, index|
-          next unless errors[:code] == '2304' && errors[:value].present? &&
-                      errors[:value][:val] == DomainStatus::SERVER_DELETE_PROHIBITED &&
-                      errors[:value][:obj] == 'status'
+        @epp_errors.each_with_index do |error, index|
+          blocked_by_delete_prohibited?(error, index)
+        end
+      end
+
+      def blocked_by_delete_prohibited?(error, index)
+        if error[:code] == 2304 && error[:value][:val] == DomainStatus::SERVER_DELETE_PROHIBITED &&
+           error[:value][:obj] == 'status'
 
           @epp_errors[index][:value][:val] = DomainStatus::PENDING_UPDATE
         end
diff --git a/app/controllers/repp/v1/contacts_controller.rb b/app/controllers/repp/v1/contacts_controller.rb
index 34099bd93..6321f2a40 100644
--- a/app/controllers/repp/v1/contacts_controller.rb
+++ b/app/controllers/repp/v1/contacts_controller.rb
@@ -36,7 +36,7 @@ module Repp
           return
         end
 
-        render_success(create_update_success_data)
+        render_success(create_update_success_body)
       end
 
       ## PUT /repp/v1/contacts/1
@@ -50,7 +50,7 @@ module Repp
           return
         end
 
-        render_success(create_update_success_data)
+        render_success(create_update_success_body)
       end
 
       def contact_addr_present?
diff --git a/lib/deserializers/xml/contact_create.rb b/lib/deserializers/xml/contact_create.rb
index 5bd9c768a..5dfa32ef7 100644
--- a/lib/deserializers/xml/contact_create.rb
+++ b/lib/deserializers/xml/contact_create.rb
@@ -4,24 +4,7 @@ require 'deserializers/xml/contact'
 
 module Deserializers
   module Xml
-    class ContactCreate
-      attr_reader :frame
-
-      def initialize(frame)
-        @frame = frame
-      end
-
-      def contact
-        @contact ||= ::Deserializers::Xml::Contact.new(frame).call
-      end
-
-      def legal_document
-        @legal_document ||= ::Deserializers::Xml::LegalDocument.new(frame).call
-      end
-
-      def ident
-        @ident ||= ::Deserializers::Xml::Ident.new(frame).call
-      end
+    class ContactCreate < ContactUpdate
     end
   end
 end