Pārlūkot izejas kodu

Ref #11. Added a function to return JSON.

Maximiliano Schvindt 6 gadi atpakaļ
vecāks
revīzija
ba76798532

+ 18 - 9
src/Swagger/Client/Base/Services.php

@@ -46,7 +46,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -79,7 +80,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -113,7 +115,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -158,7 +161,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -216,7 +220,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -274,7 +279,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -303,7 +309,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -342,7 +349,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -381,7 +389,8 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 

+ 14 - 14
src/Swagger/Client/Cablemodem/Services.php

@@ -52,7 +52,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -93,7 +93,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -124,7 +124,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -163,7 +163,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -196,7 +196,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -241,7 +241,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -274,7 +274,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -318,7 +318,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -415,7 +415,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -512,7 +512,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -541,7 +541,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -579,7 +579,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -617,7 +617,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -661,7 +661,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 }

+ 32 - 32
src/Swagger/Client/FTTH/Services.php

@@ -58,7 +58,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -99,7 +99,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -131,7 +131,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -172,7 +172,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -205,7 +205,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -246,7 +246,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -279,7 +279,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -320,7 +320,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -353,7 +353,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -394,7 +394,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -428,7 +428,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -469,7 +469,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -502,7 +502,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -544,7 +544,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -577,7 +577,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -633,7 +633,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -858,7 +858,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1010,7 +1010,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1039,7 +1039,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1077,7 +1077,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1115,7 +1115,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
     public function getONUDisable(Application $app)
@@ -1152,7 +1152,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1190,7 +1190,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1252,7 +1252,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1284,7 +1284,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1324,7 +1324,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1356,7 +1356,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1396,7 +1396,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1428,7 +1428,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1468,7 +1468,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1500,7 +1500,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 
@@ -1548,7 +1548,7 @@ class Services extends ApiServices
             } catch (Throwable $t) {
                 $content = $t->getCode() . " - " . $t->getMessage();
             }
-            return new Response($content, $codeResponse);
+            return Utils::returnJSON($content, $codeResponse);
         });
     }
 

+ 17 - 0
src/Utils.php

@@ -1,6 +1,7 @@
 <?php
 
 use Swagger\Client\ObjectSerializer;
+use Symfony\Component\HttpFoundation\Response;
 
 class Utils
 {
@@ -65,4 +66,20 @@ class Utils
         }
         return null;
     }
+
+    /**
+     * Return JSON response with data or {message:messages}.
+     * @param string $content contento to return
+     * @param integer $result code of response
+     * @return Response Return Response.
+     */
+    public function returnJSON($content, $codeResponse = 400) {
+
+        json_decode($content,true);
+        if(json_last_error() != JSON_ERROR_NONE) 
+            $content = json_encode(['message' => $content]);
+
+        
+        return new Response($content, $codeResponse, ['content-type' => 'application/json']);
+    }
 }