From d67c2c09a605da9bc9967113bab247ff668481a8 Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@sipwise.com>
Date: Fri, 6 Oct 2017 18:17:42 +0300
Subject: [PATCH] TT#22494 Fix return_representation

Pass  forms_exceptions to  the get_hal_from_item from the PUT and PATCH

Change-Id: I95ce0df9e3b9d6ba0d361d61bd1a2b18815d84cd
---
 lib/NGCP/Panel/Role/API.pm          | 10 +++++-----
 lib/NGCP/Panel/Role/EntitiesItem.pm | 15 ++++++++++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/lib/NGCP/Panel/Role/API.pm b/lib/NGCP/Panel/Role/API.pm
index b2192b7899..aff0d925e3 100644
--- a/lib/NGCP/Panel/Role/API.pm
+++ b/lib/NGCP/Panel/Role/API.pm
@@ -955,7 +955,7 @@ sub update_item {
 
     $item = $self->update_item_model($c, $item, $old_resource, $resource, $form, $process_extras);
 
-    return $item, $form, $form_exceptions;
+    return $item, $form, $form_exceptions, $process_extras;
 }
 
 #------ dummy & default methods
@@ -1119,11 +1119,11 @@ sub relation {
 #------ /accessors ---
 sub return_representation{
     my($self, $c, %params) = @_;
-    my($hal, $response, $item, $form, $preference, $form_exceptions) = @params{qw/hal response item form preference form_exceptions/};
+    my($hal, $response, $item, $preference, $form, $form_exceptions) = @params{qw/hal response item preference form form_exceptions/};
 
     $preference //= $self->require_preference($c);
     return unless $preference;
-    $hal //= $self->hal_from_item($c, $item, $form, \%params );
+    $hal //= $self->hal_from_item($c, $item, $form, \%params);#form_excptions will goes with params
     $response //= HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
         $hal->http_headers,
     ), $hal->as_json);
@@ -1141,11 +1141,11 @@ sub return_representation{
 
 sub return_representation_post{
     my($self, $c, %params) = @_;
-    my($hal, $response, $item, $form, $preference, $form_exceptions) = @params{qw/hal response item form preference form_exceptions/};
+    my($hal, $response, $item, $preference, $form, $form_exceptions) = @params{qw/hal response item preference form form_exceptions/};
 
     $preference //= $self->require_preference($c);
     return unless $preference;
-    $hal //= $self->hal_from_item($c, $item, $form, \%params );
+    $hal //= $self->hal_from_item($c, $item, $form, \%params);#form_excptions will goes with params
     $response //= HTTP::Response->new(HTTP_OK, undef, HTTP::Headers->new(
         $hal->http_headers,
     ), $hal->as_json);
diff --git a/lib/NGCP/Panel/Role/EntitiesItem.pm b/lib/NGCP/Panel/Role/EntitiesItem.pm
index d7f45eb20a..527efdfb4b 100644
--- a/lib/NGCP/Panel/Role/EntitiesItem.pm
+++ b/lib/NGCP/Panel/Role/EntitiesItem.pm
@@ -110,7 +110,12 @@ sub patch {
         $self->complete_transaction($c);
         $self->post_process_commit($c, 'patch', $item, $old_resource, $resource, $form, $process_extras);
 
-        $self->return_representation($c, 'item' => $item, 'form' => $form, 'preference' => $preference );
+        $self->return_representation($c, 
+            'item' => $item, 
+            'form' => $form, 
+            'preference' => $preference, 
+            'form_exceptions' => $form_exceptions 
+        );
     }
     return;
 }
@@ -147,8 +152,12 @@ sub put {
 
         $self->complete_transaction($c);
         $self->post_process_commit($c, 'put', $item, $old_resource, $resource, $form, $process_extras);
-
-        $self->return_representation($c, 'item' => $item, 'form' => $form, 'preference' => $preference, 'form_exceptions' => $form_exceptions );
+        $self->return_representation($c, 
+            'item' => $item, 
+            'form' => $form, 
+            'preference' => $preference, 
+            'form_exceptions' => $form_exceptions 
+        );
     }
     return;
 }