Merge branch '111_exports_suite' into testing

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,30 @@ class GeographicalUnit
     private ?int $id = null;
 
     /**
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
      */
-    private $layerName;
+    private string $unitName;
 
     /**
-     * @ORM\Column(type="string", length=255, nullable=true)
+     * @ORM\Column(type="text", nullable=false, options={"default": ""})
      */
-    private $unitName;
+    private string $unitRefId;
+
+    /**
+     * @ORM\ManyToOne(targetEntity=GeographicalUnitLayer::class, inversedBy="units")
+     */
+    private ?GeographicalUnitLayer $layer;
 
     public function getId(): ?int
     {
         return $this->id;
     }
 
-    public function getLayerName(): ?string
+    protected function setId(int $id): self
     {
-        return $this->layerName;
+        $this->id = $id;
+
+        return $this;
     }
 
     public function getUnitName(): ?string
@@ -56,10 +65,31 @@ class GeographicalUnit
         return $this->unitName;
     }
 
-    public function setLayerName(?string $layerName): self
+    /**
+     * @return GeographicalUnitLayer|null
+     */
+    public function getLayer(): ?GeographicalUnitLayer
     {
-        $this->layerName = $layerName;
+        return $this->layer;
+    }
 
+    /**
+     * @param string $unitRefId
+     * @return GeographicalUnit
+     */
+    public function setUnitRefId(string $unitRefId): GeographicalUnit
+    {
+        $this->unitRefId = $unitRefId;
+        return $this;
+    }
+
+    /**
+     * @param GeographicalUnitLayer|null $layer
+     * @return GeographicalUnit
+     */
+    public function setLayer(?GeographicalUnitLayer $layer): GeographicalUnit
+    {
+        $this->layer = $layer;
         return $this;
     }
 

src/Bundle/ChillMainBundle/Entity/GeographicalUnitLayer.php

@@ -0,0 +1,85 @@
+<?php
+
+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();
+    }
+
+    /**
+     * @return int|null
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return array
+     */
+    public function getName(): array
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param array $name
+     * @return GeographicalUnitLayer
+     */
+    public function setName(array $name): GeographicalUnitLayer
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getRefId(): string
+    {
+        return $this->refId;
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getUnits(): Collection
+    {
+        return $this->units;
+    }
+}