diff --git a/app/Libraries/Api/Models/BaseApiModel.php b/app/Libraries/Api/Models/BaseApiModel.php index a1e7fb86b..1e8c2d746 100644 --- a/app/Libraries/Api/Models/BaseApiModel.php +++ b/app/Libraries/Api/Models/BaseApiModel.php @@ -9,6 +9,7 @@ namespace App\Libraries\Api\Models; use A17\Twill\Models\Behaviors\HasPresenter; +use A17\Twill\Models\Contracts\TwillModelContract; use App\Libraries\Api\Models\ApiCollection as BaseCollection; use App\Libraries\Api\Models\Behaviors\HasApiCalls; use App\Libraries\Api\Models\Behaviors\HasAugmentedModel; @@ -18,12 +19,13 @@ use Illuminate\Contracts\Routing\UrlRoutable; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Contracts\Support\Jsonable; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Arr; use Illuminate\Support\Carbon; use Illuminate\Support\Str; use JsonSerializable; -abstract class BaseApiModel implements ArrayAccess, Arrayable, Jsonable, JsonSerializable, UrlRoutable +abstract class BaseApiModel implements ArrayAccess, Arrayable, Jsonable, JsonSerializable, TwillModelContract, UrlRoutable { use HasApiCalls; use HasAugmentedModel; @@ -1089,6 +1091,34 @@ public function getKeyName() return $this->primaryKey; } + /** + * TODO: Implement TwillModelContract + */ + public function scopePublished(Builder $query): Builder + { + return $query; + } + + public function scopeAccessible(Builder $query): Builder + { + return $query; + } + + public function scopeOnlyTrashed(Builder $query): Builder + { + return $query; + } + + public function scopeDraft(Builder $query): Builder + { + return $query; + } + + public function getTranslatedAttributes(): array + { + return array(); + } + /** * Determine if an attribute exists on the model. * diff --git a/app/Models/Api/Search.php b/app/Models/Api/Search.php index 4b9563efd..03a89aafc 100644 --- a/app/Models/Api/Search.php +++ b/app/Models/Api/Search.php @@ -5,6 +5,7 @@ use App\Libraries\Api\Models\BaseApiModel; use App\Libraries\Api\Builders\ApiModelBuilderSearch; use App\Libraries\Search\Filters\Departments as DepartmentFilter; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Carbon; use Illuminate\Support\Str; use App\Helpers\DateHelpers; @@ -864,7 +865,7 @@ public function scopePublic($query) return $query->rawSearch($params); } - public function scopePublished($query) + public function scopePublished(Builder $query): Builder { $params = [ 'bool' => [