X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FEntity%2FEntry.php;h=5e3f9a37a6bc89f4604de1d623f039a927993877;hb=fad316151c282b2383fae751f7ca45373f1f26ed;hp=a00762cadfbc1a58a4250f09b1e803529fbd71af;hpb=15d33c24dca0fc5b8b783eb68bd83f286481f364;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php index a00762ca..5e3f9a37 100644 --- a/src/Wallabag/CoreBundle/Entity/Entry.php +++ b/src/Wallabag/CoreBundle/Entity/Entry.php @@ -2,21 +2,27 @@ namespace Wallabag\CoreBundle\Entity; +use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; +use Hateoas\Configuration\Annotation as Hateoas; +use JMS\Serializer\Annotation\XmlRoot; +use Wallabag\CoreBundle\Tools\Utils; /** - * Entry + * Entry. * + * @XmlRoot("entry") * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\EntryRepository") - * @ORM\Table(name="entry") + * @ORM\Table * @ORM\HasLifecycleCallbacks() - * + * @Hateoas\Relation("self", href = "expr('/api/entries/' ~ object.getId())") */ class Entry { + /** @Serializer\XmlAttribute */ /** - * @var integer + * @var int * * @ORM\Column(name="id", type="integer") * @ORM\Id @@ -40,26 +46,19 @@ class Entry private $url; /** - * @var boolean + * @var bool * * @ORM\Column(name="is_archived", type="boolean") */ private $isArchived = false; /** - * @var boolean + * @var bool * * @ORM\Column(name="is_starred", type="boolean") */ private $isStarred = false; - /** - * @var boolean - * - * @ORM\Column(name="is_deleted", type="boolean") - */ - private $isDeleted = false; - /** * @var string * @@ -81,13 +80,6 @@ class Entry */ private $updatedAt; - /** - * @var string - * - * @ORM\Column(name="user_id", type="decimal", precision=10, scale=0, nullable=true) - */ - private $userId; - /** * @var string * @@ -103,9 +95,9 @@ class Entry private $mimetype; /** - * @var integer + * @var int * - * @ORM\Column(name="reading_type", type="integer", nullable=true) + * @ORM\Column(name="reading_time", type="integer", nullable=true) */ private $readingTime; @@ -117,16 +109,43 @@ class Entry private $domainName; /** - * @var boolean + * @var string + * + * @ORM\Column(name="preview_picture", type="text", nullable=true) + */ + private $previewPicture; + + /** + * @var bool * * @ORM\Column(name="is_public", type="boolean", nullable=true, options={"default" = false}) */ private $isPublic; /** - * Get id + * @ORM\ManyToOne(targetEntity="User", inversedBy="entries") + */ + private $user; + + /** + * @ORM\ManyToMany(targetEntity="Tag", inversedBy="entries", cascade={"persist"}) + * @ORM\JoinTable + */ + private $tags; + + /* + * @param User $user + */ + public function __construct(User $user) + { + $this->user = $user; + $this->tags = new ArrayCollection(); + } + + /** + * Get id. * - * @return integer + * @return int */ public function getId() { @@ -134,9 +153,10 @@ class Entry } /** - * Set title + * Set title. + * + * @param string $title * - * @param string $title * @return Entry */ public function setTitle($title) @@ -147,7 +167,7 @@ class Entry } /** - * Get title + * Get title. * * @return string */ @@ -157,9 +177,10 @@ class Entry } /** - * Set url + * Set url. + * + * @param string $url * - * @param string $url * @return Entry */ public function setUrl($url) @@ -170,7 +191,7 @@ class Entry } /** - * Get url + * Get url. * * @return string */ @@ -180,9 +201,10 @@ class Entry } /** - * Set isArchived + * Set isArchived. + * + * @param string $isArchived * - * @param string $isArchived * @return Entry */ public function setArchived($isArchived) @@ -193,7 +215,7 @@ class Entry } /** - * Get isArchived + * Get isArchived. * * @return string */ @@ -210,9 +232,10 @@ class Entry } /** - * Set isStarred + * Set isStarred. + * + * @param string $isStarred * - * @param string $isStarred * @return Entry */ public function setStarred($isStarred) @@ -223,7 +246,7 @@ class Entry } /** - * Get isStarred + * Get isStarred. * * @return string */ @@ -240,20 +263,23 @@ class Entry } /** - * Set content + * Set content. + * + * @param string $content * - * @param string $content * @return Entry */ public function setContent($content) { $this->content = $content; + $this->readingTime = Utils::getReadingTime($content); + $this->domainName = parse_url($this->url, PHP_URL_HOST); return $this; } /** - * Get content + * Get content. * * @return string */ @@ -263,42 +289,11 @@ class Entry } /** - * Set userId - * - * @param string $userId - * @return Entry - */ - public function setUserId($userId) - { - $this->userId = $userId; - - return $this; - } - - /** - * Get userId - * - * @return string - */ - public function getUserId() - { - return $this->userId; - } - - /** - * @return string - */ - public function isDeleted() - { - return $this->isDeleted; - } - - /** - * @param string $isDeleted + * @return User */ - public function setDeleted($isDeleted) + public function getUser() { - $this->isDeleted = $isDeleted; + return $this->user; } /** @@ -395,7 +390,7 @@ class Entry } /** - * @return boolean + * @return bool */ public function isPublic() { @@ -403,10 +398,57 @@ class Entry } /** - * @param boolean $isPublic + * @param bool $isPublic */ - public function setPublic($isPublic) + public function setIsPublic($isPublic) { $this->isPublic = $isPublic; } + + /** + * @return ArrayCollection + */ + public function getTags() + { + return $this->tags; + } + + /** + * @param Tag $tag + */ + public function addTag(Tag $tag) + { + $this->tags[] = $tag; + $tag->addEntry($this); + } + + public function removeTag(Tag $tag) + { + $this->tags->removeElement($tag); + } + + /** + * Set previewPicture + * + * @param string $previewPicture + * + * @return Entry + */ + public function setPreviewPicture($previewPicture) + { + $this->previewPicture = $previewPicture; + + return $this; + } + + /** + * Get previewPicture + * + * @return string + */ + public function getPreviewPicture() + { + return $this->previewPicture; + } + }