pcm-libraries/pcm-geocode-bundle
2
0
Fork 0
Code Issues 2 Releases Activity

Tweak how errors are thrown

Browse Source
This commit is contained in:
Bradley Goode
2024-09-26 10:35:22 +01:00
parent 9588938356
commit 412c4eb579
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Service/Geocoder.php
View File

@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace Pcm\GeocodeBundle\Service; namespace Pcm\GeocodeBundle\Service;
use Pcm\GeocodeBundle\Exception\ApiErrorException; use Pcm\GeocodeBundle\Exception\ApiErrorException;
use Pcm\GeocodeBundle\Exception\MissingGeocodeDataException;
use Pcm\GeocodeBundle\Exception\NoResultsFoundException; use Pcm\GeocodeBundle\Exception\NoResultsFoundException;
use Pcm\GeocodeBundle\Interface\Entity\GeocodeInterface; use Pcm\GeocodeBundle\Interface\Entity\GeocodeInterface;
use Pcm\GeocodeBundle\Model\GeoCoordinates; use Pcm\GeocodeBundle\Model\GeoCoordinates;
@@ -32,17 +33,23 @@ final class Geocoder
*/ */
public function geocode(GeocodeInterface $entity): GeoCoordinates public function geocode(GeocodeInterface $entity): GeoCoordinates
{ {
$geocodeData = $entity->getGeocodeData(); $geocodeData = trim($entity->getGeocodeData());
$client = $this->createClient(); $client = $this->createClient();
if ('' === $geocodeData) {
throw new MissingGeocodeDataException('No geocode data present.');
}
$response = $this->makeApiRequest($client, $geocodeData); $response = $this->makeApiRequest($client, $geocodeData);
$data = $this->getDataFromResponse($response); $data = $this->getDataFromResponse($response);
if (array_key_exists('error', $data)) { if (array_key_exists('error', $data)) {
throw new ApiErrorException($geocodeData, $data['error']['message']); throw new ApiErrorException($data['error']['message']);
} }
if (empty($data)) { if (empty($data)) {
throw new NoResultsFoundException($geocodeData, "No results found."); $message = sprintf('No results found with geocode data "%s".', $geocodeData);
throw new NoResultsFoundException($message);
} }
return $this->createGeoCoordinates($data); return $this->createGeoCoordinates($data);

8
tests/Service/GeocoderTest.php
View File

@@ -4,9 +4,9 @@ declare(strict_types=1);
namespace Pcm\GeocodeBundle\Tests; namespace Pcm\GeocodeBundle\Tests;
use Pcm\GeocodeBundle\Exception\MissingGeocodeDataException;
use Pcm\GeocodeBundle\Interface\Entity\GeocodeInterface; use Pcm\GeocodeBundle\Interface\Entity\GeocodeInterface;
use Pcm\GeocodeBundle\Trait\Entity\GeocodeTrait; use Pcm\GeocodeBundle\Trait\Entity\GeocodeTrait;
use Pcm\GeocodeBundle\Exception\ApiErrorException;
use Pcm\GeocodeBundle\Exception\NoResultsFoundException; use Pcm\GeocodeBundle\Exception\NoResultsFoundException;
use Pcm\GeocodeBundle\Model\GeoCoordinates; use Pcm\GeocodeBundle\Model\GeoCoordinates;
use Pcm\GeocodeBundle\Service\Geocoder; use Pcm\GeocodeBundle\Service\Geocoder;
@@ -33,9 +33,9 @@ final class GeocoderTest extends KernelTestCase
public function testGeocodeThrowsOnEmptyInput(): void public function testGeocodeThrowsOnEmptyInput(): void
{ {
sleep(1); sleep(1);
$this->expectException(ApiErrorException::class); $this->expectException(MissingGeocodeDataException::class);
$entity = $this->createEntity(''); $entity = $this->createEntity('');
$this->expectExceptionMessageMatches("/Nothing to search for.$/"); $this->expectExceptionMessageMatches("/No geocode data present./");
$this->geocoder->geocode($entity); $this->geocoder->geocode($entity);
} }
@@ -43,7 +43,7 @@ final class GeocoderTest extends KernelTestCase
{ {
sleep(1); sleep(1);
$this->expectException(NoResultsFoundException::class); $this->expectException(NoResultsFoundException::class);
$this->expectExceptionMessageMatches("/No results found.$/"); $this->expectExceptionMessageMatches("/No results found with geocode data \"Invalid Postcode\"./");
$entity = $this->createEntity('Invalid Postcode'); $entity = $this->createEntity('Invalid Postcode');
$this->geocoder->geocode($entity); $this->geocoder->geocode($entity);
} }