mirror of
https://git.meshkee.com/cssd/cssd-back.git
synced 2026-10-11 05:21:06 +03:30
complete ticket
This commit is contained in:
@@ -9,16 +9,9 @@ use App\User;
|
||||
|
||||
class MessageController extends Controller
|
||||
{
|
||||
public function index()
|
||||
public function index(Request $request)
|
||||
{
|
||||
// $Messages = Message::with('recipient_user', 'sender_user')->paginate(10);
|
||||
$User = auth('api')->user();
|
||||
// $ReceivedMessages = $User->messagesReceived;
|
||||
// $SentMessages = $User->messagesSent;
|
||||
// //
|
||||
// $Messages = $SentMessages->merge($ReceivedMessages);
|
||||
|
||||
// $Users = User::whereHas('messagesSent')
|
||||
$role = null;
|
||||
$medical_center_id = null;
|
||||
|
||||
@@ -27,7 +20,7 @@ class MessageController extends Controller
|
||||
$medical_center_id = $User->medical_center_id;
|
||||
$role = 'Admin';
|
||||
}
|
||||
|
||||
$remove = $User->id;
|
||||
$Users = User::whereHas('messagesSent', function($q) use($User){
|
||||
$q->where('sender_user_id', $User->id)->orWhere('recipient_user_id', $User->id);
|
||||
})->orWhereHas('messagesReceived', function($q) use($User){
|
||||
@@ -41,12 +34,25 @@ class MessageController extends Controller
|
||||
})
|
||||
->paginate(10);
|
||||
|
||||
// foreach ($Users as $User) {
|
||||
// $CountMessages = $User->messagesSent->count() + $User->messagesReceived->count();
|
||||
// $User->message_count = $CountMessages;
|
||||
// }
|
||||
foreach ($Users as $user) {
|
||||
$UnReadReceivedMessages = Message::where('sender_user_id', $user->id)->where('recipient_user_id', $User->id)->where('status','UnRead')->get()->count();
|
||||
$user->unread_messages_count = $UnReadReceivedMessages;
|
||||
|
||||
return \MessageResponse::data($Users);
|
||||
$MessagesCount = Message::where(function ($query) use ($user,$User){
|
||||
$query->where('sender_user_id', $user->id)->where('recipient_user_id', $User->id);
|
||||
})->orWhere(function ($query) use ($user,$User){
|
||||
$query->where('sender_user_id', $User->id)->where('recipient_user_id', $user->id);
|
||||
})->get()->count();
|
||||
|
||||
$user->messages_count = $MessagesCount;
|
||||
}
|
||||
|
||||
//
|
||||
// $Users = $Users->filter(function ($value, $key) use($remove){
|
||||
// return $value['id'] != $remove;
|
||||
// });
|
||||
|
||||
return \MessageResponse::data($Users);
|
||||
}
|
||||
public function create()
|
||||
{
|
||||
@@ -100,10 +106,24 @@ class MessageController extends Controller
|
||||
}
|
||||
public function destroy(Message $Message)
|
||||
{
|
||||
if (!auth('api')->user()->can('delete', $Message)) {
|
||||
if (auth('api')->user()->cant('delete', $Message)) {
|
||||
return \MessageResponse::error(trans('messages.access_denied'));
|
||||
}
|
||||
$Message->delete();
|
||||
return \MessageResponse::success(trans('messages.success'));
|
||||
}
|
||||
public function destroyUserMessages(User $User)
|
||||
{
|
||||
// if (auth('api')->user()->cant('deleteUserMessage', Message::class)) {
|
||||
// return \MessageResponse::error(trans('messages.access_denied'));
|
||||
// }
|
||||
Message::where(function ($query) use ($User)
|
||||
{
|
||||
$query->where('sender_user_id', auth('api')->user()->id)->where('recipient_user_id', $User->id);
|
||||
})->orWhere(function ($query) use ($User)
|
||||
{
|
||||
$query->where('sender_user_id', $User->id)->where('recipient_user_id', auth('api')->user()->id);
|
||||
})->get()->each->delete();
|
||||
return \MessageResponse::success(trans('messages.success'));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user