From d5d2a183a90ccbd32ddcda70e43c97bf080761d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Jakes=CC=8C?= <jan@jakes.pro>
Date: Tue, 22 Oct 2019 10:23:57 +0200
Subject: [PATCH] Add entity validation constraints based on old models

[MAILPOET-2437]
---
 lib/Entities/NewsletterEntity.php            | 2 ++
 lib/Entities/NewsletterOptionFieldEntity.php | 3 +++
 lib/Entities/SegmentEntity.php               | 2 ++
 lib/Entities/SendingQueueEntity.php          | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/lib/Entities/NewsletterEntity.php b/lib/Entities/NewsletterEntity.php
index 0f2c4ab722..c346a32269 100644
--- a/lib/Entities/NewsletterEntity.php
+++ b/lib/Entities/NewsletterEntity.php
@@ -11,6 +11,7 @@ use MailPoetVendor\Doctrine\Common\Collections\ArrayCollection;
 use MailPoetVendor\Doctrine\Common\Collections\Criteria;
 use MailPoetVendor\Doctrine\ORM\EntityNotFoundException;
 use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
+use MailPoetVendor\Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity()
@@ -53,6 +54,7 @@ class NewsletterEntity {
 
   /**
    * @ORM\Column(type="string")
+   * @Assert\NotBlank()
    * @var string
    */
   private $type;
diff --git a/lib/Entities/NewsletterOptionFieldEntity.php b/lib/Entities/NewsletterOptionFieldEntity.php
index 9f9a544292..7f11401add 100644
--- a/lib/Entities/NewsletterOptionFieldEntity.php
+++ b/lib/Entities/NewsletterOptionFieldEntity.php
@@ -6,6 +6,7 @@ use MailPoet\Doctrine\EntityTraits\AutoincrementedIdTrait;
 use MailPoet\Doctrine\EntityTraits\CreatedAtTrait;
 use MailPoet\Doctrine\EntityTraits\UpdatedAtTrait;
 use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
+use MailPoetVendor\Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity()
@@ -18,12 +19,14 @@ class NewsletterOptionFieldEntity {
 
   /**
    * @ORM\Column(type="string")
+   * @Assert\NotBlank()
    * @var string
    */
   private $name;
 
   /**
    * @ORM\Column(type="string")
+   * @Assert\NotBlank()
    * @var string
    */
   private $newsletter_type;
diff --git a/lib/Entities/SegmentEntity.php b/lib/Entities/SegmentEntity.php
index d06894d000..db16094c20 100644
--- a/lib/Entities/SegmentEntity.php
+++ b/lib/Entities/SegmentEntity.php
@@ -7,6 +7,7 @@ use MailPoet\Doctrine\EntityTraits\CreatedAtTrait;
 use MailPoet\Doctrine\EntityTraits\DeletedAtTrait;
 use MailPoet\Doctrine\EntityTraits\UpdatedAtTrait;
 use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
+use MailPoetVendor\Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity()
@@ -24,6 +25,7 @@ class SegmentEntity {
 
   /**
    * @ORM\Column(type="string")
+   * @Assert\NotBlank()
    * @var string
    */
   private $name;
diff --git a/lib/Entities/SendingQueueEntity.php b/lib/Entities/SendingQueueEntity.php
index d4ad649f1b..05a65a1cba 100644
--- a/lib/Entities/SendingQueueEntity.php
+++ b/lib/Entities/SendingQueueEntity.php
@@ -7,6 +7,7 @@ use MailPoet\Doctrine\EntityTraits\CreatedAtTrait;
 use MailPoet\Doctrine\EntityTraits\DeletedAtTrait;
 use MailPoet\Doctrine\EntityTraits\UpdatedAtTrait;
 use MailPoetVendor\Doctrine\ORM\Mapping as ORM;
+use MailPoetVendor\Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * @ORM\Entity()
@@ -27,6 +28,7 @@ class SendingQueueEntity {
 
   /**
    * @ORM\Column(type="json_or_serialized")
+   * @Assert\NotBlank()
    * @var array|null
    */
   private $newsletter_rendered_body;