#204 Fix problems with some person related tests due to not nullable …

…Document fields.
OPUS4 · Mar 23, 2022 · 68f0d91 · 68f0d91
1 parent 1da135a
commit 68f0d91
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 5 deletions.
diff --git a/library/Opus/Db2/PersonRepository.php b/library/Opus/Db2/PersonRepository.php
@@ -178,7 +178,7 @@ public function getAllPersonsCount($role = null, $filter = null)
      */
     public function getDocumentsByRole($person, $role)
     {
-        if ($person->getId() === 0) {
+        if ($person->isNewRecord()) {
             return [];
         }
 
@@ -214,7 +214,7 @@ public function getDocumentsByRole($person, $role)
      */
     public function getDocumentIds($person, $role = null)
     {
-        if ($person->getId() === 0) {
+        if ($person->isNewRecord()) {
             // TODO do more?
             return [];
         }

diff --git a/library/Opus/Model2/AbstractModel.php b/library/Opus/Model2/AbstractModel.php
@@ -164,6 +164,16 @@ public function store()
         return $modelId;
     }
 
+    /**
+     * Returns whether model is a new record.
+     *
+     * @return bool
+     */
+    public function isNewRecord()
+    {
+        return $this->getId() === 0 || $this->getId() === null;
+    }
+
     /**
      * Remove the model instance from the database.
      *

diff --git a/library/Opus/Model2/Document.php b/library/Opus/Model2/Document.php
@@ -48,8 +48,9 @@
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 
-use http\Exception\InvalidArgumentException;
+use InvalidArgumentException;
 use Opus\Date;
+use Opus\Model\DbException;
 use Opus\Model\ModelException;
 
 /**
@@ -58,6 +59,20 @@
  */
 class Document extends AbstractModel
 {
+    const STATE_DELETED = 'deleted';
+
+    const STATE_INPROGRESS = 'inprogress';
+
+    const STATE_RESTRICTED = 'restricted';
+
+    const STATE_UNPUBLISHED = 'unpublished';
+
+    const STATE_PUBLISHED = 'published';
+
+    const STATE_TEMPORARY = 'temporary';
+
+    const STATE_AUDITED = 'audited';
+
     /**
      * @ORM\Id
      * @ORM\Column(type="integer")
@@ -186,7 +201,7 @@ class Document extends AbstractModel
      * @ORM\Column(type="string", name="publication_state", columnDefinition="ENUM('draft','accepted','submitted','published','updated')")
      * @var string
      */
-    protected $publicationState;
+    protected $publicationState = 'draft';
 
     /**
      * @ORM\Column(type="opusDate", name="server_date_created")
@@ -216,7 +231,7 @@ class Document extends AbstractModel
      * @ORM\Column(type="string", name="server_state", columnDefinition="ENUM('audited','published','restricted','inprogress','unpublished','deleted','temporary')")
      * @var string
      */
-    private $serverState;
+    private $serverState = self::STATE_TEMPORARY;
 
     /**
      * @ORM\Column(type="string")
@@ -253,6 +268,29 @@ public function __construct() {
         $this->documentPersons = new ArrayCollection();
     }
 
+    /**
+     * Perform any actions needed to provide storing.
+     *
+     * @return mixed|null Anything else than null will cancel the storage process.
+     */
+    protected function preStore()
+    {
+        $result = parent::preStore();
+
+        $date = new Date();
+        $date->setNow();
+
+        if ($this->isNewRecord()) {
+            if ($this->getServerDateCreated() === null) {
+                $this->setServerDateCreated($date);
+            }
+        }
+        $this->setServerDateModified($date);
+
+        return $result;
+    }
+
+
     /**
      * @return int
      */