cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Manish Verma
2018-08-23 10:05:52 +00:00
parent 8f4a43a723
commit 2f0796e954
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Api/v2/TicketController.php
View File

@@ -5,6 +5,7 @@ namespace App\Api\v2;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Lang;
class TicketController extends Controller
{
public function __construct()
@@ -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['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);
}
}

29
app/Http/helpers.php
View File

@@ -225,36 +225,45 @@ function timezone()
// For API response
/**
* formats the error message into json error 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
* @param int $responseCode
*
* @return json
*/
function errorResponse($errorMsg, $responseCode = 400){
function errorResponse($errorMsg, $responseCode = 400)
{
$response = ['success'=>false, 'message'=>$errorMsg];
return response()->json($response, $responseCode);
}
/**
* formats success message/data into json success response
* formats success message/data into json success response.
*
* @param string $successMsg
* @param array/string $data data of the response
* @param integer $responseCode
* @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
* 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(),