add exernal data to adherent admin

.env.dist

@@ -54,6 +54,7 @@ SIMPLIFIED_HOUSEHOLD_BASED_ALLOWANCE=0
 SSA_FRIENDLY_FLUX_TYPE_NAMES=0
 CCAS_MODE=0
 EXTRA_SECURITY_ADMIN_PASSWORD=ChangeMe
+USE_EXTERNAL_DATA=0
 
 EMAIL_ERROR=technique@kohinos.net
 EMAIL_USER_FROM=noreply@kohinos.fr

INSTALL.md

@@ -61,6 +61,7 @@ Copier le fichier .env.dist en .env et configurer :
 - en environnement TAV, la variable SIMPLIFIED_HOUSEHOLD_BASED_ALLOWANCE permet d'activer un mode simplifié d'allocation en fonction de la composition du foyer (pas de minimum de cotisation, moins de détails dans la composition du foyer de l'adhérent, pas de renseignement de territoire dans la fiche adhérent, calcul de l'allocation simplifié, pas de plafond de solde). /!\ Requiert l'activation de HOUSEHOLD_BASED_ALLOWANCE.
 - en environnement TAV, la variable SSA_FRIENDLY_FLUX_TYPE_NAMES permet d'adapter le nommage des types de flux et les écrans de visualisation des flux à un projet de type SSA
 - en environnement TAV, la varialble CCAS_MODE permet d'activer les fonctionnalités de branchement avec une CCAS. Attention : Pour activer CCAS_MODE, le paramètre AUTOMATISATION_RECONVERSION doit OBLIGATOIREMENT être activé.
+- en environnement TAV, la varialble USE_EXTERNAL_DATA permet d'indiquer que l'instance stocke des données externes à l'application dans un but de visualisation par une application tierce (i.e. Metabase). Si ce paramètre est actif, certaines de ces données peuvent être renseignées dans la page admin d'un.e adhérent.e.
 
 Si vous utilisez Payzen comme moyen de paiement par CB :
 

config/services.yaml

@@ -21,6 +21,7 @@ parameters:
     ssa_friendly_flux_type_names: '%env(SSA_FRIENDLY_FLUX_TYPE_NAMES)%'
     extra_security_admin_password: '%env(EXTRA_SECURITY_ADMIN_PASSWORD)%'
     ccas_mode: '%env(CCAS_MODE)%'
+    use_external_data: '%env(USE_EXTERNAL_DATA)%'
 
 
     # PARAMETRES DES IMPORTS POSSIBLE POUR L'APPLICATION DE GESTION DE MONNAIE LOCALE COMPLEMENTAIRE

src/Admin/AdherentAdmin.php

@@ -12,12 +12,15 @@ use App\Entity\Groupe;
 use App\Entity\User;
 use App\Entity\Usergroup;
 use App\Entity\ProfilDeCotisation;
+use App\Entity\ExternalAdherentDatedData;
 use App\Enum\CurrencyEnum;
 use App\Events\MLCEvents;
 use App\Exporter\CustomDoctrineORMQuerySourceIterator;
 use App\Form\Type\DependentChildFormType;
 use App\Form\Type\GeolocFormType;
 use App\Form\Type\UserFormType;
+use App\Form\Type\ExternalAdherentDataFormType;
+use App\Form\Type\ExternalAdherentDatedDataFormType;
 use App\Utils\TAVCotisationUtils;
 use Doctrine\ORM\Query;
 use FOS\UserBundle\Event\UserEvent;
@@ -145,17 +148,19 @@ class AdherentAdmin extends AbstractAdmin
     protected function configureFormFields(FormMapper $formMapper): void
     {
         // params
-        $em = $this->getConfigurationPool()->getContainer()->get('doctrine')->getManager();
-        $tav_env = $this->getConfigurationPool()->getContainer()->getParameter('tav_env');
-        $household_based_allowance = $this->getConfigurationPool()->getContainer()->getParameter('household_based_allowance');
-        $simplified_household_based_allowance = $this->getConfigurationPool()->getContainer()->getParameter('simplified_household_based_allowance');
+        $container = $this->getConfigurationPool()->getContainer();
+        $em = $container->get('doctrine')->getManager();
+        $tav_env = $container->getParameter('tav_env');
+        $household_based_allowance = $container->getParameter('household_based_allowance');
+        $simplified_household_based_allowance = $container->getParameter('simplified_household_based_allowance');
+        $use_external_data = $container->getParameter('use_external_data');
 
         // Initialize adherent
         $adherent = $this->getSubject();
         $now = new \DateTime();
         if ($this->isCurrentRoute('create')) {
             $user = $this->userManager->createUser();
-            $groupe = $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Usergroup::class)->findOneByName('Adherent');
+            $groupe = $container->get('doctrine')->getRepository(Usergroup::class)->findOneByName('Adherent');
             $user->setEnabled(true);
             $user->addPossiblegroup($groupe);
             $user->setGroups([$groupe]);
@@ -197,7 +202,7 @@ class AdherentAdmin extends AbstractAdmin
                     ->add('groupe', ChoiceType::class, [
                         'required' => true,
                         'label' => 'Groupe local :',
-                        'choices' => $this->getConfigurationPool()->getContainer()->get('doctrine')->getRepository(Groupe::class)->findAll(),
+                        'choices' => $container->get('doctrine')->getRepository(Groupe::class)->findAll(),
                         'choice_label' => 'name',
                         'placeholder' => 'Choisir un groupe',
                     ])
@@ -208,7 +213,7 @@ class AdherentAdmin extends AbstractAdmin
         if ($tav_env) {
             $mlc = $em->getRepository(GlobalParameter::class)->val(GlobalParameter::MLC_SYMBOL);
 
-            if ($this->getConfigurationPool()->getContainer()->getParameter('ccas_mode')) {
+            if ($container->getParameter('ccas_mode')) {
                 $formMapper
                     ->tab('General')
                         ->with('Identité')
@@ -545,6 +550,33 @@ class AdherentAdmin extends AbstractAdmin
                         ->end();
                 }
             }
+
+            if ($use_external_data) {
+                $formMapper
+                    ->tab('General')
+                        ->with('Données de suivi', [
+                            'class' => 'col-md-7', 
+                        ])
+                            ->add('externalData', ExternalAdherentDataFormType::class, [
+                                'label' => false,
+                                'required' => false,
+                            ])
+                            ->add('externalDatedDataCollection', CollectionType::class, [
+                                    'entry_type' => ExternalAdherentDatedDataFormType::class,
+                                    'required' => false,
+                                    'entry_options' => [
+                                        'label' => true,
+                                        'data_class' => ExternalAdherentDatedData::class,
+                                        'attr' => ['class' => 'border pl-3 pr-3 pt-2']
+                                    ],
+                                    'allow_add' => true,
+                                    'allow_delete' => true,
+                                    'by_reference' => false,
+                                    'label' => "Données datées"
+                                ])
+                        ->end()
+                    ->end();
+            }
         }
 
         $formMapper->getFormBuilder()->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($em) {
@@ -705,6 +737,10 @@ class AdherentAdmin extends AbstractAdmin
             $this->tavCotisationUtils->calculateAllowanceAccordingToHousehold($adherent);
         }
 
+        if ($adherent->getExternalData()) {
+            $adherent->getExternalData()->setAdherent($adherent);
+        }
+
         $em->persist($adherent->getUser());
         $em->persist($adherent);
         $em->flush();

src/Entity/Adherent.php

@@ -166,11 +166,21 @@ class Adherent extends AccountableObject implements AccountableInterface
      */
     private $anonymousToken;
 
+    /**
+     * @ORM\OneToOne(targetEntity="ExternalAdherentData", cascade={"persist", "remove"}, mappedBy="adherent", orphanRemoval=true)
+     */
+    private ?ExternalAdherentData $externalData = null;
+
+    /**
+     * @ORM\OneToMany(targetEntity=ExternalAdherentDatedData::class, mappedBy="adherent", orphanRemoval=true, cascade={"persist"})
+     */
+    private $externalDatedDataCollection;
 
     public function __construct()
     {
         $this->accounts = new ArrayCollection();
         $this->dependentChildren = new ArrayCollection();
+        $this->externalDatedDataCollection = new ArrayCollection();
     }
 
     public function getId()
@@ -522,4 +532,48 @@ class Adherent extends AccountableObject implements AccountableInterface
 
         return $this;
     }
+
+    /**
+     * @return ExternalAdherentData
+     */
+    public function getExternalData(): ?ExternalAdherentData
+    {
+        return $this->externalData;
+    }
+
+    /**
+     * @param ExternalAdherentData $externalData
+     *
+     * @return Adherent
+     */
+    public function setExternalData(?ExternalAdherentData $externalData): self
+    {
+        $this->externalData = $externalData;
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, ExternalAdherentDatedData>
+     */
+    public function getExternalDatedDataCollection(): Collection
+    {
+        return $this->externalDatedDataCollection;
+    }
+
+    public function addExternalDatedDataCollection(ExternalAdherentDatedData $externalDatedData): self
+    {
+        if (!$this->externalDatedDataCollection->contains($externalDatedData)) {
+            $this->externalDatedDataCollection[] = $externalDatedData;
+            $externalDatedData->setAdherent($this);
+        }
+
+        return $this;
+    }
+
+    public function removeExternalDatedDataCollection(ExternalAdherentDatedData $externalDatedData): self
+    {
+        $this->externalDatedDataCollection->removeElement($externalDatedData);
+        return $this;
+    }
 }

src/Entity/ExternalAdherentData.php

@@ -8,6 +8,8 @@ use Ramsey\Uuid\Doctrine\UuidGenerator;
 /**
  * @ORM\Entity
  * @ORM\Table(name="external_adherent_data")
+ * 
+ * This table stores data to be visualised in a Metabase instance  
  */
 class ExternalAdherentData
 {
@@ -22,10 +24,10 @@ class ExternalAdherentData
     private $id;
 
     /**
-     * @ORM\OneToOne(targetEntity="Adherent")
+     * @ORM\OneToOne(targetEntity="Adherent", inversedBy="externalData")
      * @ORM\JoinColumn(name="adherent_id", referencedColumnName="id", nullable=false, unique=true)
      */
-    private $adherent;
+    private ?Adherent $adherent = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="ExternalDataAgeGroup")
@@ -54,7 +56,7 @@ class ExternalAdherentData
      */
     private $externalDataCCMemberStatus;
 
-    public function setAdherent(Adherent $adherent): self
+    public function setAdherent(?Adherent $adherent): self
     {
         $this->adherent = $adherent;
 
@@ -110,7 +112,7 @@ class ExternalAdherentData
         return $this;
     }
 
-    public function getAdherent(): Adherent
+    public function getAdherent(): ?Adherent
     {
         return $this->adherent;
     }

src/Entity/ExternalAdherentDatedData.php

@@ -22,8 +22,8 @@ class ExternalAdherentDatedData
     private $id;
 
     /**
-     * @ORM\OneToOne(targetEntity="Adherent")
-     * @ORM\JoinColumn(name="adherent_id", referencedColumnName="id", nullable=false, unique=true)
+     * @ORM\ManyToOne(targetEntity=Adherent::class, inversedBy="externalDatedData")
+     * @ORM\JoinColumn(name="adherent_id", referencedColumnName="id", nullable=false)
      */
     private $adherent;
 
@@ -79,7 +79,7 @@ class ExternalAdherentDatedData
         return $this->adherent;
     }
 
-    public function getYear(): int
+    public function getYear(): ?int
     {
         return $this->year;
     }

src/Form/Type/ExternalAdherentDataFormType.php

+<?php
+
+namespace App\Form\Type;
+
+use App\Entity\ExternalAdherentData;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Doctrine\ORM\EntityManagerInterface;
+
+
+class ExternalAdherentDataFormType extends AbstractType
+{
+    protected $em;
+
+    public function __construct(EntityManagerInterface $em) {
+        $this->em = $em;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('cohort', TextType::class, [
+                'label' => 'Cohorte',
+                'required' => false,
+            ])
+            ->add('external_id', TextType::class, [
+                'label' => 'ID externe',
+                'required' => false,
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ExternalAdherentData::class,
+        ]);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'formExternalAdherentData';
+    }
+}

src/Form/Type/ExternalAdherentDatedDataFormType.php

+<?php
+
+namespace App\Form\Type;
+
+use App\Entity\ExternalAdherentDatedData;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Doctrine\ORM\EntityManagerInterface;
+
+
+class ExternalAdherentDatedDataFormType extends AbstractType
+{
+    protected $em;
+
+    public function __construct(EntityManagerInterface $em) {
+        $this->em = $em;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder
+            ->add('year', NumberType::class, [
+                'label' => 'Année',
+                'required' => true,
+            ])
+            ->add('annual_income', NumberType::class, [
+                'label' => 'Revenu annuel',
+                'required' => false,
+            ])
+            ->add('monthly_income', NumberType::class, [
+                'label' => 'Revenu mensuel',
+                'required' => false,
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => ExternalAdherentDatedData::class,
+        ]);
+    }
+
+    public function getBlockPrefix()
+    {
+        return 'formExternalAdherentDatedData';
+    }
+}

src/Migrations/Version20251002091120.php

+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20251002091120 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return '';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE external_adherent_dated_data DROP INDEX UNIQ_23A421FE25F06C53, ADD INDEX IDX_23A421FE25F06C53 (adherent_id)');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE external_adherent_dated_data DROP INDEX IDX_23A421FE25F06C53, ADD UNIQUE INDEX UNIQ_23A421FE25F06C53 (adherent_id)');
+    }
+}