-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1099 from cultuurnet/feature/III-4873-refactor-Jo…
…bsReadRestController III-4873 Refactor jobs read rest controller to use PSR-7
- Loading branch information
Showing
8 changed files
with
133 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace CultuurNet\UDB3\Http\Jobs; | ||
|
||
use CultuurNet\UDB3\Http\ApiProblem\ApiProblem; | ||
use CultuurNet\UDB3\Http\Request\RouteParameters; | ||
use CultuurNet\UDB3\Http\Response\JsonResponse; | ||
use Psr\Http\Message\ResponseInterface; | ||
use Psr\Http\Message\ServerRequestInterface; | ||
use Psr\Http\Server\RequestHandlerInterface; | ||
use Ramsey\Uuid\Uuid; | ||
|
||
final class GetJobStatusRequestHandler implements RequestHandlerInterface | ||
{ | ||
private JobsStatusFactory $jobStatusFactory; | ||
|
||
public function __construct(JobsStatusFactory $jobStatusFactory) | ||
{ | ||
$this->jobStatusFactory = $jobStatusFactory; | ||
} | ||
|
||
public function handle(ServerRequestInterface $request): ResponseInterface | ||
{ | ||
$jobId = (new RouteParameters($request))->get('jobId'); | ||
|
||
if ($jobId === Uuid::NIL) { | ||
$jobStatus = JobStatus::complete(); | ||
} else { | ||
$jobStatus = $this->jobStatusFactory->createFromJobId($jobId); | ||
} | ||
|
||
if (!$jobStatus) { | ||
throw ApiProblem::urlNotFound('No status for job with id: ' . $jobId); | ||
} | ||
|
||
return new JsonResponse($jobStatus->toString()); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace CultuurNet\UDB3\Http\Jobs; | ||
|
||
interface JobsStatusFactory | ||
{ | ||
public function createFromJobId(string $jobId): ?JobStatus; | ||
} |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
namespace CultuurNet\UDB3\Http\Jobs; | ||
|
||
use CultuurNet\UDB3\Http\ApiProblem\ApiProblem; | ||
use CultuurNet\UDB3\Http\ApiProblem\AssertApiProblemTrait; | ||
use CultuurNet\UDB3\Http\Request\Psr7RequestBuilder; | ||
use CultuurNet\UDB3\Http\Response\AssertJsonResponseTrait; | ||
use CultuurNet\UDB3\Http\Response\JsonResponse; | ||
use PHPUnit\Framework\MockObject\MockObject; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
final class GetJobStatusRequestHandlerTest extends TestCase | ||
{ | ||
use AssertJsonResponseTrait; | ||
use AssertApiProblemTrait; | ||
|
||
/** | ||
* @var JobsStatusFactory|MockObject | ||
*/ | ||
private $jobsStatusFactory; | ||
|
||
private GetJobStatusRequestHandler $getJobStatusRequestHandler; | ||
|
||
protected function setUp(): void | ||
{ | ||
$this->jobsStatusFactory = $this->createMock(JobsStatusFactory::class); | ||
|
||
$this->getJobStatusRequestHandler = new GetJobStatusRequestHandler($this->jobsStatusFactory); | ||
} | ||
|
||
/** | ||
* @test | ||
*/ | ||
public function it_returns_a_json_response_for_existing_job(): void | ||
{ | ||
$jobStatus = JobStatus::running(); | ||
$this->mockCreateFromJobId($jobStatus); | ||
|
||
$request = (new Psr7RequestBuilder()) | ||
->withRouteParameter('jobId', '123') | ||
->build('GET'); | ||
|
||
$response = $this->getJobStatusRequestHandler->handle($request); | ||
|
||
$expectedResponse = new JsonResponse($jobStatus->toString()); | ||
|
||
$this->assertJsonResponse($expectedResponse, $response); | ||
} | ||
|
||
/** | ||
* @test | ||
*/ | ||
public function it_throws_an_api_problem_exception_for_missing_job(): void | ||
{ | ||
$this->mockCreateFromJobId(); | ||
|
||
$request = (new Psr7RequestBuilder()) | ||
->withRouteParameter('jobId', '123') | ||
->build('GET'); | ||
|
||
$this->assertCallableThrowsApiProblem( | ||
ApiProblem::urlNotFound('No status for job with id: 123'), | ||
fn () => $this->getJobStatusRequestHandler->handle($request) | ||
); | ||
} | ||
|
||
private function mockCreateFromJobId(JobStatus $jobStatus = null): void | ||
{ | ||
$this->jobsStatusFactory->method('createFromJobId') | ||
->willReturn($jobStatus); | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.