Work-Related/PHPToolKit
1
0
mirror of https://github.com/SkillDisplay/PHPToolKit.git synced 2024-12-18 01:26:09 +01:00
Code Releases Activity

Handle 404 and "Oops" API responses

Browse source 
The API is created by a TYPO3.
It provides proper 404 for unavailable Skill IDs.
An "Oops" is returned for unavailable SkillSet IDs.
This commit is contained in:
Daniel Siepmann 2020-10-05 09:23:51 +02:00
parent 8179104233
commit 94c2038658
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
3 changed files with 42 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Api/Skill.php
View file

@ -24,6 +24,7 @@ namespace SkillDisplay\PHPToolKit\Api;
*/ */
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Request;
use SkillDisplay\PHPToolKit\Configuration\Settings; use SkillDisplay\PHPToolKit\Configuration\Settings;
use SkillDisplay\PHPToolKit\Entity\Skill as Entity; use SkillDisplay\PHPToolKit\Entity\Skill as Entity;
@ -55,14 +56,21 @@ class Skill
} }
$url = $this->settings->getAPIUrl() . '/api/v1/skill/' . $id; $url = $this->settings->getAPIUrl() . '/api/v1/skill/' . $id;
$result = $this->client->send(new Request( try {
'GET', $result = $this->client->send(new Request(
$url, 'GET',
[ $url,
'Content-Type' => 'application/json', [
'x-api-key' => $this->settings->getApiKey() 'Content-Type' => 'application/json',
] 'x-api-key' => $this->settings->getApiKey()
)); ]
));
} catch (ClientException $e) {
if ($e->getCode() === 404) {
throw new \InvalidArgumentException('Given Skill with id "' . $id . '" not available.', 1601881616);
}
throw $e;
}
if ($result->getStatusCode() !== 200) { if ($result->getStatusCode() !== 200) {
throw new \Exception('Did not get proper response for skill.', 1600694312); throw new \Exception('Did not get proper response for skill.', 1600694312);

37
src/Api/SkillSet.php
View file

@ -55,19 +55,32 @@ class SkillSet
} }
$url = $this->settings->getAPIUrl() . '/api/v1/skillset/' . $id; $url = $this->settings->getAPIUrl() . '/api/v1/skillset/' . $id;
$result = $this->client->send(new Request( try {
'GET', $result = $this->client->send(new Request(
$url, 'GET',
[ $url,
'Content-Type' => 'application/json', [
'x-api-key' => $this->settings->getApiKey() 'Content-Type' => 'application/json',
] 'x-api-key' => $this->settings->getApiKey()
)); ]
));
if ($result->getStatusCode() !== 200) { } catch (ClientException $e) {
throw new \Exception('Did not get proper response for skill.', 1600694312); if ($e->getCode() === 404) {
throw new \InvalidArgumentException('Given SkillSet with id "' . $id . '" not available.', 1601881616);
}
throw $e;
} }
return Entity::createFromJson((string) $result->getBody()); if ($result->getStatusCode() !== 200) {
throw new \Exception('Did not get proper response for SkillSet.', 1600694312);
}
$body = (string) $result->getBody();
if (strpos($body, 'Oops, an error occurred') !== false) {
throw new \Exception('Did not get proper response for SkillSet. SkillSet with id "' . $id . '" does probably not exist.', 1600694312);
}
return Entity::createFromJson($body);
} }
} }

2
tests/Unit/Api/SkillSetTest.php
View file

@ -108,7 +108,7 @@ class SkillSetTest extends TestCase
$client->reveal() $client->reveal()
); );
$this->expectExceptionMessage('Did not get proper response for skill.'); $this->expectExceptionMessage('Did not get proper response for SkillSet.');
$this->expectExceptionCode(1600694312); $this->expectExceptionCode(1600694312);
$result = $subject->getById(10); $result = $subject->getById(10);