Merge remote-tracking branch 'origin/master' into issue589_private_comments

src/Bundle/ChillMainBundle/Entity/AddressReference.php

@@ -12,13 +12,14 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Entity;
 
 use Chill\MainBundle\Doctrine\Model\Point;
+use DateTimeImmutable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity
  * @ORM\Table(name="chill_main_address_reference", indexes={
- *     @ORM\Index(name="address_refid", columns={"refId"}, options={"where": "refid != ''"})
+ *     @ORM\Index(name="address_refid", columns={"refId"})
  * })
  * @ORM\HasLifecycleCallbacks
  */
@@ -33,6 +34,18 @@ class AddressReference
      */
     private string $addressCanonical = '';
 
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     * @groups({"read"})
+     */
+    private ?DateTimeImmutable $createdAt = null;
+
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     * @groups({"read"})
+     */
+    private ?DateTimeImmutable $deletedAt = null;
+
     /**
      * @ORM\Id
      * @ORM\GeneratedValue
@@ -89,6 +102,22 @@ class AddressReference
      */
     private $streetNumber;
 
+    /**
+     * @ORM\Column(type="datetime_immutable", nullable=true)
+     * @groups({"read"})
+     */
+    private ?DateTimeImmutable $updatedAt = null;
+
+    public function getCreatedAt(): ?DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getDeletedAt(): ?DateTimeImmutable
+    {
+        return $this->deletedAt;
+    }
+
     public function getId(): ?int
     {
         return $this->id;
@@ -134,6 +163,25 @@ class AddressReference
         return $this->streetNumber;
     }
 
+    public function getUpdatedAt(): ?DateTimeImmutable
+    {
+        return $this->updatedAt;
+    }
+
+    public function setCreatedAt(?DateTimeImmutable $createdAt): self
+    {
+        $this->createdAt = $createdAt;
+
+        return $this;
+    }
+
+    public function setDeletedAt(?DateTimeImmutable $deletedAt): self
+    {
+        $this->deletedAt = $deletedAt;
+
+        return $this;
+    }
+
     public function setMunicipalityCode(?string $municipalityCode): self
     {
         $this->municipalityCode = $municipalityCode;
@@ -189,4 +237,11 @@ class AddressReference
 
         return $this;
     }
+
+    public function setUpdatedAt(?DateTimeImmutable $updatedAt): self
+    {
+        $this->updatedAt = $updatedAt;
+
+        return $this;
+    }
 }

src/Bundle/ChillMainBundle/Entity/PostalCode.php

@@ -21,10 +21,11 @@ use Symfony\Component\Serializer\Annotation\Groups;
  * @ORM\Entity
  * @ORM\Table(
  *     name="chill_main_postal_code",
- *     indexes={@ORM\Index(
- *         name="search_name_code",
- *         columns={"code", "label"}
- *     )})
+ *     indexes={
+ *         @ORM\Index(name="search_name_code", columns={"code", "label"}),
+ *         @ORM\Index(name="search_by_reference_code", columns={"code", "refpostalcodeid"})
+ *     })
+ *
  *     @ORM\HasLifecycleCallbacks
  */
 class PostalCode

src/Bundle/ChillMainBundle/Entity/User.php

@@ -45,7 +45,7 @@ class User implements AdvancedUserInterface
      *
      * @ORM\Column(type="json", nullable=true)
      */
-    private array $attributes;
+    private array $attributes = [];
 
     /**
      * @ORM\ManyToOne(targetEntity=Location::class)