skobkin/point-tools
1
1
Fork 0
Code Issues 4 Pull requests 1 Releases Activity

UserApi slightly refactored.

Browse source
This commit is contained in:
Alexey Skobkin 2017-01-11 21:30:16 +03:00
parent 3df7fa585e
commit 4c02e17595
3 changed files with 9 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Skobkin/Bundle/PointToolsBundle/Resources/config/services.yml
View file

@ -26,7 +26,7 @@ services:
class: Skobkin\Bundle\PointToolsBundle\Service\UserApi
parent: app.point.abstract_api
arguments:
- '@doctrine.orm.entity_manager'
- '@app.point.user_factory'
- '@jms_serializer'
app.point.api_post:

4
src/Skobkin/Bundle/PointToolsBundle/Service/Factory/UserFactory.php
View file

@ -10,7 +10,6 @@ use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\ApiException;
use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\Factory\InvalidUserDataException;
use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\InvalidResponseException;
class UserFactory
{
/**
@ -31,7 +30,6 @@ class UserFactory
*
* @return User
*
* @throws ApiException
* @throws InvalidResponseException
*/
public function createFromArray(array $data): User
@ -89,7 +87,7 @@ class UserFactory
*/
private function validateArrayData(array $data)
{
if (!(array_key_exists('id', $data) || !!array_key_exists('login', $data) || !array_key_exists('name', $data))) {
if (!array_key_exists('id', $data) || !array_key_exists('login', $data) || !array_key_exists('name', $data) || !is_numeric($data['id'])) {
throw new InvalidResponseException('Invalid user data');
}
}

60
src/Skobkin/Bundle/PointToolsBundle/Service/UserApi.php
View file

@ -2,8 +2,6 @@
namespace Skobkin\Bundle\PointToolsBundle\Service;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityRepository;
use GuzzleHttp\ClientInterface;
use GuzzleHttp\Exception\RequestException;
use JMS\Serializer\Serializer;
@ -13,6 +11,7 @@ use Skobkin\Bundle\PointToolsBundle\Entity\User;
use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\ApiException;
use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\InvalidResponseException;
use Skobkin\Bundle\PointToolsBundle\Service\Exceptions\UserNotFoundException;
use Skobkin\Bundle\PointToolsBundle\Service\Factory\UserFactory;
use Symfony\Component\HttpFoundation\Response;
/**
@ -21,28 +20,20 @@ use Symfony\Component\HttpFoundation\Response;
class UserApi extends AbstractApi
{
/**
* @var EntityManager
* @var UserFactory
*/
protected $em;
/**
* @var EntityRepository
*/
protected $userRepository;
private $userFactory;
/**
* @var Serializer
*/
private $serializer;
public function __construct(ClientInterface $httpClient, LoggerInterface $logger, EntityManager $entityManager, Serializer $serializer)
public function __construct(ClientInterface $httpClient, LoggerInterface $logger, UserFactory $userFactory, Serializer $serializer)
{
parent::__construct($httpClient, $logger);
$this->em = $entityManager;
$this->serializer = $serializer;
// @todo refactor
$this->userRepository = $this->em->getRepository('SkobkinPointToolsBundle:User');
}
public function isAuthDataValid(string $login, string $password): bool
@ -280,36 +271,16 @@ class UserApi extends AbstractApi
* @throws ApiException
* @throws InvalidResponseException
*/
public function getUserFromUserInfo(array $userInfo): User
private function getUserFromUserInfo(array $userInfo): User
{
$this->logger->debug('Trying to create user from array', ['array' => $userInfo]);
// @todo Refactor to UserFactory->createFromArray()
if (array_key_exists('id', $userInfo) && array_key_exists('login', $userInfo) && array_key_exists('name', $userInfo) && is_numeric($userInfo['id'])) {
/** @var User $user */
if (null === ($user = $this->userRepository->find($userInfo['id']))) {
// Creating new user
$user = new User($userInfo['id']);
$this->em->persist($user);
}
// Updating data
$user
->setLogin($userInfo['login'])
->setName($userInfo['name'])
;
return $user;
}
throw new InvalidResponseException('Invalid API response. Mandatory fields do not exist.');
return $this->userFactory->createFromArray($userInfo);
}
/**
* Get array of User objects from API response containing user list
*
* @todo refactor
*
* @param array $users
*
* @return User[]
@ -325,24 +296,7 @@ class UserApi extends AbstractApi
$resultUsers = [];
foreach ($users as $userInfo) {
if (array_key_exists('id', $userInfo) && array_key_exists('login', $userInfo) && array_key_exists('name', $userInfo) && is_numeric($userInfo['id'])) {
// @todo Optimize with prehashed id's list
if (null === ($user = $this->userRepository->find($userInfo['id']))) {
$user = new User((int) $userInfo['id']);
$this->em->persist($user);
}
// Updating data
$user
->setLogin($userInfo['login'])
->setName($userInfo['name'])
;
$resultUsers[] = $user;
} else {
throw new InvalidResponseException('Invalid API response. Mandatory fields do not exist.');
}
$resultUsers[] = $this->getUserFromUserInfo($userInfo);
}
return $resultUsers;