Feature contract watchlist

src/Models/Assets/Asset.php

@@ -33,10 +33,12 @@
 use Seatplus\Eveapi\Events\AssetUpdating;
 use Seatplus\Eveapi\Models\Universe\Location;
 use Seatplus\Eveapi\Models\Universe\Type;
+use Seatplus\Eveapi\Traits\HasWatchlist;
 
 class Asset extends Model
 {
     use HasFactory;
+    use HasWatchlist;
 
     const ASSET_SAFETY = 2004;
 
@@ -186,9 +188,9 @@ public function scopeOfGroups(Builder $query, int | array $groups) : Builder
     {
         $group_ids = is_array($groups) ? $groups : [$groups];
 
-        return $query->whereHas('type.group', fn (Builder $query) => $query->whereIn('group_id', $group_ids))
-            ->orWhereHas('content.type.group', fn (Builder $query) => $query->whereIn('group_id', $group_ids))
-            ->orWhereHas('content.content.type.group', fn (Builder $query) => $query->whereIn('group_id', $group_ids));
+        return $query->whereHas('type', fn (Builder $query) => $query->whereIn('group_id', $group_ids))
+            ->orWhereHas('content.type', fn (Builder $query) => $query->whereIn('group_id', $group_ids))
+            ->orWhereHas('content.content.type', fn (Builder $query) => $query->whereIn('group_id', $group_ids));
     }
 
     public function scopeOfCategories(Builder $query, int | array $categories) : Builder

src/Models/Contracts/Contract.php

@@ -26,16 +26,19 @@
 
 namespace Seatplus\Eveapi\Models\Contracts;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Seatplus\Eveapi\database\factories\ContractFactory;
 use Seatplus\Eveapi\Models\Character\CharacterInfo;
 use Seatplus\Eveapi\Models\Corporation\CorporationInfo;
 use Seatplus\Eveapi\Models\Universe\Location;
+use Seatplus\Eveapi\Traits\HasWatchlist;
 
 class Contract extends Model
 {
     use HasFactory;
+    use HasWatchlist;
 
     protected static function newFactory()
     {
@@ -111,4 +114,43 @@ public function characters()
     {
         return $this->morphedByMany(CharacterInfo::class, 'contractable', null, 'contract_id');
     }
+
+    public function scopeInRegion(Builder $query, int | array $regions): Builder
+    {
+        $region_ids = is_array($regions) ? $regions : [$regions];
+
+        return $query
+            ->whereHas('start_location.locatable', fn (Builder $query) => $query->whereHas('system.region', fn ($query) => $query->whereIn('universe_regions.region_id', $region_ids)))
+            ->orWhereHas('end_location.locatable', fn (Builder $query) => $query->whereHas('system.region', fn ($query) => $query->whereIn('universe_regions.region_id', $region_ids)));
+    }
+
+    public function scopeInSystems(Builder $query, int | array $systems): Builder
+    {
+        $system_ids = is_array($systems) ? $systems : [$systems];
+
+        return $query
+            ->whereHas('start_location.locatable', fn (Builder $query) => $query->whereHas('system', fn ($query) => $query->whereIn('system_id', $system_ids)))
+            ->orWhereHas('end_location.locatable', fn (Builder $query) => $query->whereHas('system', fn ($query) => $query->whereIn('system_id', $system_ids)));
+    }
+
+    public function scopeOfTypes(Builder $query, int | array $types) : Builder
+    {
+        $type_ids = is_array($types) ? $types : [$types];
+
+        return $query->whereHas('items.type', fn (Builder $query) => $query->whereIn('type_id', $type_ids));
+    }
+
+    public function scopeOfGroups(Builder $query, int | array $groups) : Builder
+    {
+        $group_ids = is_array($groups) ? $groups : [$groups];
+
+        return $query->whereHas('items.type', fn (Builder $query) => $query->whereIn('group_id', $group_ids));
+    }
+
+    public function scopeOfCategories(Builder $query, int | array $categories) : Builder
+    {
+        $category_ids = is_array($categories) ? $categories : [$categories];
+
+        return $query->whereHas('items.type.group', fn (Builder $query) => $query->whereIn('category_id', $category_ids));
+    }
 }

src/Traits/HasWatchlist.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Seatplus\Eveapi\Traits;
+
+use Illuminate\Database\Eloquent\Builder;
+
+trait HasWatchlist
+{
+    abstract public function scopeInRegion(Builder $query, int | array $regions): Builder;
+
+    abstract public function scopeInSystems(Builder $query, int | array $systems): Builder;
+
+    abstract public function scopeOfTypes(Builder $query, int | array $types) : Builder;
+
+    abstract public function scopeOfGroups(Builder $query, int | array $groups) : Builder;
+
+    abstract public function scopeOfCategories(Builder $query, int | array $categories) : Builder;
+}

tests/Unit/Models/ContractModelTest.php

@@ -0,0 +1,115 @@
+<?php
+
+use Seatplus\Eveapi\Models\Contracts\Contract;
+use Seatplus\Eveapi\Models\Contracts\ContractItem;
+use Seatplus\Eveapi\Models\Universe\Category;
+use Seatplus\Eveapi\Models\Universe\Constellation;
+use Seatplus\Eveapi\Models\Universe\Group;
+use Seatplus\Eveapi\Models\Universe\Location;
+use Seatplus\Eveapi\Models\Universe\Region;
+use Seatplus\Eveapi\Models\Universe\Station;
+use Seatplus\Eveapi\Models\Universe\System;
+use Seatplus\Eveapi\Models\Universe\Type;
+
+it('has inRegionScope', function (string $location_id) {
+    expect(Contract::all())->toHaveCount(0);
+
+    $test_contract = Contract::factory()->create([
+        $location_id => Location::factory()->create([
+            'locatable_type' => Station::class,
+            'locatable_id' => Station::factory()->create([
+                'system_id' => System::factory()->create([
+                    'constellation_id' => Constellation::factory()->create([
+                        'region_id' => Region::factory(),
+                    ]),
+                ]),
+            ]),
+        ]),
+    ]);
+
+    $region_id = match ($location_id) {
+        'start_location_id' => $test_contract->start_location->locatable->system->region->region_id,
+        'end_location_id' => $test_contract->end_location->locatable->system->region->region_id
+    };
+
+    expect(Contract::inRegion($region_id)->get())->toHaveCount(1);
+    expect(Contract::inRegion($region_id + 1)->get())->toHaveCount(0);
+})->with([
+    'start_location_id',
+    'end_location_id',
+]);
+
+it('has inSystemScope', function (string $location_id) {
+    expect(Contract::all())->toHaveCount(0);
+
+    $test_contract = Contract::factory()->create([
+        $location_id => Location::factory()->create([
+            'locatable_type' => Station::class,
+            'locatable_id' => Station::factory()->create([
+                'system_id' => System::factory(),
+            ]),
+        ]),
+    ]);
+
+    $system_id = match ($location_id) {
+        'start_location_id' => $test_contract->start_location->locatable->system->system_id,
+        'end_location_id' => $test_contract->end_location->locatable->system->system_id
+    };
+
+    expect(Contract::inSystems($system_id)->get())->toHaveCount(1);
+    expect(Contract::inSystems($system_id + 1)->get())->toHaveCount(0);
+})->with([
+    'start_location_id',
+    'end_location_id',
+]);
+
+it('has ofTypes scope', function () {
+    $contract = Contract::factory()->create();
+
+    $item = ContractItem::factory()->create([
+        'contract_id' => $contract->contract_id,
+    ]);
+
+    expect($item)
+        ->type
+        ->toBeInstanceOf(Type::class);
+
+    expect(Contract::ofTypes($item->type->type_id)->get())->toHaveCount(1);
+    expect(Contract::ofTypes($item->type->type_id + 1)->get())->toHaveCount(0);
+});
+
+it('has ofGroups scope', function () {
+    $contract = Contract::factory()->create();
+
+    $item = ContractItem::factory()->create([
+        'contract_id' => $contract->contract_id,
+    ]);
+
+    expect($item)
+        ->type->toBeInstanceOf(Type::class)
+        ->type->group_id->toBeInt();
+
+
+    expect(Contract::ofGroups($item->type->group_id)->get())->toHaveCount(1);
+    expect(Contract::ofGroups($item->type->group_id + 1)->get())->toHaveCount(0);
+});
+
+it('has ofCategories scope', function () {
+    $contract = Contract::factory()->create();
+
+    $item = ContractItem::factory()->create([
+        'contract_id' => $contract->contract_id,
+        'type_id' => Type::factory()->create([
+            'group_id' => Group::factory()->create(['category_id' => Category::factory()]),
+        ]),
+    ]);
+
+    expect($item)
+        ->type->toBeInstanceOf(Type::class)
+        ->type->group->toBeInstanceOf(Group::class)
+        ->type->group->category->toBeInstanceOf(Category::class);
+
+
+    expect(Contract::ofCategories($item->type->group->category->category_id)->get())->toHaveCount(1);
+    expect(Contract::ofCategories($item->type->group->category->category_id + 1)->get())->toHaveCount(0);
+});