Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/Contracts/IssueActorModelContract.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

use AuroraWebSoftware\Connective\Collections\ConnectiveCollection;
use AuroraWebSoftware\Connective\Contracts\ConnectiveContract;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;

/**
* issue actor can be one of the following:
Expand All @@ -26,4 +28,9 @@ public function getActingIssues(string $connectionType): ConnectiveCollection;
* ['channel' => 'email', 'email' => 'example@ex.com']
*/
public function getIssueReminderConfig(): array;

/**
* @return Collection<int, Model&IssueActorModelContract>
*/
public static function searchIssueActor(string $searchTerm): Collection;
}
22 changes: 15 additions & 7 deletions src/Models/AIssue.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use AuroraWebSoftware\Connective\Contracts\ConnectiveContract;
use AuroraWebSoftware\Connective\Exceptions\ConnectionTypeException;
use AuroraWebSoftware\Connective\Exceptions\ConnectionTypeNotSupportedException;
use AuroraWebSoftware\Connective\Models\Connection;
use AuroraWebSoftware\Connective\Traits\Connective;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Carbon;
Expand Down Expand Up @@ -167,18 +168,25 @@ public function addObserver(IssueActorModelContract&Model $issueActorModel): voi

public function removeObserver(IssueActorModelContract $issueActorModel): void
{
foreach ($this->getObservers() ?? [] as $observer) {
if ($observer->getId() === $issueActorModel->getId()) {
$observer->delete();
break;
}
if ($this->connections('issue_observer')) {
$this->connections('issue_observer')
->each(function (Model $connection) use ($issueActorModel) {

/**
* @var Connection $connection
*/
if ($connection->connectedTo()->getId() === $issueActorModel->getId()) {
$connection->delete();
}
});
}
}

public function removeAllObservers(): void
{
foreach ($this->getObservers() ?? [] as $observer) {
$observer->delete();
if ($this->connections('issue_observer')) {
$this->connections('issue_observer')
->each(fn (Model $connection) => $connection->delete());
}
}

Expand Down
11 changes: 11 additions & 0 deletions tests/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use AuroraWebSoftware\AIssue\Traits\AIssueActor;
use AuroraWebSoftware\Connective\Contracts\ConnectiveContract;
use AuroraWebSoftware\Connective\Traits\Connective;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;

/**
Expand All @@ -32,4 +33,14 @@ public function getIssueReminderConfig(): array
{
return ['channel' => 'email', 'email' => 'example@ex.com'];
}

/**
* @return Collection<IssueActorModelContract>
*
* @phpstan-ignore-next-line
*/
public static function searchIssueActor(string $searchTerm): Collection
{
return User::query()->where('name', 'like', '%'.$searchTerm.'%')->get();
}
}
14 changes: 14 additions & 0 deletions tests/Unit/AIssueTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,20 @@
$exampleIssueOwner1->ownIssue($issue);
expect($exampleIssueOwner1->getOwningIssues())->toHaveCount(1);

// dd(User::searchIssueActor('user'));

// search actor
expect(User::searchIssueActor('user'))
->toHaveCount(4)
->and(User::searchIssueActor('user 1'))
->toHaveCount(1)
->and(User::searchIssueActor('user 2'))
->toHaveCount(1)
->and(User::searchIssueActor('user 3'))
->toHaveCount(1)
->and(User::searchIssueActor('user 4'))
->toHaveCount(1);

// todo delete kısmı yazılmadı henüz

});