add endoint /api/1.0/search.json?q=xxx with fake data

See https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/136
This commit is contained in:
Julien Fastré 2021-05-07 19:11:10 +02:00
parent 038d7ad2e1
commit 7a1ad24f0e
16 changed files with 261 additions and 25 deletions

View File

@ -82,7 +82,7 @@ Chill will be available at ``http://localhost:8001.`` Currently, there isn't any
.. code-block:: bash .. code-block:: bash
docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load docker-compose exec --user $(id -u) php bin/console doctrine:fixtures:load --purge-with-truncate
There are several users available: There are several users available:

View File

@ -22,6 +22,7 @@
namespace Chill\MainBundle\Controller; namespace Chill\MainBundle\Controller;
use Chill\MainBundle\Serializer\Model\Collection;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Chill\MainBundle\Search\UnknowSearchDomainException; use Chill\MainBundle\Search\UnknowSearchDomainException;
@ -34,6 +35,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
use Chill\MainBundle\Search\SearchProvider; use Chill\MainBundle\Search\SearchProvider;
use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorInterface;
use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\MainBundle\Pagination\PaginatorFactory;
use Chill\MainBundle\Search\SearchApi;
/** /**
* Class SearchController * Class SearchController
@ -42,32 +44,24 @@ use Chill\MainBundle\Pagination\PaginatorFactory;
*/ */
class SearchController extends AbstractController class SearchController extends AbstractController
{ {
/** protected SearchProvider $searchProvider;
*
* @var SearchProvider
*/
protected $searchProvider;
/** protected TranslatorInterface $translator;
*
* @var TranslatorInterface
*/
protected $translator;
/** protected PaginatorFactory $paginatorFactory;
*
* @var PaginatorFactory protected SearchApi $searchApi;
*/
protected $paginatorFactory;
function __construct( function __construct(
SearchProvider $searchProvider, SearchProvider $searchProvider,
TranslatorInterface $translator, TranslatorInterface $translator,
PaginatorFactory $paginatorFactory PaginatorFactory $paginatorFactory,
SearchApi $searchApi
) { ) {
$this->searchProvider = $searchProvider; $this->searchProvider = $searchProvider;
$this->translator = $translator; $this->translator = $translator;
$this->paginatorFactory = $paginatorFactory; $this->paginatorFactory = $paginatorFactory;
$this->searchApi = $searchApi;
} }
@ -153,6 +147,19 @@ class SearchController extends AbstractController
); );
} }
public function searchApi(Request $request, $_format): JsonResponse
{
//TODO this is an incomplete implementation
$query = $request->query->get('q', '');
$results = $this->searchApi->getResults($query, 0, 150);
$paginator = $this->paginatorFactory->create(count($results));
$collection = new Collection($results, $paginator);
return $this->json($collection);
}
public function advancedSearchListAction(Request $request) public function advancedSearchListAction(Request $request)
{ {
/* @var $variable Chill\MainBundle\Search\SearchProvider */ /* @var $variable Chill\MainBundle\Search\SearchProvider */

View File

@ -0,0 +1,36 @@
<?php
namespace Chill\MainBundle\Search\Model;
class Result
{
private float $relevance;
/**
* mixed an arbitrary result
*/
private $result;
/**
* @param float $relevance
* @param $result
*/
public function __construct(float $relevance, $result)
{
$this->relevance = $relevance;
$this->result = $result;
}
public function getRelevance(): float
{
return $this->relevance;
}
public function getResult()
{
return $this->result;
}
}

View File

@ -0,0 +1,85 @@
<?php
namespace Chill\MainBundle\Search;
use Chill\PersonBundle\Entity\Person;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Doctrine\ORM\EntityManagerInterface;
use Chill\MainBundle\Search\SearchProvider;
use Symfony\Component\VarDumper\Resources\functions\dump;
/**
* ***Warning*** This is an incomplete implementation ***Warning***
*/
class SearchApi
{
private EntityManagerInterface $em;
private SearchProvider $search;
public function __construct(EntityManagerInterface $em, SearchProvider $search)
{
$this->em = $em;
$this->search = $search;
}
/**
* @return Model/Result[]
*/
public function getResults(string $query, int $offset, int $maxResult): array
{
// **warning again**: this is an incomplete implementation
$results = [];
foreach ($this->getPersons($query) as $p) {
$results[] = new Model\Result((float)\rand(0, 100) / 100, $p);
}
foreach ($this->getThirdParties($query) as $t) {
$results[] = new Model\Result((float)\rand(0, 100) / 100, $t);
}
\usort($results, function(Model\Result $a, Model\Result $b) {
return ($a->getRelevance() <=> $b->getRelevance()) * -1;
});
return $results;
}
public function countResults(string $query): int
{
return 0;
}
private function getThirdParties(string $query)
{
$thirdPartiesIds = $this->em->createQuery('SELECT t.id FROM '.ThirdParty::class.' t')
->getScalarResult();
$nbResults = rand(0, 15);
if ($nbResults === 1) {
$nbResults++;
}
$ids = \array_rand($thirdPartiesIds, $nbResults);
return $this->em->getRepository(ThirdParty::class)
->findById($ids);
}
private function getPersons(string $query)
{
$params = [
SearchInterface::SEARCH_PREVIEW_OPTION => false
];
$search = $this->search->getResultByName($query, 'person_regular', 0, 50, $params, 'json');
$ids = \array_map(function($r) { return $r['id']; }, $search['results']);
if (count($ids) === 0) {
return [];
}
return $this->em->getRepository(Person::class)
->findById($ids)
;
}
}

View File

@ -0,0 +1,29 @@
<?php
namespace Chill\MainBundle\Serializer\Normalizer;
use Chill\MainBundle\Entity\Address;
use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
class AddressNormalizer implements NormalizerAwareInterface, NormalizerInterface
{
use NormalizerAwareTrait;
public function normalize($address, string $format = null, array $context = [])
{
$data['address_id'] = $address->getId();
$data['text'] = $address->getStreet().', '.$address->getBuildingName();
$data['postcode']['name'] = $address->getPostCode()->getName();
return $data;
}
public function supportsNormalization($data, string $format = null)
{
return $data instanceof Address;
}
}

View File

@ -69,6 +69,13 @@ chill_main_search:
requirements: requirements:
_format: html|json _format: html|json
chill_main_search_global:
path: '/api/1.0/search.{_format}'
controller: Chill\MainBundle\Controller\SearchController::searchApi
format: 'json'
requirements:
_format: 'json'
chill_main_advanced_search: chill_main_advanced_search:
path: /{_locale}/search/advanced/{name} path: /{_locale}/search/advanced/{name}
controller: Chill\MainBundle\Controller\SearchController::advancedSearchAction controller: Chill\MainBundle\Controller\SearchController::advancedSearchAction

View File

@ -16,6 +16,7 @@ services:
$searchProvider: '@chill_main.search_provider' $searchProvider: '@chill_main.search_provider'
$translator: '@Symfony\Contracts\Translation\TranslatorInterface' $translator: '@Symfony\Contracts\Translation\TranslatorInterface'
$paginatorFactory: '@Chill\MainBundle\Pagination\PaginatorFactory' $paginatorFactory: '@Chill\MainBundle\Pagination\PaginatorFactory'
$searchApi: '@Chill\MainBundle\Search\SearchApi'
tags: ['controller.service_arguments'] tags: ['controller.service_arguments']
Chill\MainBundle\Controller\PermissionsGroupController: Chill\MainBundle\Controller\PermissionsGroupController:

View File

@ -1,3 +1,10 @@
services: services:
chill_main.search_provider: chill_main.search_provider:
class: Chill\MainBundle\Search\SearchProvider class: Chill\MainBundle\Search\SearchProvider
Chill\MainBundle\Search\SearchProvider: '@chill_main.search_provider'
Chill\MainBundle\Search\SearchApi:
arguments:
$em: '@Doctrine\ORM\EntityManagerInterface'
$search: '@Chill\MainBundle\Search\SearchProvider'

View File

@ -4,6 +4,10 @@ services:
tags: tags:
- { name: 'serializer.normalizer', priority: 64 } - { name: 'serializer.normalizer', priority: 64 }
Chill\MainBundle\Serializer\Normalizer\AddressNormalizer:
tags:
- { name: 'serializer.normalizer', priority: 64 }
Chill\MainBundle\Serializer\Normalizer\DateNormalizer: Chill\MainBundle\Serializer\Normalizer\DateNormalizer:
tags: tags:
- { name: 'serializer.normalizer', priority: 64 } - { name: 'serializer.normalizer', priority: 64 }

View File

@ -25,7 +25,7 @@ use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
use Chill\PersonBundle\Repository\PersonRepository; use Chill\PersonBundle\Repository\PersonRepository;
use Symfony\Component\Serializer\Exception\RuntimeException; use Symfony\Component\Serializer\Exception\RuntimeException;
use Symfony\Component\Serializer\Exception\UnexpectedValueException; use Symfony\Component\Serializer\Exception\UnexpectedValueException;
use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
/** /**
* Serialize a Person entity * Serialize a Person entity
@ -41,25 +41,45 @@ class PersonNormalizer implements
protected PersonRepository $repository; protected PersonRepository $repository;
private ChillEntityRenderExtension $render;
public const GET_PERSON = 'get_person'; public const GET_PERSON = 'get_person';
public function __construct(PersonRepository $repository) public function __construct(PersonRepository $repository, ChillEntityRenderExtension $render)
{ {
$this->repository = $repository; $this->repository = $repository;
$this->render = $render;
} }
public function normalize($person, string $format = null, array $context = array()) public function normalize($person, string $format = null, array $context = array())
{ {
/** @var Person $person */ /** @var Person $person */
return [ return [
'id' => $person->getId(), 'type' => 'person',
'person_id' => $person->getId(),
'text' => $this->render->renderString($person),
'firstName' => $person->getFirstName(), 'firstName' => $person->getFirstName(),
'lastName' => $person->getLastName(), 'lastName' => $person->getLastName(),
'birthdate' => $this->normalizer->normalize($person->getBirthdate()), 'birthdate' => $this->normalizer->normalize($person->getBirthdate()),
'center' => $this->normalizer->normalize($person->getCenter()) 'center' => $this->normalizer->normalize($person->getCenter()),
'phonenumber' => $person->getPhonenumber(),
'mobilenumber' => $person->getMobilenumber(),
'altNames' => $this->normalizeAltNames($person->getAltNames())
]; ];
} }
protected function normalizeAltNames($altNames): array
{
$r = [];
foreach ($altNames as $n) {
$r[] = [ 'key' => $n->getKey(), 'label' => $n->getLabel() ];
}
return $r;
}
public function denormalize($data, string $type, string $format = null, array $context = []): Person public function denormalize($data, string $type, string $format = null, array $context = []): Person
{ {
if ($context[self::GET_PERSON] ?? true) { if ($context[self::GET_PERSON] ?? true) {

View File

@ -3,6 +3,7 @@ services:
Chill\PersonBundle\Serializer\Normalizer\PersonNormalizer: Chill\PersonBundle\Serializer\Normalizer\PersonNormalizer:
arguments: arguments:
$repository: '@Chill\PersonBundle\Repository\PersonRepository' $repository: '@Chill\PersonBundle\Repository\PersonRepository'
$render: '@Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension'
tags: tags:
- { name: 'serializer.normalizer', priority: 64 } - { name: 'serializer.normalizer', priority: 64 }

View File

@ -34,6 +34,7 @@ class ChillThirdPartyExtension extends Extension implements PrependExtensionInte
$loader->load('services/templating.yaml'); $loader->load('services/templating.yaml');
$loader->load('services/menu.yaml'); $loader->load('services/menu.yaml');
$loader->load('services/fixtures.yaml'); $loader->load('services/fixtures.yaml');
$loader->load('services/serializer.yaml');
} }
public function prepend(ContainerBuilder $container) public function prepend(ContainerBuilder $container)

View File

@ -0,0 +1,31 @@
<?php
namespace Chill\ThirdPartyBundle\Serializer\Normalizer;
use Chill\ThirdPartyBundle\Entity\ThirdParty;
use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
class ThirdPartyNormalizer implements NormalizerInterface, NormalizerAwareInterface
{
use NormalizerAwareTrait;
public function normalize($thirdParty, string $format = null, array $context = [])
{
/** @var $thirdParty ThirdParty */
$data['type'] = 'thirdparty';
// TODO should be replaced by a "render entity"
$data['text'] = $thirdParty->getName();
$data['thirdparty_id'] = $thirdParty->getId();
$data['address'] = $this->normalizer->normalize($thirdParty->getAddress(), $format,
[ 'address_rendering' => 'short' ]);
return $data;
}
public function supportsNormalization($data, string $format = null)
{
return $data instanceof ThirdParty;
}
}

View File

@ -1,5 +1,2 @@
--- ---
services: services:
Chill\ThirdPartyBundle\DataFixtures\ORM\LoadThirdParty:
tags:
- { 'name': doctrine.fixture.orm }

View File

@ -0,0 +1,5 @@
---
services:
Chill\ThirdPartyBundle\DataFixtures\ORM\LoadThirdParty:
tags:
- { 'name': doctrine.fixture.orm }

View File

@ -0,0 +1,5 @@
services:
Chill\ThirdPartyBundle\Serializer\Normalizer\:
resource: '../../Serializer/Normalizer/'
tags:
- { name: 'serializer.normalizer', priority: 64 }