Handle situation where the error validations are coming from a dingo …

…store resource failed exception, and the errors are in a messagebag. Specify default key case, in case it's not set in api.php
specialtactics · Jul 4, 2019 · e4a9d69 · e4a9d69
1 parent d267729
commit e4a9d69
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/APIBoilerplate.php b/src/APIBoilerplate.php
@@ -12,6 +12,7 @@ class APIBoilerplate
      */
     const CAMEL_CASE = 'camel-case';
     const SNAKE_CASE = 'snake-case';
+    const DEFAULT_CASE = self::CAMEL_CASE;
 
     /**
      * Case type config path

diff --git a/src/Exceptions/RestfulApiExceptionHandler.php b/src/Exceptions/RestfulApiExceptionHandler.php
@@ -26,7 +26,7 @@ protected function prepareReplacements(Exception $exception)
         $replacements = parent::prepareReplacements($exception);
 
         // Format error message field keys
-        if ($exception instanceof \Illuminate\Validation\ValidationException) {
+        if ($exception instanceof \Illuminate\Validation\ValidationException || $exception instanceof \Dingo\Api\Exception\StoreResourceFailedException) {
             $replacements = $this->formatCaseOfValidationMessages($replacements);
         }
 
@@ -52,12 +52,23 @@ protected function formatCaseOfValidationMessages($replacements)
         if (array_key_exists($errorKey, $replacements)) {
             $errorMessages = $replacements[$errorKey];
 
-            if (Config(APIBoilerplate::CASE_TYPE_CONFIG_PATH) == APIBoilerplate::CAMEL_CASE) {
+            // Handle MessageBag situation
+            $usingMessageBag = false;
+            if (!is_array($errorMessages) && $errorMessages instanceof \Illuminate\Support\MessageBag) {
+                $errorMessages = $errorMessages->toArray();
+                $usingMessageBag = true;
+            }
+
+            if (Config(APIBoilerplate::CASE_TYPE_CONFIG_PATH, APIBoilerplate::DEFAULT_CASE) == APIBoilerplate::CAMEL_CASE) {
                 $errorMessages = camel_case_array_keys($errorMessages);
             } else {
                 $errorMessages = snake_case_array_keys($errorMessages);
             }
 
+            if ($usingMessageBag) {
+                $errorMessages = new \Illuminate\Support\MessageBag($errorMessages);
+            }
+
             $replacements[$errorKey] = $errorMessages;
         }