Merge branch 'APOLLO-3179' of https://github.com/ministryofjustice/op…

…g-core-public-domain-model into APOLLO-3179
ministryofjustice · Jul 24, 2014 · 3d15b16 · 3d15b16
2 parents 40f4017 + 44373c3
commit 3d15b16
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 68 deletions.
diff --git a/src/Opg/Core/Model/Entity/Assignable/AssignableComposite.php b/src/Opg/Core/Model/Entity/Assignable/AssignableComposite.php
@@ -12,6 +12,7 @@
 use Opg\Core\Model\Entity\PowerOfAttorney\PowerOfAttorney as PowerOfAttorneyEntity;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\Exclude;
+use JMS\Serializer\Annotation\Type;
 use JMS\Serializer\Annotation\ReadOnly;
 use JMS\Serializer\Annotation\Accessor;
 
@@ -26,6 +27,7 @@
  * @ORM\DiscriminatorMap({
  *     "assignee_user" = "Opg\Core\Model\Entity\User\User",
  *     "assignee_team" = "Opg\Core\Model\Entity\Assignable\Team",
+ *     "assignee_null" = "Opg\Core\Model\Entity\Assignable\NullEntity"
  * })
  *
  * Class Composite

diff --git a/src/Opg/Core/Model/Entity/Assignable/NullEntity.php b/src/Opg/Core/Model/Entity/Assignable/NullEntity.php
@@ -9,18 +9,26 @@
 use Opg\Common\Model\Entity\Traits\ToArray;
 use Zend\InputFilter\InputFilterAwareInterface;
 use Zend\InputFilter\InputFilterInterface;
+use Doctrine\ORM\Mapping as ORM;
 
 /**
+ * @ORM\Entity
+ *
  * Class NullEntity
  * @package Opg\Core\Model\Entity\Assignable
  */
 class NullEntity extends AssignableComposite implements EntityInterface, IsAssignee
 {
 
-    const NULL_USER_ID = -1;
+    const NULL_USER_ID = null;
 
     const NULL_USER_NAME = 'Unassigned';
 
+    public function __construct()
+    {
+        $this->name = self::NULL_USER_NAME;
+        $this->id = self::NULL_USER_ID;
+    }
     /**
      * @param int $id
      * @return $this

diff --git a/src/Opg/Core/Model/Entity/CaseItem/CaseItem.php b/src/Opg/Core/Model/Entity/CaseItem/CaseItem.php
@@ -144,6 +144,7 @@ abstract class CaseItem implements EntityInterface, \IteratorAggregate, CaseItem
     protected $status;
 
     /**
+     * @ORM\ManyToOne(cascade={"persist"}, targetEntity = "Opg\Core\Model\Entity\Assignable\AssignableComposite", fetch = "EAGER")
      * @Serializer\MaxDepth(1)
      * @var AssignableComposite
      * @Type("Opg\Core\Model\Entity\Assignable\AssignableComposite")

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Document/Document.php b/src/Opg/Core/Model/Entity/CaseItem/Document/Document.php
@@ -307,11 +307,7 @@ public function getCreatedDate()
      */
     public function getCreatedDateString()
     {
-        if (null !== $this->createdDate) {
-            return $this->createdDate->format(OPGDateFormat::getDateTimeFormat());
-        }
-
-        return '';
+        return $this->createdDate->format(OPGDateFormat::getDateTimeFormat());
     }
 
     /**

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Lpa.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Lpa.php
@@ -184,10 +184,7 @@ public function setLpaDonorSignatureDateString($signatureDate)
     {
         if (!empty($signatureDate)) {
             $signatureDate = OPGDateFormat::createDateTime($signatureDate);
-
-            if ($signatureDate) {
-                $this->setLpaDonorSignatureDate($signatureDate);
-            }
+            $this->setLpaDonorSignatureDate($signatureDate);
         }
 
         return $this;
@@ -257,10 +254,7 @@ public function setDonorDeclarationSignatureDateString($signatureDate)
     {
         if (!empty($signatureDate)) {
             $signatureDate = OPGDateFormat::createDateTime($signatureDate);
-
-            if ($signatureDate) {
-                $this->setDonorDeclarationSignatureDate($signatureDate);
-            }
+            $this->setDonorDeclarationSignatureDate($signatureDate);
         }
 
         return $this;
@@ -418,11 +412,7 @@ public function setLpaCreatedDateString($lpaCreatedDate)
     {
         if (!empty($lpaCreatedDate)) {
             $lpaCreatedDate = OPGDateFormat::createDateTime($lpaCreatedDate);
-
-            if ($lpaCreatedDate) {
-                return $this->setLpaCreatedDate($lpaCreatedDate);
-            }
-
+            return $this->setLpaCreatedDate($lpaCreatedDate);
         }
 
         return $this->setLpaCreatedDate(new \DateTime());
@@ -472,10 +462,7 @@ public function setLpaReceiptDateString($lpaReceiptDate)
     {
         if (!empty($lpaReceiptDate)) {
             $lpaReceiptDate = OPGDateFormat::createDateTime($lpaReceiptDate);
-
-            if ($lpaReceiptDate) {
-                return $this->setLpaReceiptDate($lpaReceiptDate);
-            }
+            return $this->setLpaReceiptDate($lpaReceiptDate);
         }
 
         return $this->setLpaReceiptDate(new \DateTime($lpaReceiptDate));
@@ -556,10 +543,7 @@ public function setLifeSustainingTreatmentSignatureDateString($lifeSustainingTre
             $lifeSustainingTreatmentSignatureDate = OPGDateFormat::createDateTime(
                 $lifeSustainingTreatmentSignatureDate
             );
-
-            if ($lifeSustainingTreatmentSignatureDate) {
-                $this->setLifeSustainingTreatmentSignatureDate($lifeSustainingTreatmentSignatureDate);
-            }
+            return $this->setLifeSustainingTreatmentSignatureDate($lifeSustainingTreatmentSignatureDate);
         }
 
         return $this;

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Attorney.php b/src/Opg/Core/Model/Entity/CaseItem/Lpa/Party/Attorney.php
@@ -134,9 +134,7 @@ public function setLpa002SignatureDateString($lpa002SignatureDate)
     {
         if (!empty($lpa002SignatureDate)) {
             $result = OPGDateFormat::createDateTime($lpa002SignatureDate);
-            if ($result) {
-                return $this->setLpa002SignatureDate($result);
-            }
+            return $this->setLpa002SignatureDate($result);
         }
 
         return $this;
@@ -183,9 +181,7 @@ public function setLpaPartCSignatureDateString($lpaPartCSignatureDate)
     {
         if (!empty($lpaPartCSignatureDate)) {
             $result = OPGDateFormat::createDateTime($lpaPartCSignatureDate);
-            if ($result) {
-                return $this->setLpaPartCSignatureDate($result);
-            }
+            return $this->setLpaPartCSignatureDate($result);
         }
 
         return $this;

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Task/Task.php b/src/Opg/Core/Model/Entity/CaseItem/Task/Task.php
@@ -62,6 +62,11 @@ class Task implements EntityInterface, \IteratorAggregate, HasRagRating, IsAssig
     protected $systemType;
 
     /**
+     * @ORM\ManyToOne(
+     *      cascade={"persist"},
+     *      targetEntity = "Opg\Core\Model\Entity\Assignable\AssignableComposite",
+     *      fetch = "EAGER"
+     * )
      * @Serializer\MaxDepth(2)
      * @Type("Opg\Core\Model\Entity\Assignable\AssignableComposite")
      * @var User
@@ -245,10 +250,7 @@ public function setActiveDateString($activeDate)
     {
         if (!empty($activeDate)) {
             $activeDate = OPGDateFormat::createDateTime($activeDate . ' 00:00:00');
-
-            if ($activeDate) {
-                return $this->setActiveDate($activeDate);
-            }
+            return $this->setActiveDate($activeDate);
         }
 
         return $this->setActiveDate();
@@ -626,10 +628,7 @@ public function setCompletedDateString($completedDate)
     {
         if (!empty($completedDate)) {
             $completedDate = OPGDateFormat::createDateTime($completedDate);
-
-            if ($completedDate) {
-                return $this->setCompletedDate($completedDate);
-            }
+            return $this->setCompletedDate($completedDate);
         }
         return $this->setCompletedDate(new \DateTime());
     }

diff --git a/src/Opg/Core/Model/Entity/Correspondence/Correspondence.php b/src/Opg/Core/Model/Entity/Correspondence/Correspondence.php
@@ -309,11 +309,7 @@ public function setCreatedDateString($createdDate)
     {
         if (!empty($createdDate)) {
             $createdDate = OPGDateFormat::createDateTime($createdDate);
-
-            if ($createdDate) {
-                return $this->setCreatedDate($createdDate);
-            }
-
+            return $this->setCreatedDate($createdDate);
         }
 
         return $this->setCreatedDate(new \DateTime());
@@ -332,11 +328,7 @@ public function getCreatedDate()
      */
     public function getCreatedDateString()
     {
-        if (!empty($this->createdDate)) {
-            return $this->createdDate->format(OPGDateFormat::getDateTimeFormat());
-        }
-
-        return '';
+        return $this->createdDate->format(OPGDateFormat::getDateTimeFormat());
     }
 
 }
diff --git a/src/Opg/Core/Model/Entity/Event.php b/src/Opg/Core/Model/Entity/Event.php
@@ -109,7 +109,6 @@ public function getOwningEntityClass()
 
     /**
      * @param \DateTime $createdOn
-     *
      * @return Event
      */
     public function setCreatedOn(\DateTime $createdOn = null)
@@ -128,9 +127,7 @@ public function setCreatedOnString($createdOn)
     {
         if (!empty($createdOn)) {
             $result = OPGDateFormat::createDateTime($createdOn);
-            if ($result) {
-                return $this->setCreatedOn($result);
-            }
+            return $this->setCreatedOn($result);
         }
 
         return $this;

diff --git a/src/Opg/Core/Model/Entity/Person/Person.php b/src/Opg/Core/Model/Entity/Person/Person.php
@@ -410,9 +410,7 @@ public function setDobString($dob)
     {
         if (!empty($dob)) {
             $result = OPGDateFormat::createDateTime($dob);
-            if ($result) {
-                return $this->setDob($result);
-            }
+            return $this->setDob($result);
         }
 
         return $this;
@@ -458,13 +456,8 @@ public function setDateOfDeath(\DateTime $dateOfDeath = null)
     public function setDateOfDeathString($dateOfDeath)
     {
         if (!empty($dateOfDeath)) {
-
             $result = OPGDateFormat::createDateTime($dateOfDeath);
-
-            if ($result) {
-                return $this->setDateOfDeath($result);
-            }
-
+            return $this->setDateOfDeath($result);
         }
 
         return $this;

diff --git a/tests/OpgTest/Core/Model/Entity/CaseItem/BusinessRuleTest.php b/tests/OpgTest/Core/Model/Entity/CaseItem/BusinessRuleTest.php
@@ -3,6 +3,7 @@
 
 use Opg\Core\Model\Entity\CaseItem\BusinessRule;
 use Opg\Core\Model\Entity\CaseItem\Lpa\Lpa;
+use Zend\InputFilter\InputFilter;
 
 
 /**
@@ -68,4 +69,11 @@ public function testSetGetDatetime()
 
         $this->assertEquals($now, $businessRuleMock->getCreatedOn());
     }
+
+    public function testGetInputFilter()
+    {
+        $businessRuleMock = $this->getMockedClass();
+
+        $this->assertTrue($businessRuleMock->getInputFilter() instanceof InputFilter);
+    }
 }
diff --git a/tests/OpgTest/Core/Model/Entity/CaseItem/CaseItemTest.php b/tests/OpgTest/Core/Model/Entity/CaseItem/CaseItemTest.php
@@ -2,17 +2,41 @@
 namespace OpgTest\Core\Model\Entity\CaseItem;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Opg\Core\Model\Entity\CaseItem\CaseItem;
 use Opg\Core\Model\Entity\CaseItem\Document\Document;
 use Opg\Core\Model\Entity\CaseItem\Lpa\Lpa;
 use Opg\Core\Model\Entity\CaseItem\Note\Note;
 use Opg\Core\Model\Entity\CaseItem\Task\Task;
+use Opg\Core\Model\Entity\Person\Person;
 use Opg\Core\Model\Entity\User\User;
 use Opg\Common\Model\Entity\DateFormat as OPGDateFormat;
 use Opg\Core\Model\Entity\CaseItem\BusinessRule;
 
 /**
  * ToArray test case.
  */
+
+class CaseItemStub extends CaseItem
+{
+
+    public function __unset($key)
+    {
+        if ($key === 'tasks') {
+            $this->tasks = null;
+        }
+    }
+
+    /**
+     * @param  Person $person
+     *
+     * @return CaseItem
+     */
+    public function addPerson(Person $person)
+    {
+        // TODO: Implement addPerson() method.
+    }
+}
+
 class CaseItemTest extends \PHPUnit_Framework_TestCase
 {
 
@@ -97,8 +121,9 @@ public function testSetGetAssignee()
 
         $user = new User();
         $user->setFirstname($name)->setSurname($secondName);
-
+        $this->assertFalse($caseItemMock->isAssigned());
         $caseItemMock->assign($user);
+        $this->assertTrue($caseItemMock->isAssigned());
 
         $this->assertEquals($name, $caseItemMock->getAssignee()->getFirstName());
     }
@@ -134,8 +159,10 @@ public function testSetGetNotes()
 
     public function testSetGetTasks()
     {
-        $caseItemMock = $this->getMockedClass();
+        $caseItemMock = new CaseItemStub();
 
+        unset($caseItemMock->{'tasks'});
+
         for ($i = 0; $i < 10; $i++) {
             $task = new Task();
             $task->setId($i);

diff --git a/tests/OpgTest/Core/Model/Entity/CaseItem/Lpa/LpaTest.php b/tests/OpgTest/Core/Model/Entity/CaseItem/Lpa/LpaTest.php
@@ -825,6 +825,10 @@ public function testGetSetTrustCorporationSignedAs()
         $this->lpa->setTrustCorporationSignedAs($expected);
 
         $this->assertEquals($expected, $this->lpa->getTrustCorporationSignedAs());
+
+        $this->lpa->setTrustCorporationSignedAs('We');
+
+        $this->assertNotEquals($expected, $this->lpa->getTrustCorporationSignedAs());
     }
 
     public function testGetRagRatingRed()

diff --git a/tests/OpgTest/Core/Model/Entity/CaseItem/Task/TaskTest.php b/tests/OpgTest/Core/Model/Entity/CaseItem/Task/TaskTest.php
@@ -312,12 +312,14 @@ public function testSetGetAssignedUser()
         $user = new User();
         $user->setSurname($name);
 
-        $this->task->setAssignedUser($user);
+        $this->assertFalse($this->task->isAssigned());
+        $this->task->assign($user);
 
         $this->assertEquals(
             $name,
-            $this->task->getAssignedUser()->getSurname()
+            $this->task->getAssignee()->getSurname()
         );
+        $this->assertTrue($this->task->isAssigned());
     }
 
     public function testUnnasignUser()

diff --git a/tests/OpgTest/Core/Model/Entity/User/UserTest.php b/tests/OpgTest/Core/Model/Entity/User/UserTest.php
@@ -336,4 +336,16 @@ public function testDefaultRoleRequirementsPassCOP() {
         $this->user->addRole('COP User');
         $this->assertTrue($this->user->isValid(array('roles')));
     }
+
+    public function testGetDisplayName()
+    {
+        $firstName = 'Test';
+        $surname = 'User';
+
+        $expected = sprintf('%s %s', $firstName, $surname);
+
+        $this->user->setFirstname($firstName)->setSurname($surname);
+
+        $this->assertEquals($expected, $this->user->getDisplayName());
+    }
 }