From: Nicolas LÅ“uillet Date: Mon, 14 Mar 2016 05:15:46 +0000 (+0100) Subject: Merge pull request #1786 from wallabag/v2-restrict-user-infos X-Git-Tag: 2.0.0~25 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=17b3d026fd6262d48a038d90bacea44a9be339e0;hp=5cc9b5151ff754773dd492a2705f18c93c611ff9;p=github%2Fwallabag%2Fwallabag.git Merge pull request #1786 from wallabag/v2-restrict-user-infos API shows just what needed for user --- diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index bd712a04..5e608f05 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -7,6 +7,9 @@ use Doctrine\ORM\Mapping as ORM; use Hateoas\Configuration\Annotation as Hateoas; use JMS\Serializer\Annotation\Groups; use JMS\Serializer\Annotation\XmlRoot; +use JMS\Serializer\Annotation\Exclude; +use JMS\Serializer\Annotation\VirtualProperty; +use JMS\Serializer\Annotation\SerializedName; use Symfony\Component\Validator\Constraints as Assert; use Wallabag\UserBundle\Entity\User; use Wallabag\AnnotationBundle\Entity\Annotation; @@ -161,6 +164,8 @@ class Entry private $isPublic; /** + * @Exclude + * * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="entries") * * @Groups({"export_all"}) @@ -336,6 +341,33 @@ class Entry return $this->user; } + /** + * @VirtualProperty + * @SerializedName("user_name") + */ + public function getUserName() + { + return $this->user->getUserName(); + } + + /** + * @VirtualProperty + * @SerializedName("user_email") + */ + public function getUserEmail() + { + return $this->user->getEmail(); + } + + /** + * @VirtualProperty + * @SerializedName("user_id") + */ + public function getUserId() + { + return $this->user->getId(); + } + /** * @return string */