Merge branch 'release/1.1.31.9'

ministryofjustice · Dec 11, 2014 · 5336aa5 · 5336aa5
2 parents c66cd4c + 0b9631f
commit 5336aa5
Show file tree

Hide file tree

Showing 16 changed files with 159 additions and 102 deletions.
diff --git a/src/Opg/Common/Model/Entity/HasNotesInterface.php b/src/Opg/Common/Model/Entity/HasNotesInterface.php
@@ -12,28 +12,37 @@ interface HasNotesInterface
 {
 
     /**
-     * @return ArrayCollection|null
+     * @return ArrayCollection
      */
     public function getNotes();
 
     /**
      * @param  ArrayCollection $notes
-     *
-     * @return ArrayCollection|null
+     * @return HasNotesInterface
      */
     public function setNotes(ArrayCollection $notes);
 
     /**
      * @param NoteEntity $note
-     *
-     * @return $this
+     * @return HasNotesInterface
      */
     public function addNote(NoteEntity $note);
 
     /**
      * @param ArrayCollection $notes
-     *
-     * @return $this
+     * @return HasNotesInterface
      */
     public function addNotes(ArrayCollection $notes);
+
+    /**
+     * @param NoteEntity $note
+     * @return boolean
+     */
+    public function hasNote(NoteEntity $note);
+
+    /**
+     * @param NoteEntity $note
+     * @return HasNotesInterface
+     */
+    public function removeNote(NoteEntity $note);
 }
diff --git a/src/Opg/Common/Model/Entity/Traits/HasNotes.php b/src/Opg/Common/Model/Entity/Traits/HasNotes.php
@@ -2,6 +2,7 @@
 namespace Opg\Common\Model\Entity\Traits;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Opg\Common\Model\Entity\HasNotesInterface;
 use Opg\Core\Model\Entity\Note\Note as NoteEntity;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -28,41 +29,49 @@ trait HasNotes
      * @Groups({"api-person-get"})
      */
     protected $notes;
-
+
+    protected function initNotes()
+    {
+        if (null === $this->notes) {
+            $this->notes = new ArrayCollection();
+        }
+    }
     /**
-     * @return ArrayCollection|null
+     * @return ArrayCollection
      */
     public function getNotes()
     {
+        $this->initNotes();
+
         return $this->notes;
     }
 
     /**
      * @param  ArrayCollection $notes
      *
-     * @return ArrayCollection|null
+     * @return HasNotesInterface
      */
     public function setNotes(ArrayCollection $notes)
     {
-        $this->notes = $notes;
+        $this->notes = new ArrayCollection();
+
+        foreach($notes as $note) {
+            $this->addNote($note);
+        }
 
         return $this;
     }
 
     /**
      * @param NoteEntity $note
      *
-     * @return $this
+     * @return HasNotesInterface
      */
     public function addNote(NoteEntity $note)
     {
-        // @codeCoverageIgnoreStart
-        if (is_null($this->notes)) {
-            $this->notes = new ArrayCollection();
-        }
-        // @codeCoverageIgnoreEnd
+        $this->initNotes();
 
-        if (!$this->notes->contains($note)) {
+        if (false === $this->notes->contains($note)) {
             $this->notes->add($note);
         }
 
@@ -72,7 +81,7 @@ public function addNote(NoteEntity $note)
     /**
      * @param ArrayCollection $notes
      *
-     * @return $this
+     * @return HasNotesInterface
      */
     public function addNotes(ArrayCollection $notes)
     {
@@ -82,4 +91,28 @@ public function addNotes(ArrayCollection $notes)
 
         return $this;
     }
+
+    /**
+     * @param NoteEntity $note
+     * @return bool
+     */
+    public function hasNote(NoteEntity $note)
+    {
+        $this->initNotes();
+
+        return $this->notes->contains($note);
+    }
+
+    /**
+     * @param NoteEntity $note
+     * @return HasNotesInterface
+     */
+    public function removeNote(NoteEntity $note)
+    {
+        if ($this->hasNote($note)) {
+            $this->notes->removeElement($note);
+        }
+
+        return $this;
+    }
 }
diff --git a/src/Opg/Core/Model/Entity/CaseItem/CaseItem.php b/src/Opg/Core/Model/Entity/CaseItem/CaseItem.php
@@ -47,7 +47,7 @@
  * "dep" = "Opg\Core\Model\Entity\CaseItem\Deputyship\Deputyship",
  * "order" = "Opg\Core\Model\Entity\CaseItem\Deputyship\Order",
  * })
- * @ORM\entity(repositoryClass="Application\Model\Repository\CaseRepository")
+ * @ORM\entity(repositoryClass="Application\Model\Repository\CaseItemRepository")
  */
 abstract class CaseItem extends LegalEntity implements CaseItemInterface, HasRagRating, IsAssignable
 {

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Deputyship/Deputyship.php b/src/Opg/Core/Model/Entity/CaseItem/Deputyship/Deputyship.php
@@ -1,14 +1,10 @@
 <?php
 namespace Opg\Core\Model\Entity\CaseItem\Deputyship;
 
-use Doctrine\Common\Collections\ArrayCollection;
 use Opg\Common\Model\Entity\HasStatusDate;
 use Opg\Common\Model\Entity\Traits\StatusDate;
-use Opg\Common\Model\Entity\Traits\ToArray;
-use Opg\Common\Model\Entity\Traits\InputFilter;
 use Opg\Core\Model\Entity\CaseActor\Client;
 use Opg\Core\Model\Entity\CaseActor\Decorators\CaseRecNumber;
-use Opg\Core\Model\Entity\CaseActor\Donor;
 use Opg\Core\Model\Entity\CaseActor\Interfaces\HasCaseRecNumber;
 use Opg\Core\Model\Entity\CaseItem\CaseItem;
 use Doctrine\ORM\Mapping as ORM;
@@ -215,12 +211,7 @@ public function hasSecurityBond()
      */
     public function setClient(Client $client)
     {
-        if (null === $this->client) {
-            $this->client = $client;
-        }
-        else {
-            throw new \LogicException('This case already has an attached client');
-        }
+        $this->client = $client;
 
         return $this;
     }

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Deputyship/Order.php b/src/Opg/Core/Model/Entity/CaseItem/Deputyship/Order.php
@@ -13,12 +13,20 @@
 use Opg\Core\Model\Entity\CaseItem\Validation\InputFilter\OrderFilter;
 use JMS\Serializer\Annotation\Groups;
 use JMS\Serializer\Annotation\ReadOnly;
+use Opg\Core\Model\Entity\CaseItem\Validation\Validator\CaseType as CaseTypeValidator;
 
 /**
  * @ORM\Entity
  */
 class Order extends Deputyship implements HasCourtFundsInterface
 {
+    /**
+    * @ORM\Column(type = "string", nullable = true)
+    * @var string
+    * @Groups("api-task-list")
+    */
+    protected $caseType = CaseTypeValidator::CASE_TYPE_ORDER;
+
     use HasCourtFunds;
 
     /**

diff --git a/src/Opg/Core/Model/Entity/CaseItem/PowerOfAttorney/PowerOfAttorney.php b/src/Opg/Core/Model/Entity/CaseItem/PowerOfAttorney/PowerOfAttorney.php
@@ -28,7 +28,7 @@
  * Class PowerOfAttorney
  * @package Opg\Core\Model\Entity\CaseItem\PowerOfAttorney
  *
- * @ORM\Entity(repositoryClass="Application\Model\Repository\PowerOfAttorneyRepository")
+ * @ORM\Entity(repositoryClass="Application\Model\Repository\CaseItemRepository")
  *
  */
 abstract class PowerOfAttorney extends CaseItem implements HasNoticeGivenDate

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Validation/InputFilter/OrderFilter.php b/src/Opg/Core/Model/Entity/CaseItem/Validation/InputFilter/OrderFilter.php
@@ -10,6 +10,8 @@ class OrderFilter extends BaseInputFilter
 {
     protected function setValidators()
     {
-        $this->addValidator('orderStatus', 'Opg\Core\Model\Entity\CaseItem\Validation\Validator\OrderStatus');
+        $this->addValidator('orderStatus',  'Opg\Core\Model\Entity\CaseItem\Validation\Validator\OrderStatus');
+        $this->addValidator('caseSubtype',  'Opg\Core\Model\Entity\CaseItem\Validation\Validator\CaseSubtype');
+        $this->addValidator('caseType',     'Opg\Core\Model\Entity\CaseItem\Validation\Validator\CaseType');
     }
 }
diff --git a/src/Opg/Core/Model/Entity/CaseItem/Validation/Validator/CaseSubtype.php b/src/Opg/Core/Model/Entity/CaseItem/Validation/Validator/CaseSubtype.php
@@ -1,7 +1,7 @@
 <?php
 namespace Opg\Core\Model\Entity\CaseItem\Validation\Validator;
 
-use Opg\Core\Model\Entity\CaseItem\Lpa\Validator\CaseType as CaseTypeValidator;
+use Opg\Core\Model\Entity\CaseItem\Validation\Validator\CaseType as CaseTypeValidator;
 use Zend\Validator\Callback;
 
 /**
@@ -24,10 +24,10 @@ function ($value, $context) {
                 // SubType validation is automatically successful if this isn't an LPA or EPA...
                 $caseTypesWhichRequireValidation = [
                     CaseTypeValidator::CASE_TYPE_EPA,
-                    CaseTypeValidator::CASE_TYPE_LPA
+                    CaseTypeValidator::CASE_TYPE_LPA,
+                    CaseTypeValidator::CASE_TYPE_ORDER,
                 ];
-
-                $caseType = $context->getCaseType();
+                $caseType = $context['caseType'];
 
                 if (!in_array($caseType, $caseTypesWhichRequireValidation)) {
                     return true;
@@ -49,6 +49,13 @@ function ($value, $context) {
                         ];
                         break;
 
+                    case CaseTypeValidator::CASE_TYPE_ORDER:
+                        $validSubtypes = [
+                            self::CASE_SUB_TYPE_HW,
+                            self::CASE_SUB_TYPE_PFA
+                        ];
+                        break;
+
                     default:
                         // Empty array means all values fail;
                         $validSubtypes = [];

diff --git a/src/Opg/Core/Model/Entity/CaseItem/Validation/Validator/CaseType.php b/src/Opg/Core/Model/Entity/CaseItem/Validation/Validator/CaseType.php
@@ -10,8 +10,9 @@
  */
 class CaseType extends InArray
 {
-    const CASE_TYPE_EPA = 'epa';
-    const CASE_TYPE_LPA = 'lpa';
+    const CASE_TYPE_EPA     = 'EPA';
+    const CASE_TYPE_LPA     = 'LPA';
+    const CASE_TYPE_ORDER   = 'ORDER';
 
     public function __construct()
     {
@@ -21,6 +22,7 @@ public function __construct()
             array(
                 self::CASE_TYPE_EPA,
                 self::CASE_TYPE_LPA,
+                self::CASE_TYPE_ORDER
             )
         );
     }

diff --git a/src/Opg/Core/Model/Entity/Queue.php b/src/Opg/Core/Model/Entity/Queue.php
@@ -6,6 +6,9 @@
 use DateTime;
 use Opg\Common\Model\Entity\HasIdInterface;
 use Opg\Common\Model\Entity\Traits\HasId;
+use JMS\Serializer\Annotation\Type;
+use JMS\Serializer\Annotation\Accessor;
+use JMS\Serializer\Annotation\Groups;
 
 /**
  * Queue

diff --git a/src/Opg/Core/Model/Entity/Warning/Warning.php b/src/Opg/Core/Model/Entity/Warning/Warning.php
@@ -184,9 +184,7 @@ public function getDateAddedString()
             return $this->getDateAdded()->format(DateFormat::getDateFormat());
         }
 
-        // @codeCoverageIgnoreStart
         return '';
-        //@codeCoverageIgnoreEnd
     }
 
     /**