Merge branch '111_exports_suite' into calendar/finalization

src/Bundle/ChillMainBundle/Entity/AddressReference.php

@@ -20,6 +20,9 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * @ORM\Entity
  * @ORM\Table(name="chill_main_address_reference", indexes={
  *     @ORM\Index(name="address_refid", columns={"refId"})
+ * },
+ * uniqueConstraints={
+ *     @ORM\UniqueConstraint(name="chill_main_address_reference_unicity", columns={"refId", "source"})
  * })
  * @ORM\HasLifecycleCallbacks
  */

src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php

@@ -14,15 +14,17 @@ namespace Chill\MainBundle\Entity;
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @ORM\Table(name="chill_main_geographical_unit")
- * @ORM\Entity
+ * @ORM\Table(name="chill_main_geographical_unit", uniqueConstraints={
+ *     @ORM\UniqueConstraint(name="geographical_unit_refid", columns={"layer_id", "unitRefId"})
+ * })
+ * @ORM\Entity(readOnly=true)
  */
 class GeographicalUnit
 {
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    private $geom;
+    private string $geom;
 
     /**
      * @ORM\Id
@@ -32,23 +34,28 @@ class GeographicalUnit
     private ?int $id = null;
 
     /**
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\ManyToOne(targetEntity=GeographicalUnitLayer::class, inversedBy="units")
      */
-    private $layerName;
+    private ?GeographicalUnitLayer $layer;
 
     /**
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
      */
-    private $unitName;
+    private string $unitName;
+
+    /**
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     */
+    private string $unitRefId;
 
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getLayerName(): ?string
+    public function getLayer(): ?GeographicalUnitLayer
     {
-        return $this->layerName;
+        return $this->layer;
     }
 
     public function getUnitName(): ?string
@@ -56,9 +63,9 @@ class GeographicalUnit
         return $this->unitName;
     }
 
-    public function setLayerName(?string $layerName): self
+    public function setLayer(?GeographicalUnitLayer $layer): GeographicalUnit
     {
-        $this->layerName = $layerName;
+        $this->layer = $layer;
 
         return $this;
     }
@@ -69,4 +76,18 @@ class GeographicalUnit
 
         return $this;
     }
+
+    public function setUnitRefId(string $unitRefId): GeographicalUnit
+    {
+        $this->unitRefId = $unitRefId;
+
+        return $this;
+    }
+
+    protected function setId(int $id): self
+    {
+        $this->id = $id;
+
+        return $this;
+    }
 }

src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php

@@ -0,0 +1,79 @@
+<?php
+
+/**
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Chill\MainBundle\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="chill_main_geographical_unit_layer", uniqueConstraints={
+ *     @ORM\UniqueConstraint(name="geographical_unit_layer_refid", columns={"refId"})
+ * })
+ * @ORM\Entity
+ */
+class GeographicalUnitLayer
+{
+    /**
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     * @ORM\Column(type="integer")
+     */
+    private ?int $id = null;
+
+    /**
+     * @ORM\Column(type="json", nullable=false, options={"default": "[]"})
+     */
+    private array $name = [];
+
+    /**
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
+     */
+    private string $refId = '';
+
+    /**
+     * @ORM\OneToMany(targetEntity=GeographicalUnit::class, mappedBy="layer")
+     */
+    private Collection $units;
+
+    public function __construct()
+    {
+        $this->units = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    public function getRefId(): string
+    {
+        return $this->refId;
+    }
+
+    public function getUnits(): Collection
+    {
+        return $this->units;
+    }
+
+    public function setName(array $name): GeographicalUnitLayer
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+}

src/Bundle/ChillMainBundle/Entity/PostalCode.php

@@ -12,6 +12,11 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
+use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
@@ -21,6 +26,10 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * @ORM\Entity
  * @ORM\Table(
  *     name="chill_main_postal_code",
+ *     uniqueConstraints={
+ *         @ORM\UniqueConstraint(name="postal_code_import_unicity", columns={"code", "refpostalcodeid", "postalcodesource"},
+ *         options={"where": "refpostalcodeid is not null"})
+ *     },
  *     indexes={
  *         @ORM\Index(name="search_name_code", columns={"code", "label"}),
  *         @ORM\Index(name="search_by_reference_code", columns={"code", "refpostalcodeid"})
@@ -28,8 +37,12 @@ use Symfony\Component\Serializer\Annotation\Groups;
  *
  *     @ORM\HasLifecycleCallbacks
  */
-class PostalCode
+class PostalCode implements TrackUpdateInterface, TrackCreationInterface
 {
+    use TrackCreationTrait;
+
+    use TrackUpdateTrait;
+
     /**
      * This is an internal column which is populated by database.
      *
@@ -63,6 +76,11 @@ class PostalCode
      */
     private $country;
 
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true, options={"default": null})
+     */
+    private ?DateTimeImmutable $deletedAt = null;
+
     /**
      * @var int
      *