diff --git a/config/packages/contributte.monolog.neon b/config/packages/contributte.monolog.neon index 0cff3310..09c4266b 100644 --- a/config/packages/contributte.monolog.neon +++ b/config/packages/contributte.monolog.neon @@ -7,6 +7,7 @@ services: type: Sentry\Client factory: Sentry\ClientBuilder::create([ dsn: ::env(SENTRY_DSN) + max_request_body_size: always ])::getClient() sentry_hub: diff --git a/src/Api/Crawler/ReceiveResultController.php b/src/Api/Crawler/ReceiveResultController.php index a40c522d..6b3a7400 100644 --- a/src/Api/Crawler/ReceiveResultController.php +++ b/src/Api/Crawler/ReceiveResultController.php @@ -77,13 +77,21 @@ public function receiveResult(ApiRequest $request, ApiResponse $response): ApiRe } } - $this->cookieSuggestionsStore->storeCrawledCookies( - $scenarioResponseBody->name, - $scenarioResponseBody->flags['projectId'], - $acceptedCategories, - $scenarioResponseBody->finishedAt ?? new DateTimeImmutable('now'), - $scenarioResponseBody->results->cookies, - ); + try { + $this->cookieSuggestionsStore->storeCrawledCookies( + $scenarioResponseBody->name, + $scenarioResponseBody->flags['projectId'], + $acceptedCategories, + $scenarioResponseBody->finishedAt ?? new DateTimeImmutable('now'), + $scenarioResponseBody->results->cookies, + ); + } catch (Throwable $e) { + $error = new ClientErrorException('Unable to process received crawler result: ' . $e->getMessage(), ApiResponse::S400_BAD_REQUEST, $e); + + $this->logger->error((string) $error); + + throw $error; + } return $response->withStatus(ApiResponse::S200_OK) ->writeJsonBody([ diff --git a/src/Application/CookieSuggestion/CookieSuggestionsStore.php b/src/Application/CookieSuggestion/CookieSuggestionsStore.php index a1a36dcd..92c2ee4e 100644 --- a/src/Application/CookieSuggestion/CookieSuggestionsStore.php +++ b/src/Application/CookieSuggestion/CookieSuggestionsStore.php @@ -35,11 +35,13 @@ use App\ReadModel\CookieSuggestion\CookieSuggestionForResolving; use App\ReadModel\CookieSuggestion\FindCookieSuggestionsForResolvingQuery; use App\ReadModel\CookieSuggestion\GetCookieSuggestionByProjectIdAndNameAndDomainQuery; +use App\ReadModel\Project\GetProjectByIdQuery; use Closure; use DateTimeImmutable; use DateTimeInterface; use DateTimeZone; use Exception; +use InvalidArgumentException; use Psr\Log\LoggerInterface; use SixtyEightPublishers\ArchitectureBundle\Bus\CommandBusInterface; use SixtyEightPublishers\ArchitectureBundle\Bus\QueryBusInterface; @@ -64,6 +66,15 @@ public function __construct( */ public function storeCrawledCookies(string $scenarioName, string $projectId, array $acceptedCategories, DateTimeImmutable $finishedAt, array $cookies): void { + $projectView = $this->queryBus->dispatch(GetProjectByIdQuery::create($projectId)); + + if (null === $projectView) { + throw new InvalidArgumentException(sprintf( + 'The project with ID %s not found.', + $projectId, + )); + } + $cookiesData = null; $getCookiesData = function () use (&$cookiesData, $projectId): array { if (null !== $cookiesData) { diff --git a/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookieDataForSuggestionQueryHandler.php b/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookieDataForSuggestionQueryHandler.php index 5dc761b8..37d94d6c 100644 --- a/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookieDataForSuggestionQueryHandler.php +++ b/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookieDataForSuggestionQueryHandler.php @@ -34,7 +34,7 @@ public function __invoke(FindCookieDataForSuggestionQuery $query): array ->from('cookie', 'c') ->join('c', 'category', 'cat', 'c.category_id = cat.id AND cat.deleted_at IS NULL') ->join('c', 'cookie_provider', 'cp', 'c.cookie_provider_id = cp.id AND cp.deleted_at IS NULL') - ->leftJoin('c', 'project', 'p', 'p.id = :projectId AND p.deleted_at IS NULL') + ->join('c', 'project', 'p', 'p.id = :projectId AND p.deleted_at IS NULL') ->leftJoin('cp', 'project_has_cookie_provider', 'p_has_cp', 'p_has_cp.cookie_provider_id = cp.id AND p_has_cp.project_id = p.id') ->where('c.deleted_at IS NULL') ->andWhere('cp.private = false OR cp.id = p.cookie_provider_id') diff --git a/src/Web/AdminModule/CookieModule/Presenter/templates/FoundCookies.default.latte b/src/Web/AdminModule/CookieModule/Presenter/templates/FoundCookies.default.latte index 66bd3db6..ae97d12f 100644 --- a/src/Web/AdminModule/CookieModule/Presenter/templates/FoundCookies.default.latte +++ b/src/Web/AdminModule/CookieModule/Presenter/templates/FoundCookies.default.latte @@ -4,7 +4,6 @@ {block #heading_actions}