APOLLO-3946 Updated manytomany on person/correspondence

ministryofjustice · Sep 24, 2014 · f0e07cb · f0e07cb
1 parent 5feef26
commit f0e07cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/src/Opg/Common/Model/Entity/HasCorrespondenceInterface.php b/src/Opg/Common/Model/Entity/HasCorrespondenceInterface.php
@@ -2,7 +2,7 @@
 namespace Opg\Common\Model\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Opg\Core\Model\Entity\Correspondence\Correspondence as CorrespondenceEntity;
+use Opg\Core\Model\Entity\Correspondence\BaseCorrespondence as CorrespondenceEntity;
 
 /**
  * Interface HasCorrespondenceInterface

diff --git a/src/Opg/Common/Model/Entity/Traits/HasCorrespondence.php b/src/Opg/Common/Model/Entity/Traits/HasCorrespondence.php
@@ -2,7 +2,7 @@
 namespace Opg\Common\Model\Entity\Traits;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Opg\Core\Model\Entity\Correspondence\Correspondence as CorrespondenceEntity;
+use Opg\Core\Model\Entity\Correspondence\BaseCorrespondence as CorrespondenceEntity;
 
 /**
  * Companion trait to the HasCorrespondenceInterface

diff --git a/src/Opg/Core/Model/Entity/Correspondence/BaseCorrespondence.php b/src/Opg/Core/Model/Entity/Correspondence/BaseCorrespondence.php
@@ -41,14 +41,10 @@ abstract class BaseCorrespondence implements EntityInterface, \IteratorAggregate
     /**
      * @ORM\ManyToMany(
      *      targetEntity="Opg\Core\Model\Entity\Person\Person",
+     *      mappedBy="correspondence",
      *      fetch="EAGER",
      *      cascade={"persist"}
      * )
-     * @ORM\JoinTable(name="person_correspondence",
-     *     joinColumns={@ORM\JoinColumn(name="correspondence_id", referencedColumnName="id")},
-     *     inverseJoinColumns={@ORM\JoinColumn(name="person_id", referencedColumnName="id")}
-     * )
-     * @ORM\OrderBy({"id"="ASC"})
      * @var Person
      */
     protected $correspondent;

diff --git a/src/Opg/Core/Model/Entity/Person/Person.php b/src/Opg/Core/Model/Entity/Person/Person.php
@@ -121,11 +121,12 @@ abstract class Person implements HasUidInterface, HasNotesInterface, EntityInter
     protected $notes;
 
     /**
-     * @ORM\ManyToMany(targetEntity = "Opg\Core\Model\Entity\Correspondence\Correspondence", cascade={"persist"})
-     * @ORM\JoinTable(name="person_correspondence",
-     *     joinColumns={@ORM\JoinColumn(name="person_id", referencedColumnName="id")},
-     *     inverseJoinColumns={@ORM\JoinColumn(name="correspondence_id", referencedColumnName="id")}
+     * @ORM\ManyToMany(
+     *      targetEntity = "Opg\Core\Model\Entity\Correspondence\BaseCorrespondence",
+     *      inversedBy="correspondent",
+     *      cascade={"persist"}
      * )
+     * @ORM\JoinTable(name="person_correspondence")
      * @ORM\OrderBy({"id"="ASC"})
      * @var ArrayCollection
      * @ReadOnly