Separate getCoordinates and geocode methods

app/CallingAllPapers/ConferenceImporter.php

@@ -115,7 +115,8 @@ private function nullifyInvalidLatLong($primary, $secondary)
     private function geocodeLatLongFromLocation(Conference $conference): Conference
     {
         try {
-            $conference->coordinates = $this->geocoder->geocode($conference->location);
+            $result = $this->geocoder->geocode($conference->location);
+            $conference->coordinates = $result->getCoordinates();
         } catch (InvalidAddressGeocodingException $e) {
         }
 

app/Services/Geocoder.php

@@ -8,25 +8,33 @@
 
 class Geocoder
 {
-    public function geocode(string $address): Coordinates
+    private $response;
+
+    public function geocode(string $address): self
     {
         if ($this->isInvalidAddress($address)) {
             throw new InvalidAddressGeocodingException;
         }
 
-        $response = $this->requestGeocoding($address);
+        $this->response = $this->requestGeocoding($address);
 
-        if (! count($response['results'])) {
+        if (! count($this->response['results'])) {
             cache()->set('invalid-address::' . md5($address), true);
             throw new InvalidAddressGeocodingException;
         }
 
+        return $this;
+    }
+
+    public function getCoordinates(): Coordinates
+    {
         return new Coordinates(
-            $this->getCoordinate('lat', $response),
-            $this->getCoordinate('lng', $response),
+            $this->getCoordinate('lat', $this->response),
+            $this->getCoordinate('lng', $this->response),
         );
     }
 
+
     private function requestGeocoding($address)
     {
         return Http::acceptJson()

tests/Feature/CallingAllPapersConferenceImporterTest.php

@@ -236,6 +236,8 @@ public function it_fills_latitude_and_longitude_from_location_if_lat_long_are_nu
         $this->mockClient($event);
         $this->mock(Geocoder::class, function ($mock) {
             $mock->shouldReceive('geocode')
+                ->andReturn($mock)
+                ->shouldReceive('getCoordinates')
                 ->andReturn(new Coordinates('38.8921062', '-77.0259036'));
         });
 

tests/Integration/GeocoderTest.php

@@ -17,7 +17,8 @@ public function geocoding_an_address(): void
 
         $geocoder = app(Geocoder::class);
 
-        $coordinates = $geocoder->geocode('1600 Pennsylvania Ave Washington, DC');
+        $result = $geocoder->geocode('1600 Pennsylvania Ave Washington, DC');
+        $coordinates = $result->getCoordinates();
 
         $this->assertEquals('38.8976801', $coordinates->getLatitude());
         $this->assertEquals('-77.0363304', $coordinates->getLongitude());