From 2f0796e9548f89a6574272a17979a154ff668d25 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Thu, 23 Aug 2018 10:05:52 +0000 Subject: [PATCH] Apply fixes from StyleCI --- app/Api/v2/TicketController.php | 11 ++++---- app/Http/helpers.php | 47 ++++++++++++++++++++------------- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/app/Api/v2/TicketController.php b/app/Api/v2/TicketController.php index 030fc8678..477f7f42f 100644 --- a/app/Api/v2/TicketController.php +++ b/app/Api/v2/TicketController.php @@ -5,13 +5,14 @@ namespace App\Api\v2; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use Lang; + class TicketController extends Controller { public function __construct() { $this->middleware('jwt.authOveride'); } - + protected function getTickets(Request $request) { try { @@ -50,14 +51,12 @@ class TicketController extends Controller // $result = json_encode($result[0]); foreach ($result as $value) { - if ($value->profile_pic == '') { $value->profile_pic = \Gravatar::src($value->c_email); } else { - $value->profile_pic = url('/') . '/uploads/profilepic/' . $value->profile_pic; + $value->profile_pic = url('/').'/uploads/profilepic/'.$value->profile_pic; } - $value['from'] = ['id' => $value['c_uid'], 'first_name' => $value['c_fname'], 'last_name' => $value['c_lname'], 'user_name' => $value['c_uname'], 'email' => $value['c_email'], 'profile_pic' => $value['profile_pic']]; $value['assignee'] = ['id' => $value['a_uid'], 'first_name' => $value['a_fname'], 'last_name' => $value['a_lname'], 'user_name' => $value['a_uname'], 'email' => $value['a_email']]; @@ -71,7 +70,6 @@ class TicketController extends Controller unset($value['assigned_to'], $value['profile_pic'], $value['created_at2'], $value['updated_at2'], $value['dept_id'], $value['css'], $value['name'], $value['color'], $value['due'], $value['countattachment'], $value['countthread'], $value['ticket_status_name'], $value['ticket_title']); } - // $result = json_encode($result); return successResponse('', $result); } else { @@ -83,6 +81,7 @@ class TicketController extends Controller } else { $error = Lang::get('lang.missing_requre_parameters'); } + return errorResponse($error, $responseCode = 400); // return response()->json(compact('error')); } catch (\Exception $ex) { @@ -90,9 +89,11 @@ class TicketController extends Controller $line = $ex->getLine(); $file = $ex->getFile(); dd($e); + return errorResponse(compact('error', 'file', 'line'), $responseCode = 400); } catch (\TokenExpiredException $e) { dd($e); + return errorResponse($e->getMessage(), $responseCode = 400); } } diff --git a/app/Http/helpers.php b/app/Http/helpers.php index e8287dd50..2524aa9fa 100644 --- a/app/Http/helpers.php +++ b/app/Http/helpers.php @@ -225,39 +225,48 @@ function timezone() // For API response /** - * formats the error message into json error response - * @param string/array $errorMsg errorMsg can be an array of errors or string - * @param integer $responseCode + * formats the error message into json error response. + * + * @param string/array $errorMsg errorMsg can be an array of errors or string + * @param int $responseCode + * * @return json */ -function errorResponse($errorMsg, $responseCode = 400){ - $response = ['success'=>false, 'message'=>$errorMsg]; +function errorResponse($errorMsg, $responseCode = 400) +{ + $response = ['success'=>false, 'message'=>$errorMsg]; + return response()->json($response, $responseCode); } /** - * formats success message/data into json success response - * @param string $successMsg - * @param array/string $data data of the response - * @param integer $responseCode + * formats success message/data into json success response. + * + * @param string $successMsg + * @param array/string $data data of the response + * @param int $responseCode + * * @return json */ -function successResponse($successMsg='', $data='', $responseCode=200){ +function successResponse($successMsg = '', $data = '', $responseCode = 200) +{ $response = !$successMsg ? ['success'=>true, 'data'=>$data] : (!$data ? ['success'=>true, 'message'=>$successMsg] : ['success'=>true, 'message'=>$successMsg, 'data'=>$data]); + return response()->json($response); } - - /** - * formats exception response by giving enough information for debugginh - * @param \Exception $exception exception object - * @return Response with json response content + * formats exception response by giving enough information for debugginh. + * + * @param \Exception $exception exception object + * + * @return Response with json response content */ -function exceptionResponse(\Exception $exception){ +function exceptionResponse(\Exception $exception) +{ return errorResponse([ - 'file'=>$exception->getFile(), - 'line_number'=>$exception->getLine(), - 'exception'=>$exception->getMessage(), + 'file' => $exception->getFile(), + 'line_number'=> $exception->getLine(), + 'exception' => $exception->getMessage(), ], 500); }