fixed test issues

This commit is contained in:
pushrbx 2024-10-15 18:58:19 +01:00
parent 6f1e3715b0
commit 8bdcf97d4e
No known key found for this signature in database
GPG Key ID: A16A474BBC2C91D9
4 changed files with 11 additions and 9 deletions

View File

@ -4,7 +4,6 @@ namespace App\Dto;
use App\Concerns\HasRequestFingerprint; use App\Concerns\HasRequestFingerprint;
use App\Contracts\DataRequest; use App\Contracts\DataRequest;
use App\DataPipes\MapRouteParametersDataPipe;
use App\Dto\Concerns\MapsRouteParameters; use App\Dto\Concerns\MapsRouteParameters;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Http\Resources\Json\ResourceCollection; use Illuminate\Http\Resources\Json\ResourceCollection;
@ -13,12 +12,6 @@ use Spatie\LaravelData\Attributes\Validation\Min;
use Spatie\LaravelData\Attributes\Validation\Numeric; use Spatie\LaravelData\Attributes\Validation\Numeric;
use Spatie\LaravelData\Attributes\Validation\Required; use Spatie\LaravelData\Attributes\Validation\Required;
use Spatie\LaravelData\Data; use Spatie\LaravelData\Data;
use Spatie\LaravelData\DataPipeline;
use Spatie\LaravelData\DataPipes\AuthorizedDataPipe;
use Spatie\LaravelData\DataPipes\CastPropertiesDataPipe;
use Spatie\LaravelData\DataPipes\DefaultValuesDataPipe;
use Spatie\LaravelData\DataPipes\MapPropertiesDataPipe;
use Spatie\LaravelData\DataPipes\ValidatePropertiesDataPipe;
/** /**
* Base class for all requests/commands which are for looking up things by id. * Base class for all requests/commands which are for looking up things by id.

View File

@ -7,7 +7,6 @@ use App\Enums\TopReviewsTypeEnum;
use App\Support\CachedData; use App\Support\CachedData;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Jikan\Helper\Constants;
use Jikan\MyAnimeList\MalClient; use Jikan\MyAnimeList\MalClient;
use Jikan\Request\Reviews\ReviewsRequest; use Jikan\Request\Reviews\ReviewsRequest;
@ -31,7 +30,7 @@ final class QueryTopReviewsHandler extends RequestHandlerWithScraperCache
$preliminary = $requestParams->get("preliminary", true); $preliminary = $requestParams->get("preliminary", true);
return $this->scraperService->findList( return $this->scraperService->findList(
$requestFingerPrint, $requestFingerPrint,
fn (MalClient $jikan, ?int $page = null) => $jikan->getReviews(new ReviewsRequest($type->value, $page, $spoilers, $preliminary)), fn (MalClient $jikan, ?int $page = null) => $jikan->getReviews(new ReviewsRequest(ensureEnumPrimitiveValue($type), $page, $spoilers, $preliminary)),
$requestParams->get("page")); $requestParams->get("page"));
} }
} }

View File

@ -3,6 +3,7 @@
namespace App\Http\Resources\V4; namespace App\Http\Resources\V4;
use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Http\Resources\Json\JsonResource;
use OpenApi\Annotations as OA;
class ReviewsResource extends JsonResource class ReviewsResource extends JsonResource
{ {

View File

@ -114,3 +114,12 @@ if (! function_exists('cache')) {
return app('cache')->put(key($arguments[0]), reset($arguments[0]), $arguments[1] ?? null); return app('cache')->put(key($arguments[0]), reset($arguments[0]), $arguments[1] ?? null);
} }
} }
if (!function_exists("ensureEnumPrimitiveValue")) {
function ensureEnumPrimitiveValue(int|string|bool|float|null|\Spatie\Enum\Laravel\Enum $value): mixed {
if ($value instanceof \Spatie\Enum\Laravel\Enum) {
return $value->value;
}
return $value;
}
}