update v1.0.7.9 R.C.

This is a Release Candidate. We are still testing.

app/Http/Controllers/Api/v1/ApiController.php

@@ -33,8 +33,8 @@ use Illuminate\Support\Collection;
  *
  * @version v1
  */
-class ApiController extends Controller
-{
+class ApiController extends Controller {
+
     public $user;
     public $request;
     public $ticket;
@@ -54,8 +54,7 @@ class ApiController extends Controller
     /**
      * @param Request $request
      */
-    public function __construct(Request $request)
-    {
+    public function __construct(Request $request) {
         $this->request = $request;
 
         $this->middleware('jwt.auth');
@@ -64,7 +63,9 @@ class ApiController extends Controller
             $user = \JWTAuth::parseToken()->authenticate();
             $this->user = $user;
         } catch (\Tymon\JWTAuth\Exceptions\TokenExpiredException $e) {
+            
         } catch (\Tymon\JWTAuth\Exceptions\JWTException $e) {
+            
         }
 
         $ticket = new TicketController();
@@ -119,17 +120,16 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function createTicket()
-    {
+    public function createTicket() {
         try {
             $v = \Validator::make($this->request->all(), [
-                        'user_id'   => 'required|exists:users,id',
-                        'subject'   => 'required',
-                        'body'      => 'required',
+                        'user_id' => 'required|exists:users,id',
+                        'subject' => 'required',
+                        'body' => 'required',
                         'helptopic' => 'required|exists:help_topic,id',
-                        'sla'       => 'required|exists:sla_plan,id',
-                        'priority'  => 'required|exists:ticket_priority,priority_id',
-                        'dept'      => 'required|exists:department,id',
+                        'sla' => 'required|exists:sla_plan,id',
+                        'priority' => 'required|exists:ticket_priority,priority_id',
+                        'dept' => 'required|exists:department,id',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
@@ -178,7 +178,7 @@ class ApiController extends Controller
             $error = $e->getMessage();
 
             return response()->json(compact('error'))
-                    ->header('Authenticate: xBasic realm', 'fake');
+                            ->header('Authenticate: xBasic realm', 'fake');
         }
     }
 
@@ -189,12 +189,11 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function ticketReply()
-    {
+    public function ticketReply() {
         //dd($this->request->all());
         try {
             $v = \Validator::make($this->request->all(), [
-                        'ticket_ID'     => 'required|exists:tickets,id',
+                        'ticket_ID' => 'required|exists:tickets,id',
                         'reply_content' => 'required',
             ]);
             if ($v->fails()) {
@@ -224,15 +223,14 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function editTicket()
-    {
+    public function editTicket() {
         try {
             $v = \Validator::make($this->request->all(), [
-                        'ticket_id'       => 'required|exists:tickets,id',
-                        'subject'         => 'required',
-                        'sla_plan'        => 'required|exists:sla_plan,id',
-                        'help_topic'      => 'required|exists:help_topic,id',
-                        'ticket_source'   => 'required|exists:ticket_source,id',
+                        'ticket_id' => 'required|exists:tickets,id',
+                        'subject' => 'required',
+                        'sla_plan' => 'required|exists:sla_plan,id',
+                        'help_topic' => 'required|exists:help_topic,id',
+                        'ticket_source' => 'required|exists:ticket_source,id',
                         'ticket_priority' => 'required|exists:ticket_priority,priority_id',
             ]);
             if ($v->fails()) {
@@ -262,8 +260,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function deleteTicket()
-    {
+    public function deleteTicket() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'ticket_id' => 'required|exists:tickets,id',
@@ -296,16 +293,15 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function openedTickets()
-    {
+    public function openedTickets() {
         try {
             //            $result = $this->model->where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', null)->orderBy('id', 'DESC')->get();
 //            return response()->json(compact('result'));
 
             $result = $this->user->join('tickets', function ($join) {
-                $join->on('users.id', '=', 'tickets.user_id')
+                        $join->on('users.id', '=', 'tickets.user_id')
                         ->where('isanswered', '=', 0)->where('status', '=', 1)->whereNull('assigned_to');
-            })
+                    })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -341,16 +337,15 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function unassignedTickets()
-    {
+    public function unassignedTickets() {
         try {
             //dd('sdhjbc');
 //            $result = $this->model->where('assigned_to', '=', null)->where('status', '1')->orderBy('id', 'DESC')->get();
 //            return response()->json(compact('result'));
             $unassigned = $this->user->join('tickets', function ($join) {
-                $join->on('users.id', '=', 'tickets.user_id')
+                        $join->on('users.id', '=', 'tickets.user_id')
                         ->whereNull('assigned_to')->where('status', '=', 1);
-            })
+                    })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -360,8 +355,8 @@ class ApiController extends Controller
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
-                    ->select('user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
-                    ->orderBy('ticket_thread.updated_at', 'desc')
+                    ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
+                    ->orderBy('updated_at', 'desc')
                     ->groupby('tickets.id')
                     ->distinct()
                     ->paginate(10)
@@ -386,16 +381,15 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function closeTickets()
-    {
+    public function closeTickets() {
         try {
             //            $result = $this->model->where('status', '>', 1)->where('status', '<', 4)->orderBy('id', 'DESC')->get();
 //            return response()->json(compact('result'));
 
             $result = $this->user->join('tickets', function ($join) {
-                $join->on('users.id', '=', 'tickets.user_id')
-                        ->where('isanswered', '=', 0)->where('status', '>', 1)->where('status', '<', 4);
-            })
+                        $join->on('users.id', '=', 'tickets.user_id')
+                        ->where('status','=',3)->orWhere('status','=',2);
+                    })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -405,8 +399,8 @@ class ApiController extends Controller
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
-                    ->select('user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
-                    ->orderBy('ticket_thread.updated_at', 'desc')
+                    ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
+                    ->orderBy('updated_at', 'desc')
                     ->groupby('tickets.id')
                     ->distinct()
                     ->paginate(10)
@@ -431,8 +425,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getAgents()
-    {
+    public function getAgents() {
         try {
             $result = $this->faveoUser->where('role', 'agent')->orWhere('role', 'admin')->where('active', 1)->get();
 
@@ -455,8 +448,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getTeams()
-    {
+    public function getTeams() {
         try {
             $result = $this->team->get();
 
@@ -479,12 +471,11 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function assignTicket()
-    {
+    public function assignTicket() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'ticket_id' => 'required',
-                        'user'      => 'required',
+                        'user' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
@@ -518,8 +509,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getCustomers()
-    {
+    public function getCustomers() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'search' => 'required',
@@ -530,10 +520,10 @@ class ApiController extends Controller
                 return response()->json(compact('error'));
             }
             $search = $this->request->input('search');
-            $result = $this->faveoUser->where('first_name', 'like', '%'.$search.'%')->orWhere('last_name', 'like', '%'.$search.'%')->orWhere('user_name', 'like', '%'.$search.'%')->orWhere('email', 'like', '%'.$search.'%')->get();
+            $result = $this->faveoUser->where('first_name', 'like', '%' . $search . '%')->orWhere('last_name', 'like', '%' . $search . '%')->orWhere('user_name', 'like', '%' . $search . '%')->orWhere('email', 'like', '%' . $search . '%')->get();
 
             return response()->json(compact('result'))
-                    ->header('X-Header-One', 'Header Value');
+                            ->header('X-Header-One', 'Header Value');
         } catch (Exception $e) {
             $error = $e->getMessage();
             $line = $e->getLine();
@@ -544,8 +534,7 @@ class ApiController extends Controller
             $error = $e->getMessage();
 
             return response()->json(compact('error'))
-
-            ->header('X-Header-One', 'Header Value');
+                            ->header('X-Header-One', 'Header Value');
         }
     }
 
@@ -554,8 +543,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getCustomersWith()
-    {
+    public function getCustomersWith() {
         try {
             $users = $this->user
                     ->leftJoin('user_assign_organization', 'user_assign_organization.user_id', '=', 'users.id')
@@ -577,7 +565,7 @@ class ApiController extends Controller
             $error = $e->getMessage();
 
             return response()->json(compact('error'))
-                    ->header('Authenticate: xBasic realm', 'fake');
+                            ->header('Authenticate: xBasic realm', 'fake');
         }
     }
 
@@ -586,8 +574,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getCustomer()
-    {
+    public function getCustomer() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'user_id' => 'required',
@@ -619,8 +606,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function searchTicket()
-    {
+    public function searchTicket() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'search' => 'required',
@@ -631,7 +617,7 @@ class ApiController extends Controller
                 return response()->json(compact('error'));
             }
             $search = $this->request->input('search');
-            $result = $this->thread->select('ticket_id')->where('title', 'like', '%'.$search.'%')->orWhere('body', 'like', '%'.$search.'%')->get();
+            $result = $this->thread->select('ticket_id')->where('title', 'like', '%' . $search . '%')->orWhere('body', 'like', '%' . $search . '%')->get();
 
             return response()->json(compact('result'));
         } catch (Exception $e) {
@@ -652,8 +638,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function ticketThreads()
-    {
+    public function ticketThreads() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'id' => 'required',
@@ -690,8 +675,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function checkUrl()
-    {
+    public function checkUrl() {
         //dd($this->request);
         try {
             $v = \Validator::make($this->request->all(), [
@@ -708,7 +692,7 @@ class ApiController extends Controller
                 $url = str_finish($url, '/');
             }
 
-            $url = $url.'/api/v1/helpdesk/check-url?api_key='.$this->request->input('api_key').'&token='.\Config::get('app.token');
+            $url = $url . '/api/v1/helpdesk/check-url?api_key=' . $this->request->input('api_key') . '&token=' . \Config::get('app.token');
             $result = $this->CallGetApi($url);
             //dd($result);
             return response()->json(compact('result'));
@@ -728,8 +712,7 @@ class ApiController extends Controller
      *
      * @return string
      */
-    public function urlResult()
-    {
+    public function urlResult() {
         return 'success';
     }
 
@@ -740,8 +723,7 @@ class ApiController extends Controller
      *
      * @return type int|string|json
      */
-    public function callGetApi($url)
-    {
+    public function callGetApi($url) {
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_URL, $url);
@@ -750,7 +732,7 @@ class ApiController extends Controller
         $response = curl_exec($curl);
 
         if (curl_errno($curl)) {
-            echo 'error:'.curl_error($curl);
+            echo 'error:' . curl_error($curl);
         }
 
         return $response;
@@ -765,8 +747,7 @@ class ApiController extends Controller
      *
      * @return type int|string|json
      */
-    public function callPostApi($url, $data)
-    {
+    public function callPostApi($url, $data) {
         $curl = curl_init($url);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_URL, $url);
@@ -776,7 +757,7 @@ class ApiController extends Controller
         $response = curl_exec($curl);
 
         if (curl_errno($curl)) {
-            echo 'error:'.curl_error($curl);
+            echo 'error:' . curl_error($curl);
         }
 
         return $response;
@@ -788,8 +769,7 @@ class ApiController extends Controller
      *
      * @return type | json
      */
-    public function generateApiKey()
-    {
+    public function generateApiKey() {
         try {
             $set = $this->setting->where('id', '1')->first();
             //dd($set);
@@ -823,8 +803,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getHelpTopic()
-    {
+    public function getHelpTopic() {
         try {
             $result = $this->helptopic->get();
 
@@ -847,8 +826,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getSlaPlan()
-    {
+    public function getSlaPlan() {
         try {
             $result = $this->slaPlan->get();
 
@@ -871,8 +849,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getPriority()
-    {
+    public function getPriority() {
         try {
             $result = $this->priority->get();
 
@@ -895,8 +872,7 @@ class ApiController extends Controller
      *
      * @return json
      */
-    public function getDepartment()
-    {
+    public function getDepartment() {
         try {
             $result = $this->department->get();
 
@@ -919,8 +895,7 @@ class ApiController extends Controller
      *
      * @return type json
      */
-    public function getTickets()
-    {
+    public function getTickets() {
         try {
             $tickets = $this->model->orderBy('created_at', 'desc')->paginate(10);
             $tickets->toJson();
@@ -944,10 +919,13 @@ class ApiController extends Controller
      *
      * @return type json
      */
-    public function inbox()
-    {
+    public function inbox() {
         try {
-            $inbox = $this->user->join('tickets', 'users.id', '=', 'tickets.user_id')
+            
+            $inbox = $this->user->join('tickets', function ($join) {
+                        $join->on('users.id', '=', 'tickets.user_id')
+                        ->where('status', '=', 1);
+                    })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -955,10 +933,10 @@ class ApiController extends Controller
                     ->join('ticket_status', 'ticket_status.id', '=', 'tickets.status')
                     ->join('ticket_thread', function ($join) {
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
-                        ->whereNotNull('title');
+                        ->whereNotNull('ticket_thread.title');
                     })
-                    ->select('user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
-                    ->orderBy('ticket_thread.updated_at', 'desc')
+                    ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'ticket_thread.title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
+                    ->orderBy('updated_at', 'desc')
                     ->groupby('tickets.id')
                     ->distinct()
                     ->paginate(10)
@@ -983,13 +961,12 @@ class ApiController extends Controller
      *
      * @return type json
      */
-    public function internalNote()
-    {
+    public function internalNote() {
         try {
             $v = \Validator::make($this->request->all(), [
-                        'userid'   => 'required|exists:users,id',
+                        'userid' => 'required|exists:users,id',
                         'ticketid' => 'required|exists:tickets,id',
-                        'body'     => 'required',
+                        'body' => 'required',
             ]);
             if ($v->fails()) {
                 $error = $v->errors();
@@ -1016,13 +993,12 @@ class ApiController extends Controller
         }
     }
 
-    public function getTrash()
-    {
+    public function getTrash() {
         try {
             $trash = $this->user->join('tickets', function ($join) {
-                $join->on('users.id', '=', 'tickets.user_id')
+                        $join->on('users.id', '=', 'tickets.user_id')
                         ->where('status', '=', 5);
-            })
+                    })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1032,8 +1008,8 @@ class ApiController extends Controller
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
-                    ->select('user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
-                    ->orderBy('ticket_thread.updated_at', 'desc')
+                    ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
+                    ->orderBy('updated_at', 'desc')
                     ->groupby('tickets.id')
                     ->distinct()
                     ->paginate(10)
@@ -1053,8 +1029,7 @@ class ApiController extends Controller
         }
     }
 
-    public function getMyTicketsAgent()
-    {
+    public function getMyTicketsAgent() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'user_id' => 'required|exists:users,id',
@@ -1071,9 +1046,10 @@ class ApiController extends Controller
                 return response()->json(compact('error'));
             }
             $result = $this->user->join('tickets', function ($join) use ($id) {
-                $join->on('users.id', '=', 'tickets.assigned_to')
-                        ->where('user_id', '=', $id);
-            })
+                        $join->on('users.id', '=', 'tickets.assigned_to')
+                            ->where('status', '=', 1);
+                        //->where('user_id', '=', $id);
+                    })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1083,8 +1059,9 @@ class ApiController extends Controller
                         $join->on('tickets.id', '=', 'ticket_thread.ticket_id')
                         ->whereNotNull('title');
                     })
-                    ->select('user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
-                    ->orderBy('ticket_thread.updated_at', 'desc')
+                    ->where('users.id',$id)
+                    ->select(\DB::raw('max(ticket_thread.updated_at) as updated_at'),'user_name', 'first_name', 'last_name', 'email', 'profile_pic', 'ticket_number', 'tickets.id', 'title', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name')
+                    ->orderBy('updated_at', 'desc')
                     ->groupby('tickets.id')
                     ->distinct()
                     ->paginate(10)
@@ -1104,8 +1081,7 @@ class ApiController extends Controller
         }
     }
 
-    public function getMyTicketsUser()
-    {
+    public function getMyTicketsUser() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'user_id' => 'required|exists:users,id',
@@ -1122,9 +1098,9 @@ class ApiController extends Controller
                 return response()->json(compact('error'));
             }
             $result = $this->user->join('tickets', function ($join) use ($id) {
-                $join->on('users.id', '=', 'tickets.user_id')
+                        $join->on('users.id', '=', 'tickets.user_id')
                         ->where('user_id', '=', $id);
-            })
+                    })
                     ->join('department', 'department.id', '=', 'tickets.dept_id')
                     ->join('ticket_priority', 'ticket_priority.priority_id', '=', 'tickets.priority_id')
                     ->join('sla_plan', 'sla_plan.id', '=', 'tickets.sla')
@@ -1139,7 +1115,7 @@ class ApiController extends Controller
                     ->groupby('tickets.id')
                     ->distinct()
                     ->get()
-                   // ->paginate(10)
+                    // ->paginate(10)
                     ->toJson();
 
             return $result;
@@ -1156,8 +1132,7 @@ class ApiController extends Controller
         }
     }
 
-    public function getTicketById()
-    {
+    public function getTicketById() {
         try {
             $v = \Validator::make($this->request->all(), [
                         'id' => 'required|exists:tickets,id',
@@ -1169,11 +1144,18 @@ class ApiController extends Controller
             }
             $id = $this->request->input('id');
             if (!$this->model->where('id', $id)->first()) {
-                $error = 'There is no Ticket as ticket id: '.$id;
+                $error = 'There is no Ticket as ticket id: ' . $id;
 
                 return response()->json(compact('error'));
             }
-            $result = $this->model->where('id', $id)->first();
+            $query = $this->user->join('tickets', function ($join) use ($id) {
+                        $join->on('users.id', '=', 'tickets.user_id')
+                        ->where('tickets.id', '=', $id);
+                    });
+            $response = $this->differenciateHelpTopic($query);
+            //$select = 'users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','num_sequence','user_id','priority_id','sla','max_open_ticket','captcha','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','is_transfer','transfer_at','reopened_at','duedate','closed_at','last_message_at','last_response_at';
+            
+             $result = $response->addSelect('users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','user_id','priority_id','sla','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','reopened_at','duedate','closed_at','last_message_at','last_response_at','tickets.created_at','tickets.updated_at')->first();       
 
             return response()->json(compact('result'));
         } catch (\Exception $e) {
@@ -1189,8 +1171,7 @@ class ApiController extends Controller
         }
     }
 
-    public function createPagination($array, $perPage)
-    {
+    public function createPagination($array, $perPage) {
         try {
             //Get current page form url e.g. &page=6
             $currentPage = LengthAwarePaginator::resolveCurrentPage();
@@ -1218,8 +1199,7 @@ class ApiController extends Controller
         }
     }
 
-    public function collaboratorSearch()
-    {
+    public function collaboratorSearch() {
         $this->validate($this->request, ['term' => 'required']);
         try {
             $emails = $this->ticket->autosearch();
@@ -1229,7 +1209,7 @@ class ApiController extends Controller
                 foreach ($emails as $key => $email) {
                     $user_model = $user->where('email', $email)->first();
                     //return $user_model;
-                    $users[$key]['name'] = $user_model->first_name.' '.$user_model->last_name;
+                    $users[$key]['name'] = $user_model->first_name . ' ' . $user_model->last_name;
                     $users[$key]['email'] = $email;
                     $users[$key]['avatar'] = $this->avatarUrl($email);
                 }
@@ -1246,13 +1226,12 @@ class ApiController extends Controller
         }
     }
 
-    public function avatarUrl($email)
-    {
+    public function avatarUrl($email) {
         try {
             $user = new User();
             $user = $user->where('email', $email)->first();
             if ($user->profile_pic) {
-                $url = url('lb-faveo/media/profilepic/'.$user->profile_pic);
+                $url = url('uploads/profilepic/' . $user->profile_pic);
             } else {
                 $url = \Gravatar::src($email);
             }
@@ -1264,11 +1243,10 @@ class ApiController extends Controller
         }
     }
 
-    public function addCollaboratorForTicket()
-    {
+    public function addCollaboratorForTicket() {
         try {
             $v = \Validator::make(\Input::get(), [
-                        'email'     => 'required|email|unique:users',
+                        'email' => 'required|email|unique:users',
                         'ticket_id' => 'required',
                             ]
             );
@@ -1295,8 +1273,7 @@ class ApiController extends Controller
         }
     }
 
-    public function getCollaboratorForTicket()
-    {
+    public function getCollaboratorForTicket() {
         try {
             $v = \Validator::make(\Input::get(), [
                         'ticket_id' => 'required',
@@ -1325,12 +1302,11 @@ class ApiController extends Controller
         }
     }
 
-    public function deleteCollaborator()
-    {
+    public function deleteCollaborator() {
         try {
             $v = \Validator::make(\Input::get(), [
                         'ticketid' => 'required',
-                        'email'    => 'required',
+                        'email' => 'required',
                             ]
             );
             if ($v->fails()) {
@@ -1350,8 +1326,7 @@ class ApiController extends Controller
         }
     }
 
-    public function dependency()
-    {
+    public function dependency() {
         try {
             $department = $this->department->select('name', 'id')->get()->toArray();
             $sla = $this->slaPlan->select('name', 'id')->get()->toArray();
@@ -1362,7 +1337,7 @@ class ApiController extends Controller
             $status = \DB::table('ticket_status')->select('name', 'id')->get();
             $source = \DB::table('ticket_source')->select('name', 'id')->get();
             $result = ['departments' => $department, 'sla' => $sla, 'staffs' => $staff, 'teams' => $team,
-                'priorities'         => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source, ];
+                'priorities' => $priority, 'helptopics' => $helptopic, 'status' => $status, 'sources' => $source,];
 
             return response()->json(compact('result'));
         } catch (\Exception $e) {
@@ -1373,4 +1348,73 @@ class ApiController extends Controller
             return response()->json(compact('error', 'file', 'line'));
         }
     }
+    
+    public function differenciateHelpTopic($query){
+        $ticket = $query->first();
+        $check = 'department';
+        if($ticket){
+            if($ticket->dept_id && $ticket->help_topic_id){
+                return $this->getSystem($check, $query);
+            }
+            if(!$ticket->dept_id && $ticket->help_topic_id){
+                return $query->select('tickets.help_topic_id');
+            }
+            if($ticket->dept_id && !$ticket->help_topic_id){
+                return $query->select('tickets.dept_id');
+            }
+        }
+    }
+    
+    public function getSystem($check,$query){
+        switch ($check){
+            case 'department':
+                return $query->select('tickets.dept_id');
+            case 'helpTopic':
+                return $query->select('tickets.help_topic_id');
+            default :
+                return $query->select('tickets.dept_id');
+        }
+    }
+    /**
+     * Register a user with username and password.
+     *
+     * @param Request $request
+     *
+     * @return type json
+     */
+    public function register(Request $request)
+    {
+        try {
+            $v = \Validator::make($request->all(), [
+                        'email'    => 'required|email|unique:users',
+                        'password' => 'required|min:6',
+            ]);
+            if ($v->fails()) {
+                $error = $v->errors();
+
+                return response()->json(compact('error'));
+            }
+            $auth = $this->user;
+            $email = $request->input('email');
+            $username = $request->input('email');
+            $password = \Hash::make($request->input('password'));
+            $role = $request->input('role');
+            if($auth->role=='agent'){
+                $role = "user";
+            }
+            $user = new User();
+            $user->password = $password;
+            $user->user_name = $username;
+            $user->email = $email;
+            $user->role = $role;
+            $user->save();
+            return response()->json(compact('user'));
+        } catch (\Exception $e) {
+            $error = $e->getMessage();
+
+            return response()->json(compact('error'));
+        }
+    }
+
+
 }