Merge remote-tracking branch 'origin/master' into bootstrap-tests-ci

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php

@@ -42,7 +42,37 @@ use Chill\MainBundle\Entity\User;
  */
 class AccompanyingPeriod
 {
-    const INTENSITY = ['occasional', 'regular'];
+    /**
+     * Mark an accompanying period as "occasional"
+     * 
+     * used in INTENSITY
+     */
+    public const INTENSITY_OCCASIONAL = 'occasional';
+    
+    /**
+     * Mark an accompanying period as "regular"
+     * 
+     * used in INTENSITY
+     */
+    public const INTENSITY_REGULAR = 'regular';
+    
+    public const INTENSITIES = [self::INTENSITY_OCCASIONAL, self::INTENSITY_REGULAR];
+    
+    /**
+     * Mark an accompanying period as "draft".
+     * 
+     * This means that the accompanying period is not yet 
+     * confirmed by the creator
+     */
+    public const STEP_DRAFT = 'DRAFT';
+    
+    /**
+     * Mark an accompanying period as "confirmed".
+     * 
+     * This means that the accompanying period **is** 
+     * confirmed by the creator
+     */
+    public const STEP_CONFIRMED = 'CONFIRMED';
     
     /**
      * @var integer
@@ -117,7 +147,7 @@ class AccompanyingPeriod
      * @var string
      * @ORM\Column(type="string", length=32, nullable=true)
      */
-    private $step = 'DRAFT';
+    private $step = self::STEP_DRAFT;
     
     /**
      * @ORM\ManyToOne(targetEntity=Origin::class)

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/ClosingMotive.php

@@ -47,7 +47,7 @@ class ClosingMotive
     /**
      * @var array
      *
-     * @ORM\Column(type="json_array")
+     * @ORM\Column(type="json")
      */
     private $name;
     

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Origin.php

@@ -39,7 +39,7 @@ class Origin
     private $id;
 
     /**
-     * @ORM\Column(type="string", length=255)
+     * @ORM\Column(type="json")
      */
     private $label;
 

src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php

@@ -50,7 +50,7 @@ class AccompanyingPeriodParticipation
     private $person;
     
     /**
-     * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations")
+     * @ORM\ManyToOne(targetEntity=AccompanyingPeriod::class, inversedBy="participations", cascade={"persist"})
      * @ORM\JoinColumn(name="accompanyingperiod_id", referencedColumnName="id", nullable=false)
      */
     private $accompanyingPeriod;

src/Bundle/ChillPersonBundle/migrations/Version20210419105054.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Rename sequence "closing motive"
+ */
+final class Version20210419105054 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return 'rename sequence "closing motive"';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        $this->addSql('ALTER TABLE chill_person_closingmotive_id_seq RENAME TO '
+            . 'chill_person_accompanying_period_closingmotive_id_seq');
+
+    }
+
+    public function down(Schema $schema) : void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_closingmotive_id_seq '
+            . 'RENAME TO chill_person_closingmotive_id_seq');
+    }
+}

src/Bundle/ChillPersonBundle/migrations/Version20210419105940.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * set label for origin as json
+ */
+final class Version20210419105940 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return 'set label for origin as json';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
+            . 'ALTER label TYPE JSON USING json_build_object(\'fr\', label)::jsonb');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
+            . 'ALTER label DROP DEFAULT');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        // this will keep the '"' at first and last character, but is acceptable
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
+            . 'ALTER label TYPE VARCHAR(255) USING label->\'fr\'::text');
+        $this->addSql('ALTER TABLE chill_person_accompanying_period_origin '
+            . 'ALTER label DROP DEFAULT');
+    }
+}

src/Bundle/ChillPersonBundle/migrations/Version20210419112619.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * fix deprecated json array
+ */
+final class Version20210419112619 extends AbstractMigration
+{
+    public function getDescription() : string
+    {
+        return 'fix deprecated json_array';
+    }
+
+    public function up(Schema $schema) : void
+    {
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_closingmotive.name IS NULL');
+    }
+
+    public function down(Schema $schema) : void
+    {
+        $this->addSql('COMMENT ON COLUMN chill_person_accompanying_period_closingmotive.name IS \'(DC2Type:json_array)\'');
+    }
+}

src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php

@@ -89,7 +89,7 @@ class LoadReports extends AbstractFixture implements OrderedFixtureInterface, Co
     {
         $charline = $this->container->get('doctrine.orm.entity_manager')
                 ->getRepository('ChillPersonBundle:Person')
-                ->findOneBy(array('lastName' => 'Charline'))
+                ->findOneBy(array('firstName' => 'Charline', 'lastName' => 'Depardieu'))
                 ;
         
         $report = (new Report())