Skip to content

Add method to query all friendship statuses #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add method to query all friendship statuses #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 25 additions & 22 deletions src/Traits/Friendable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ trait Friendable
public function befriend(Model $recipient)
{

if ( ! $this->canBefriend($recipient)) {
if (!$this->canBefriend($recipient)) {
return false;
}

Expand Down Expand Up @@ -124,7 +124,7 @@ public function groupFriend(Model $friend, $groupSlug)
$friendship = $this->findFriendship($friend)->whereStatus(Status::ACCEPTED)->first();
$groupsAvailable = config('acquaintances.friendships_groups', []);

if ( ! isset($groupsAvailable[$groupSlug]) || empty($friendship)) {
if (!isset($groupsAvailable[$groupSlug]) || empty($friendship)) {
return false;
}

Expand Down Expand Up @@ -177,7 +177,7 @@ public function blockFriend(Model $recipient)
{
// if there is a friendship between the two users and the sender is not blocked
// by the recipient user then delete the friendship
if ( ! $this->isBlockedBy($recipient)) {
if (!$this->isBlockedBy($recipient)) {
$this->findFriendship($recipient)->delete();
}

Expand Down Expand Up @@ -331,17 +331,19 @@ public function getFriendRequests()
* It will return the 'friends' models. ex: App\User
*
* @param int $perPage Number
* @param string $status
* @param string $groupSlug
*
* @param array $fields
*
* @return \Illuminate\Database\Eloquent\Collection
*/
public function getFriends($perPage = 0, $groupSlug = '', array $fields = ['*'], bool $cursor = false)
public function getFriends($perPage = 0, $status = Status::ACCEPTED, $groupSlug = '', array $fields = ['*'], bool $cursor = false)
{
return $this->getOrPaginate($this->getFriendsQueryBuilder($groupSlug), $perPage, $fields, $cursor);
return $this->getOrPaginate($this->getFriendsQueryBuilder($status, $groupSlug), $perPage, $fields, $cursor);
}


/**
* This method will not return Friendship models
* It will return the 'friends' models. ex: App\User
Expand Down Expand Up @@ -462,9 +464,9 @@ public function findFriendships($status = null, string $groupSlug = '', string $
$query->where(function ($q) {
$q->whereSender($this);
})
->orWhere(function ($q) {
$q->whereRecipient($this);
});
->orWhere(function ($q) {
$q->whereRecipient($this);
});
break;
case 'sender':
$query->where(function ($q) {
Expand All @@ -480,7 +482,7 @@ public function findFriendships($status = null, string $groupSlug = '', string $
})->whereGroup($this, $groupSlug);

//if $status is passed, add where clause
if ( ! is_null($status)) {
if (!is_null($status)) {
$query->where('status', $status);
}

Expand All @@ -490,18 +492,19 @@ public function findFriendships($status = null, string $groupSlug = '', string $
/**
* Get the query builder of the 'friend' model
*
* @param string $status
* @param string $groupSlug
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function getFriendsQueryBuilder($groupSlug = '')
public function getFriendsQueryBuilder($status = Status::ACCEPTED, $groupSlug = '')
{
$friendships = $this->findFriendships(Status::ACCEPTED, $groupSlug)->get(['sender_id', 'recipient_id']);
$friendships = $this->findFriendships($status, $groupSlug)->get(['sender_id', 'recipient_id']);
$recipients = $friendships->pluck('recipient_id')->all();
$senders = $friendships->pluck('sender_id')->all();

return $this->where('id', '!=', $this->getKey())
->whereIn('id', array_merge($recipients, $senders));
->whereIn('id', array_merge($recipients, $senders));
}

/**
Expand All @@ -527,7 +530,7 @@ public function getMutualFriendsQueryBuilder(Model $other)
);

return $this->whereNotIn('id', [$this->getKey(), $other->getKey()])
->whereIn('id', $mutualFriendships);
->whereIn('id', $mutualFriendships);
}

/**
Expand All @@ -547,15 +550,15 @@ public function getFriendsOfFriendsQueryBuilder($groupSlug = '')

$friendshipModelName = Interaction::getFriendshipModelName();
$fofs = $friendshipModelName::where('status', Status::ACCEPTED)
->where(function ($query) use ($friendIds) {
$query->where(function ($q) use ($friendIds) {
$q->whereIn('sender_id', $friendIds);
})->orWhere(function ($q) use ($friendIds) {
$q->whereIn('recipient_id', $friendIds);
});
})
->whereGroup($this, $groupSlug)
->get(['sender_id', 'recipient_id']);
->where(function ($query) use ($friendIds) {
$query->where(function ($q) use ($friendIds) {
$q->whereIn('sender_id', $friendIds);
})->orWhere(function ($q) use ($friendIds) {
$q->whereIn('recipient_id', $friendIds);
});
})
->whereGroup($this, $groupSlug)
->get(['sender_id', 'recipient_id']);

$fofIds = array_unique(
array_merge($fofs->pluck('sender_id')->all(), $fofs->pluck('recipient_id')->all())
Expand Down