Merge branch '153-feat-new-importer-for-socialwork'

This commit is contained in:
Julien Fastré 2021-07-30 13:24:26 +02:00
commit 014fe19b45
20 changed files with 857 additions and 387 deletions

View File

@ -52,7 +52,7 @@
"knplabs/knp-time-bundle": "^1.12", "knplabs/knp-time-bundle": "^1.12",
"symfony/intl": "4.*", "symfony/intl": "4.*",
"symfony/swiftmailer-bundle": "^3.5", "symfony/swiftmailer-bundle": "^3.5",
"league/csv": "^9.6", "league/csv": "^9.7.1",
"phpoffice/phpspreadsheet": "^1.16", "phpoffice/phpspreadsheet": "^1.16",
"symfony/browser-kit": "^5.2", "symfony/browser-kit": "^5.2",
"symfony/css-selector": "^5.2", "symfony/css-selector": "^5.2",

View File

@ -1,25 +1,7 @@
<?php <?php
/*
* Copyright (C) 2016-2019 Champs-Libres <info@champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Chill\PersonBundle\Command; namespace Chill\PersonBundle\Command;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
@ -28,26 +10,15 @@ use Doctrine\ORM\EntityManagerInterface;
use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\Person;
use Symfony\Component\Console\Exception\RuntimeException; use Symfony\Component\Console\Exception\RuntimeException;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
class ChillPersonMoveCommand extends ContainerAwareCommand final class ChillPersonMoveCommand extends Command
{ {
/** private PersonMove $mover;
*
* @var PersonMove
*/
protected $mover;
/** private EntityManagerInterface $em;
*
* @var EntityManagerInterface
*/
protected $em;
/** private LoggerInterface $chillLogger;
*
* @var LoggerInterface
*/
protected $chillLogger;
public function __construct( public function __construct(
PersonMove $mover, PersonMove $mover,

View File

@ -1,22 +1,5 @@
<?php <?php
/*
* Copyright (C) 2016 Champs-Libres <info@champs-libres.coop>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Chill\PersonBundle\Command; namespace Chill\PersonBundle\Command;
use Chill\MainBundle\Templating\TranslatableStringHelper; use Chill\MainBundle\Templating\TranslatableStringHelper;
@ -40,61 +23,33 @@ use Symfony\Component\Console\Question\ConfirmationQuestion;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\Form\FormFactory; use Symfony\Component\Form\FormFactory;
use Symfony\Component\Form\FormFactoryInterface;
/** final class ImportPeopleFromCSVCommand extends Command
* Class ImportPeopleFromCSVCommand
*
* @package Chill\PersonBundle\Command
* @author Julien Fastré <julien.fastre@champs-libres.coop>
*/
class ImportPeopleFromCSVCommand extends Command
{ {
/** private InputInterface $input;
* @var InputInterface
*/ private OutputInterface $output;
protected $input;
private LoggerInterface $logger;
private TranslatableStringHelper $helper;
private EntityManagerInterface $em;
private EventDispatcherInterface $eventDispatcher;
/** /**
* @var OutputInterface * The line currently read
*/ */
protected $output; private int $line;
/** /**
* @var \Psr\Log\LoggerInterface * Where key are column names, and value the custom field slug
*/ */
protected $logger; private array $customFieldMapping = [];
/** private CustomFieldProvider $customFieldProvider;
* @var \Chill\MainBundle\Templating\TranslatableStringHelper
*/
protected $helper;
/**
* @var \Doctrine\Persistence\ObjectManager
*/
protected $em;
/**
* @var EventDispatcherInterface
*/
protected $eventDispatcher;
/**
* the line currently read
*
* @var int
*/
protected $line;
/**
* @var array where key are column names, and value the custom field slug
*/
protected $customFieldMapping = array();
/**
* @var CustomFieldProvider
*/
protected $customFieldProvider;
/** /**
* Contains an array of information searched in the file. * Contains an array of information searched in the file.
@ -129,10 +84,7 @@ class ImportPeopleFromCSVCommand extends Command
*/ */
protected static $defaultDateInterpreter = "%d/%m/%Y|%e/%m/%y|%d/%m/%Y|%e/%m/%Y"; protected static $defaultDateInterpreter = "%d/%m/%Y|%e/%m/%y|%d/%m/%Y|%e/%m/%Y";
/** private FormFactoryInterface $formFactory;
* @var FormFactory
*/
protected $formFactory;
/** /**
* ImportPeopleFromCSVCommand constructor. * ImportPeopleFromCSVCommand constructor.
@ -150,7 +102,7 @@ class ImportPeopleFromCSVCommand extends Command
EntityManagerInterface $em, EntityManagerInterface $em,
CustomFieldProvider $customFieldProvider, CustomFieldProvider $customFieldProvider,
EventDispatcherInterface $eventDispatcher, EventDispatcherInterface $eventDispatcher,
FormFactory $formFactory FormFactoryInterface $formFactory
) { ) {
$this->logger = $logger; $this->logger = $logger;
$this->helper = $helper; $this->helper = $helper;

View File

@ -0,0 +1,63 @@
<?php
declare(strict_types=1);
namespace Chill\PersonBundle\Command;
use Chill\PersonBundle\Service\Import\ChillImporter;
use Chill\PersonBundle\Service\Import\SocialWorkMetadataInterface;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Doctrine\ORM\EntityManagerInterface;
use Exception;
use League\Csv\Reader;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Throwable;
final class ImportSocialWorkMetadata extends Command
{
/**
* @var EntityManagerInterface
*/
protected EntityManagerInterface $em;
/**
* @var LoggerInterface
*/
protected ChillImporter $importer;
public function __construct(
SocialWorkMetadataInterface $socialWorkMetadata
) {
parent::__construct('chill:person:import-socialwork');
$this->importer = $socialWorkMetadata;
}
protected function configure()
{
$this
->setName('chill:person:import-socialwork')
->addOption('filepath', 'f', InputOption::VALUE_REQUIRED, 'The file to import.')
->addOption('language', 'l', InputOption::VALUE_OPTIONAL, 'The default language');
}
protected function execute(InputInterface $input, OutputInterface $output)
{
$filepath = $input->getOption('filepath');
try {
$csv = Reader::createFromPath($filepath);
} catch (Throwable $e) {
throw new Exception('Error while loading CSV.',0, $e);
}
$csv->setDelimiter(';');
return true === $this->importer->import($csv) ?
0:
1;
}
}

View File

@ -69,7 +69,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
$loader->load('services/search.yaml'); $loader->load('services/search.yaml');
$loader->load('services/menu.yaml'); $loader->load('services/menu.yaml');
$loader->load('services/privacyEvent.yaml'); $loader->load('services/privacyEvent.yaml');
$loader->load('services/command.yaml');
$loader->load('services/actions.yaml'); $loader->load('services/actions.yaml');
$loader->load('services/form.yaml'); $loader->load('services/form.yaml');
$loader->load('services/alt_names.yaml'); $loader->load('services/alt_names.yaml');

View File

@ -23,7 +23,7 @@ class Evaluation
private $title = []; private $title = [];
/** /**
* @ORM\Column(type="dateinterval") * @ORM\Column(type="dateinterval", nullable=true)
*/ */
private $delay; private $delay;

View File

@ -47,7 +47,7 @@ class SocialAction
private $children; private $children;
/** /**
* @ORM\Column(type="dateinterval") * @ORM\Column(type="dateinterval", nullable=true)
*/ */
private $defaultNotificationDelay; private $defaultNotificationDelay;

View File

@ -5,8 +5,9 @@ namespace Chill\PersonBundle\Repository\SocialWork;
use Chill\PersonBundle\Entity\SocialWork\Evaluation; use Chill\PersonBundle\Entity\SocialWork\Evaluation;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Doctrine\Persistence\ObjectRepository;
final class EvaluationRepository final class EvaluationRepository implements ObjectRepository
{ {
private EntityRepository $repository; private EntityRepository $repository;
@ -14,4 +15,40 @@ final class EvaluationRepository
{ {
$this->repository = $entityManager->getRepository(Evaluation::class); $this->repository = $entityManager->getRepository(Evaluation::class);
} }
public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Evaluation
{
return $this->repository->find($id, $lockMode, $lockVersion);
}
/**
* @return array<int, Evaluation>
*/
public function findAll(): array
{
return $this->repository->findAll();
}
/**
* @return array<int, Evaluation>
*/
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
{
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
public function findOneBy(array $criteria, ?array $orderBy = null): ?Evaluation
{
return $this->repository->findOneBy($criteria, $orderBy);
}
/**
* @return class-string
*/
public function getClassName(): string
{
return Evaluation::class;
}
} }

View File

@ -18,31 +18,27 @@ final class GoalRepository implements ObjectRepository
$this->repository = $entityManager->getRepository(Goal::class); $this->repository = $entityManager->getRepository(Goal::class);
} }
public function find($id) public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Goal
{ {
return $this->repository->find($id); return $this->repository->find($id, $lockMode, $lockVersion);
} }
public function findAll() /**
* @return array<int, Goal>
*/
public function findAll(): array
{ {
return $this->repository->findAll(); return $this->repository->findAll();
} }
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null) /**
* @return array<int, Goal>
*/
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
{ {
return $this->repository->findBy($criteria, $orderBy, $limit, $offset); return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
} }
public function findOneBy(array $criteria)
{
return $this->findOneBy($criteria);
}
public function getClassName()
{
return Goal::class;
}
/** /**
* *
* @return Goal[] * @return Goal[]
@ -91,4 +87,16 @@ final class GoalRepository implements ObjectRepository
return $qb; return $qb;
} }
public function findOneBy(array $criteria, ?array $orderBy = null): ?Goal
{
return $this->repository->findOneBy($criteria, $orderBy);
}
/**
* @return class-string
*/
public function getClassName(): string
{
return Goal::class;
}
} }

View File

@ -19,12 +19,15 @@ final class ResultRepository implements ObjectRepository
$this->repository = $entityManager->getRepository(Result::class); $this->repository = $entityManager->getRepository(Result::class);
} }
public function find($id) public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?Result
{ {
return $this->repository->find($id); return $this->repository->find($id, $lockMode, $lockVersion);
} }
public function findAll() /**
* @return array<int, Result>
*/
public function findAll(): array
{ {
return $this->repository->findAll(); return $this->repository->findAll();
} }
@ -34,16 +37,6 @@ final class ResultRepository implements ObjectRepository
return $this->repository->findBy($criteria, $orderBy, $limit, $offset); return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
} }
public function findOneBy(array $criteria)
{
return $this->findOneBy($criteria);
}
public function getClassName()
{
return Result::class;
}
/** /**
* *
* @return Result[] * @return Result[]
@ -133,5 +126,25 @@ final class ResultRepository implements ObjectRepository
->getSingleScalarResult() ->getSingleScalarResult()
; ;
} }
}
/**
* @return array<int, Result>
*/
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
{
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
public function findOneBy(array $criteria, ?array $orderBy = null): ?Result
{
return $this->repository->findOneBy($criteria, $orderBy);
}
/**
* @return class-string
*/
public function getClassName(): string
{
return Result::class;
}
}

View File

@ -5,8 +5,9 @@ namespace Chill\PersonBundle\Repository\SocialWork;
use Chill\PersonBundle\Entity\SocialWork\SocialAction; use Chill\PersonBundle\Entity\SocialWork\SocialAction;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Doctrine\Persistence\ObjectRepository;
final class SocialActionRepository final class SocialActionRepository implements ObjectRepository
{ {
private EntityRepository $repository; private EntityRepository $repository;
@ -14,4 +15,38 @@ final class SocialActionRepository
{ {
$this->repository = $entityManager->getRepository(SocialAction::class); $this->repository = $entityManager->getRepository(SocialAction::class);
} }
public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?SocialAction
{
return $this->repository->find($id, $lockMode, $lockVersion);
}
/**
* @return array<int, SocialAction>
*/
public function findAll(): array
{
return $this->repository->findAll();
}
/**
* @return array<int, SocialAction>
*/
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
{
return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
}
public function findOneBy(array $criteria, ?array $orderBy = null): ?SocialAction
{
return $this->repository->findOneBy($criteria, $orderBy);
}
/**
* @return class-string
*/
public function getClassName(): string
{
return SocialAction::class;
}
} }

View File

@ -1,9 +1,10 @@
<?php <?php
declare(strict_types=1);
namespace Chill\PersonBundle\Repository\SocialWork; namespace Chill\PersonBundle\Repository\SocialWork;
use Chill\PersonBundle\Entity\SocialWork\SocialIssue; use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityRepository;
use Doctrine\Persistence\ObjectRepository; use Doctrine\Persistence\ObjectRepository;
@ -17,42 +18,36 @@ final class SocialIssueRepository implements ObjectRepository
$this->repository = $entityManager->getRepository(SocialIssue::class); $this->repository = $entityManager->getRepository(SocialIssue::class);
} }
/** public function find($id, ?int $lockMode = null, ?int $lockVersion = null): ?SocialIssue
* {@inheritDoc}
*/
public function find($id)
{ {
return $this->repository->find($id); return $this->repository->find($id, $lockMode, $lockVersion);
} }
/** /**
* {@inheritDoc} * @return array<int, SocialIssue>
*/ */
public function findAll() public function findAll(): array
{ {
return $this->repository->findAll(); return $this->repository->findAll();
} }
/** /**
* {@inheritDoc} * @return array<int, SocialIssue>
*/ */
public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null) public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array
{ {
return $this->repository->findBy($criteria, $orderBy, $limit, $offset); return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
} }
/** public function findOneBy(array $criteria, ?array $orderBy = null): ?SocialIssue
* {@inheritDoc}
*/
public function findOneBy(array $criteria)
{ {
return $this->findOneBy($criteria); return $this->repository->findOneBy($criteria, $orderBy);
} }
/** /**
* {@inheritDoc} * @return class-string
*/ */
public function getClassName() public function getClassName(): string
{ {
return SocialIssue::class; return SocialIssue::class;
} }

View File

@ -0,0 +1,10 @@
<?php
declare(strict_types=1);
namespace Chill\PersonBundle\Service\Import;
interface ChillImporter
{
public function import(iterable $dataset): bool;
}

View File

@ -0,0 +1,298 @@
<?php
declare(strict_types=1);
namespace Chill\PersonBundle\Service\Import;
use Chill\PersonBundle\Entity\SocialWork\Evaluation;
use Chill\PersonBundle\Entity\SocialWork\Goal;
use Chill\PersonBundle\Entity\SocialWork\Result;
use Chill\PersonBundle\Entity\SocialWork\SocialAction;
use Chill\PersonBundle\Entity\SocialWork\SocialIssue;
use Chill\PersonBundle\Repository\SocialWork\EvaluationRepository;
use Chill\PersonBundle\Repository\SocialWork\GoalRepository;
use Chill\PersonBundle\Repository\SocialWork\ResultRepository;
use Chill\PersonBundle\Repository\SocialWork\SocialActionRepository;
use Chill\PersonBundle\Repository\SocialWork\SocialIssueRepository;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Query\Expr\Comparison;
use Doctrine\Persistence\ObjectRepository;
use Exception;
final class SocialWorkMetadata implements SocialWorkMetadataInterface
{
private SocialIssueRepository $socialIssueRepository;
private SocialActionRepository $socialActionRepository;
private GoalRepository $goalRepository;
private ResultRepository $resultRepository;
private EvaluationRepository $evaluationRepository;
private EntityManagerInterface $entityManager;
public function __construct(
SocialIssueRepository $socialIssueRepository,
SocialActionRepository $socialActionRepository,
GoalRepository $goalRepository,
ResultRepository $resultRepository,
EvaluationRepository $evaluationRepository,
EntityManagerInterface $entityManager
) {
$this->socialIssueRepository = $socialIssueRepository;
$this->socialActionRepository = $socialActionRepository;
$this->goalRepository = $goalRepository;
$this->resultRepository = $resultRepository;
$this->evaluationRepository = $evaluationRepository;
$this->entityManager = $entityManager;
}
public function import(iterable $dataset): bool
{
foreach ($dataset as $row) {
$this->import1(
array_map(
static fn (string $column): ?string => '' === $column ? null : $column,
array_map('trim', $row)
)
);
}
return true;
}
private function import1(array $row): void
{
// Structure:
// Index 0: SocialIssue.parent
// Index 1: SocialIssue
// Index 2: SocialAction.parent
// Index 3: SocialAction
// Index 4: Goal
// Index 5: Result
// Index 6: Evaluation
$socialIssue = $this->handleSocialIssue($row[0], $row[1]);
$socialAction = $this->handleSocialAction($row[2], $row[3], $socialIssue);
$goal = $this->handleGoal($row[4], $socialAction);
$result = $this->handleResult($row[5], $socialAction, $goal);
$eval = $this->handleEvaluation($row[6], $socialAction);
$this->entityManager->flush();
}
private function handleSocialIssue(?string $socialIssueTitle = null, ?string $socialIssueChildrenTitle = null): SocialIssue
{
if (null !== $socialIssueChildrenTitle) {
/** @var SocialIssue $socialIssueChildren */
$socialIssueChildren = $this->getOrCreateEntity($this->socialIssueRepository, 'title', ['fr' => $socialIssueChildrenTitle]);
$socialIssueChildren->setTitle(['fr' => $socialIssueChildrenTitle]);
$this->entityManager->persist($socialIssueChildren);
}
/** @var SocialIssue $socialIssue */
$socialIssue = $this->getOrCreateEntity($this->socialIssueRepository, 'title', ['fr' => $socialIssueTitle]);
$socialIssue->setTitle(['fr' => $socialIssueTitle]);
if (null !== $socialIssueChildrenTitle) {
$socialIssue->addChild($socialIssueChildren);
}
$this->entityManager->persist($socialIssue);
return null === $socialIssueChildrenTitle ? $socialIssue : $socialIssueChildren;
}
private function handleSocialAction(?string $socialActionTitle, ?string $socialActionChildrenTitle, SocialIssue $socialIssue): SocialAction
{
if (null !== $socialActionChildrenTitle) {
/** @var SocialAction $socialActionChildren */
$socialActionChildren = $this->getOrCreateEntity($this->socialActionRepository, 'title', ['fr' => $socialActionChildrenTitle]);
$socialActionChildren->setTitle(['fr' => $socialActionChildrenTitle]);
$this->entityManager->persist($socialActionChildren);
}
/** @var SocialIssue $socialIssue */
$socialAction = $this->getOrCreateEntity($this->socialActionRepository, 'title', ['fr' => $socialActionTitle]);
$socialAction->setTitle(['fr' => $socialActionTitle]);
if (null !== $socialActionChildrenTitle) {
$socialActionChildren->setIssue($socialIssue);
$this->entityManager->persist($socialActionChildren);
$socialAction->addChild($socialActionChildren);
} else {
$socialAction->setIssue($socialIssue);
}
$this->entityManager->persist($socialAction);
return null === $socialActionChildrenTitle ? $socialAction : $socialActionChildren;
}
private function handleGoal(?string $goalTitle = null, ?SocialAction $socialAction = null): ?Goal
{
if (null === $goalTitle) {
return null;
}
/** @var Goal $goal */
$goal = $this->getOrCreateEntity($this->goalRepository, 'title', ['fr' => $goalTitle]);
$goal->setTitle(['fr' => $goalTitle]);
if (null !== $socialAction) {
$socialAction->addGoal($goal);
$goal->addSocialAction($socialAction);
$this->entityManager->persist($socialAction);
}
$this->entityManager->persist($goal);
return $goal;
}
private function handleResult(?string $resultTitle = null, ?SocialAction $socialAction = null, ?Goal $goal = null): ?Result
{
if (null === $resultTitle) {
return null;
}
/** @var Result $result */
$result = $this->getOrCreateEntity($this->resultRepository, 'title', ['fr' => $resultTitle]);
$result->setTitle(['fr' => $resultTitle]);
if (null !== $goal) {
$result->addGoal($goal);
$goal->addResult($result);
$this->entityManager->persist($goal);
} else {
$result->addSocialAction($socialAction);
}
$result->addSocialAction($socialAction);
$socialAction->addResult($result);
$this->entityManager->persist($result);
$this->entityManager->persist($socialAction);
return $result;
}
private function handleEvaluation(?string $evaluationTitle, SocialAction $socialAction): ?Evaluation
{
if (null === $evaluationTitle) {
return null;
}
/** @var Evaluation $eval */
$eval = $this->getOrCreateEntity($this->evaluationRepository, 'title', ['fr' => $evaluationTitle]);
$eval->setTitle(['fr' => $evaluationTitle]);
$eval->setSocialAction($socialAction);
$this->entityManager->persist($eval);
return $eval;
}
private function findByJson(ObjectRepository $repository, string $field, array $jsonCriterias): array
{
$qb = $this
->entityManager
->createQueryBuilder()
->select('s')
->from($repository->getClassName(), 's');
$expr = $qb->expr();
$temporaryJsonCriterias = $jsonParameters = [];
foreach ($jsonCriterias as $key => $value) {
$temporaryJsonCriterias[] = [$field, $key, $value, sprintf(':placeholder_%s_%s', $field, $key)];
}
$jsonParameters = array_reduce(
$temporaryJsonCriterias,
static function (array $carry, array $row): array
{
[,, $value, $placeholder] = $row;
return array_merge(
$carry,
[
$placeholder => sprintf('"%s"', $value),
]
);
},
[]
);
$jsonPredicates = array_map(
static function (array $row) use ($expr): Comparison
{
[$field, $key,, $placeholder] = $row;
$left = sprintf(
"GET_JSON_FIELD_BY_KEY(s.%s, '%s')",
$field,
$key
);
return $expr
->eq(
$left,
$placeholder
);
},
$temporaryJsonCriterias
);
$query = $qb
->select('s')
->where(...$jsonPredicates)
->setParameters($jsonParameters)
->getQuery();
return $query->getResult();
}
private function getOrCreateEntity(ObjectRepository $repository, string $field, array $jsonCriterias = [])
{
$results = $this
->findByJson(
$repository,
$field,
$jsonCriterias
);
switch (true) {
case count($results) === 0:
$entity = $repository->getClassName();
$entity = new $entity();
break;
case count($results) === 1;
$entity = current($results);
break;
case count($results) > 1;
throw new Exception(
sprintf(
'More than one entity(%s) found.',
$repository->getClassName()
)
);
}
return $entity;
}
}

View File

@ -0,0 +1,9 @@
<?php
declare(strict_types=1);
namespace Chill\PersonBundle\Service\Import;
interface SocialWorkMetadataInterface extends ChillImporter
{
}

View File

@ -6,12 +6,24 @@ services:
autowire: true autowire: true
autoconfigure: true autoconfigure: true
Chill\PersonBundle\Service\:
resource: '../Service/'
autowire: true
autoconfigure: true
Chill\PersonBundle\Serializer\Normalizer\: Chill\PersonBundle\Serializer\Normalizer\:
resource: '../Serializer/Normalizer/' resource: '../Serializer/Normalizer/'
autowire: true autowire: true
tags: tags:
- { name: 'serializer.normalizer', priority: 64 } - { name: 'serializer.normalizer', priority: 64 }
Chill\PersonBundle\Command\:
resource: '../Command/'
autowire: true
autoconfigure: true
tags:
- { name: console.command }
chill.person.form.type.select2maritalstatus: chill.person.form.type.select2maritalstatus:
class: Chill\PersonBundle\Form\Type\Select2MaritalStatusType class: Chill\PersonBundle\Form\Type\Select2MaritalStatusType
arguments: arguments:

View File

@ -1,19 +0,0 @@
services:
Chill\PersonBundle\Command\ChillPersonMoveCommand:
arguments:
$em: '@Doctrine\ORM\EntityManagerInterface'
$mover: '@Chill\PersonBundle\Actions\Remove\PersonMove'
$chillLogger: '@chill.main.logger'
tags:
- { name: console.command }
Chill\PersonBundle\Command\ImportPeopleFromCSVCommand:
arguments:
$logger: '@logger'
$helper: '@Chill\MainBundle\Templating\TranslatableStringHelper'
$em: '@Doctrine\ORM\EntityManagerInterface'
$customFieldProvider: '@Chill\CustomFieldsBundle\Service\CustomFieldProvider'
$eventDispatcher: '@Symfony\Component\EventDispatcher\EventDispatcherInterface'
$formFactory: '@form.factory'
tags:
- { name: console.command }

View File

@ -0,0 +1,29 @@
<?php
declare(strict_types=1);
namespace Chill\Migrations\Person;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20210623142046 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_person_social_action ALTER defaultnotificationdelay DROP NOT NULL');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_person_social_action ALTER defaultNotificationDelay SET NOT NULL');
}
}

View File

@ -0,0 +1,29 @@
<?php
declare(strict_types=1);
namespace Chill\Migrations\Person;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20210624131722 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay DROP NOT NULL');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER delay SET NOT NULL');
}
}

View File

@ -0,0 +1,29 @@
<?php
declare(strict_types=1);
namespace Chill\Migrations\Person;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\Migrations\AbstractMigration;
/**
* Auto-generated Migration: Please modify to your needs!
*/
final class Version20210624131723 extends AbstractMigration
{
public function getDescription(): string
{
return '';
}
public function up(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay DROP NOT NULL');
}
public function down(Schema $schema): void
{
$this->addSql('ALTER TABLE chill_person_social_work_evaluation ALTER notificationdelay SET NOT NULL');
}
}