Make sure location data in request is processed in a unified way.

This commit is contained in:
James Cole
2020-01-01 14:27:43 +01:00
parent 414e8d7153
commit ca260387a2
4 changed files with 101 additions and 20 deletions

View File

@@ -30,6 +30,7 @@ use FireflyIII\Models\AccountType;
use FireflyIII\Models\Location;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Services\Internal\Support\AccountServiceTrait;
use FireflyIII\Services\Internal\Support\LocationServiceTrait;
use FireflyIII\User;
use Log;
@@ -40,7 +41,7 @@ use Log;
*/
class AccountFactory
{
use AccountServiceTrait;
use AccountServiceTrait, LocationServiceTrait;
/** @var AccountRepositoryInterface */
protected $accountRepository;
@@ -134,15 +135,7 @@ class AccountFactory
$this->updateNote($return, $data['notes'] ?? '');
// store location
if (true === ($data['has_location'] ?? false) && null !== $return) {
$location = new Location;
$location->latitude = $data['latitude'] ?? 52.3167;
$location->longitude = $data['longitude'] ?? 5.55;
$location->zoom_level = $data['zoom_level'] ?? 6;
$location->locatable()->associate($return);
$location->save();
}
$this->storeNewLocation($return, $data);
}
return $return;