cssd-doc/cssd-back
1
0
Fork 0
mirror of https://git.meshkee.com/cssd/cssd-back.git synced 2026-10-12 13:21:21 +03:30
Code Issues Packages Projects Releases Wiki Activity

ticket debug store and show ticket

Browse Source
This commit is contained in:
saeid
2019-07-02 10:53:21 +04:30
parent 870d736281
commit 579cab4e33
8 changed files with 67025 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MessageController.php
+17 -15
View File
@@ -41,6 +41,10 @@ class MessageController extends Controller
})
->paginate(10);
// foreach ($Users as $User) {
// $CountMessages = $User->messagesSent->count() + $User->messagesReceived->count();
// $User->message_count = $CountMessages;
// }
return \MessageResponse::data($Users);
}
@@ -53,26 +57,24 @@ class MessageController extends Controller
// if (!auth('api')->user()->can('show', $Message)) {
// return \MessageResponse::error(trans('messages.access_denied'));
// }
// $Message->status = 'Read';
// $Message->save();
$User = User::findOrFail($UserID);
// dd($UserID);
$SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
// $SendMessages = Message::where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID)->get();
$ReceivedMessages = Message::where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id)->get();
// foreach ($ReceivedMessages as $ReceivedMessage) {
// $ReceivedMessage->status = 'Read';
// // $SendMessage->save();
// }
$Messages = Message::whereHas('sender_user', function($q) use($User){
$q->where('id', $User->id);
})->orWhereHas('recipient_user', function($q) use($User){
$q->where('id', $User->id);
})->get();
// $Messages = $SendMessages->merge($ReceivedMessages)->sortby('created_at');
$Messages = Message::where(function ($query) use ($UserID)
{
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $UserID);
})->orWhere(function ($query) use ($UserID)
{
$query->where('sender_user_id', $UserID)->where('recipient_user_id', auth('api')->user()->id);
})->get();
foreach ($ReceivedMessages as $ReceivedMessage) {
$ReceivedMessage->status = 'Read';
$ReceivedMessage->save();
}
// $Messages =
return \MessageResponse::data($Messages);
}
public function store(StoreMessageRequest $request)
app/Http/Requests/StoreMessageRequest.php
+4 -4
View File
@@ -26,8 +26,8 @@ class StoreMessageRequest extends FormRequest
case 'POST': {
return [
'title' => 'nullable',
'text' => 'required',
'recipient_user_id' => 'required',
'message' => 'required',
'user_id' => 'required',
];
break;
}
@@ -36,8 +36,8 @@ class StoreMessageRequest extends FormRequest
$Message = $this->route('Message');
return [
'title' => 'nullable',
'text' => 'required',
'recipient_user_id' => 'required',
'message' => 'required',
'user_id' => 'required',
];
break;
app/Policies/MessagePolicy.php
+6 -2
View File
@@ -6,7 +6,7 @@ use App\User;
use App\Message;␍
use Doctrine\Tests\Common\Inflector\InflectorTest;␍
␍
class Message␍
class MessagePolicy␍
{␍
public function delete(User $User, Message $Message)␍
{␍
@@ -14,7 +14,11 @@ class Message
return true;␍
}␍
␍
␍
public function update(User $User, Message $Message)␍
{␍
// if($User->hasRole('Admin'))␍
return true;␍
}␍
public function store(User $User)␍
{␍
// if($User->hasRole('Admin'))␍