5 files changed, 462 insertions, 2 deletions

diff --git a/src/Wallabag/CoreBundle/Entity/Activity.php b/src/Wallabag/CoreBundle/Entity/Activity.php
new file mode 100644
index 00000000..08a3f1fb
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/Activity.php
@@ -0,0 +1,295 @@
+<?php
+
+namespace Wallabag\CoreBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use Wallabag\FederationBundle\Entity\Account;
+
+/**
+ * Change.
+ *
+ * This entity stores a datetime for each activity.
+ *
+ * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ChangeRepository")
+ * @ORM\Table(name="`activity`")
+ */
+class Activity
+{
+    /**
+     * Object types
+     */
+    const ENTRY_OBJECT = 1;
+    const TAG_OBJECT = 2;
+    const USER_OBJECT = 3;
+    const SHARE_OBJECT = 4;
+    const GROUP_OBJECT = 5;
+    const ANNOTATION_OBJECT = 6;
+    const CONFIG_OBJECT = 7;
+    const ACCOUNT_OBJECT = 8;
+
+    /**
+     * Events
+     */
+
+    /**
+     * Entry events
+     */
+    const ENTRY_ADD = 10; // done
+    const ENTRY_EDIT = 11; // done
+    const ENTRY_READ = 12; // done
+    const ENTRY_UNREAD = 13; // done
+    const ENTRY_FAVOURITE = 14; // done
+    const ENTRY_UNFAVOURITE = 15; // done
+    const ENTRY_DELETE = 19; // done
+
+    /**
+     * Tag events
+     */
+    const TAG_CREATE = 20; // not yet implemented
+    const TAG_EDIT = 21; // not yet implemented
+    const TAG_REMOVE = 29; // not yet implemented
+
+    /**
+     * Entry - Tag events
+     */
+    const ENTRY_ADD_TAG = 30; // done
+    const ENTRY_REMOVE_TAG = 39; // done
+
+    /**
+     * Entry - Annotation events
+     */
+    const ANNOTATION_ADD = 40; // done
+    const ANNOTATION_EDIT = 41; // done
+    const ANNOTATION_REMOVE = 49; // done
+
+    /**
+     * User events
+     */
+    const USER_CREATE = 50; // done
+    const USER_EDIT = 51; // done
+    const USER_REMOVE = 59; // done
+
+    /**
+     * Federation events
+     */
+    const FOLLOW_ACCOUNT = 61;
+    const UNFOLLOW_ACCOUNT = 62;
+    const RECOMMEND_ENTRY = 63;
+
+    /**
+     * Share events
+     */
+    const USER_SHARE_CREATED = 70; // done
+    const USER_SHARE_ACCEPTED = 71; // done
+    const USER_SHARE_REFUSED = 72; // done
+    const USER_SHARE_CANCELLED = 79; // not implemented yet
+
+    /**
+     * Group events
+     */
+    const GROUP_CREATE = 80;
+    const GROUP_EDIT = 81;
+    const GROUP_ADD_MEMBER = 82;
+    const GROUP_EDIT_MEMBER = 83;
+    const GROUP_REMOVE_MEMBER = 84;
+    const GROUP_SHARE_ENTRY = 85;
+    const GROUP_DELETE = 89;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     */
+    private $activityType;
+
+    /**
+     * @var Account
+     */
+    private $user;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     */
+    private $primaryObjectType;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer")
+     */
+    private $primaryObjectId;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    private $secondaryObjectType;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(type="integer", nullable=true)
+     */
+    private $secondaryObjectId;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="created_at", type="datetime")
+     */
+    private $createdAt;
+
+    public function __construct($activityType, $primaryObjectType, $primaryObjectId)
+    {
+        $this->activityType = $activityType;
+        $this->primaryObjectType = $primaryObjectType;
+        $this->primaryObjectId = $primaryObjectId;
+        $this->createdAt = new \DateTime();
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return int
+     */
+    public function getActivityType()
+    {
+        return $this->activityType;
+    }
+
+    /**
+     * @param int $activityType
+     * @return Activity
+     */
+    public function setActivityType($activityType)
+    {
+        $this->activityType = $activityType;
+        return $this;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * @param \DateTime $createdAt
+     * @return Activity
+     */
+    public function setCreatedAt(\DateTime $createdAt)
+    {
+        $this->createdAt = $createdAt;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPrimaryObjectId()
+    {
+        return $this->primaryObjectId;
+    }
+
+    /**
+     * @param $primaryObjectId
+     * @return Activity
+     */
+    public function setPrimaryObjectId($primaryObjectId)
+    {
+        $this->primaryObjectId = $primaryObjectId;
+        return $this;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * @param Account $user
+     * @return Activity
+     */
+    public function setUser($user)
+    {
+        $this->user = $user;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getPrimaryObjectType()
+    {
+        return $this->primaryObjectType;
+    }
+
+    /**
+     * @param int $primaryObjectType
+     * @return Activity
+     */
+    public function setPrimaryObjectType($primaryObjectType)
+    {
+        $this->primaryObjectType = $primaryObjectType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSecondaryObjectType()
+    {
+        return $this->secondaryObjectType;
+    }
+
+    /**
+     * @param int $secondaryObjectType
+     * @return Activity
+     */
+    public function setSecondaryObjectType($secondaryObjectType)
+    {
+        $this->secondaryObjectType = $secondaryObjectType;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getSecondaryObjectId()
+    {
+        return $this->secondaryObjectId;
+    }
+
+    /**
+     * @param int $secondaryObjectId
+     * @return Activity
+     */
+    public function setSecondaryObjectId($secondaryObjectId)
+    {
+        $this->secondaryObjectId = $secondaryObjectId;
+        return $this;
+    }
+}
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index b902ae2c..f42a49b3 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -8,7 +8,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 use Wallabag\UserBundle\Entity\User;
 
 /**
- * Config.
+ * config.
  *
  * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\ConfigRepository")
  * @ORM\Table(name="`config`")
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index a0503c39..6ca17126 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -233,13 +233,21 @@ class Entry
      */
     private $tags;
 
-    /*
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="recommended", type="boolean", nullable=true)
+     */
+    private $recommended;
+
+    /**
      * @param User     $user
      */
     public function __construct(User $user)
     {
         $this->user = $user;
         $this->tags = new ArrayCollection();
+        $this->changes = new ArrayCollection();
     }
 
     /**
@@ -778,4 +786,20 @@ class Entry
 
         return $this;
     }
+
+    /**
+     * @return bool
+     */
+    public function isRecommended()
+    {
+        return $this->recommended;
+    }
+
+    /**
+     * @param bool $recommended
+     */
+    public function setRecommended($recommended)
+    {
+        $this->recommended = $recommended;
+    }
 }
diff --git a/src/Wallabag/CoreBundle/Entity/Notification.php b/src/Wallabag/CoreBundle/Entity/Notification.php
index aa4c03c3..d4304f39 100644
--- a/src/Wallabag/CoreBundle/Entity/Notification.php
+++ b/src/Wallabag/CoreBundle/Entity/Notification.php
@@ -91,6 +91,7 @@ class Notification implements NotificationInterface
     const TYPE_ADMIN = 0;
     const TYPE_USER = 1;
     const TYPE_RELEASE = 2;
+    const TYPE_SHARE = 3;
 
     public function __construct(User $user = null)
     {
diff --git a/src/Wallabag/CoreBundle/Entity/Share.php b/src/Wallabag/CoreBundle/Entity/Share.php
new file mode 100644
index 00000000..a55b4e67
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Entity/Share.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Wallabag\CoreBundle\Entity;
+
+use Wallabag\FederationBundle\Entity\Account;
+use Wallabag\UserBundle\Entity\User;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Share.
+ *
+ * @ORM\Entity
+ */
+class Share
+{
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var Account
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\FederationBundle\Entity\Account")
+     */
+    private $userOrigin;
+
+    /**
+     * @var Account
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\FederationBundle\Entity\Account")
+     */
+    private $userDestination;
+
+    /**
+     * @var Entry
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Entry")
+     */
+    private $entry;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="accepted", type="boolean")
+     */
+    private $accepted;
+
+    /**
+     * Share constructor.
+     */
+    public function __construct()
+    {
+        $this->accepted = false;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getUserOrigin()
+    {
+        return $this->userOrigin;
+    }
+
+    /**
+     * @param User $userOrigin
+     * @return Share
+     */
+    public function setUserOrigin(User $userOrigin)
+    {
+        $this->userOrigin = $userOrigin;
+        return $this;
+    }
+
+    /**
+     * @return Account
+     */
+    public function getUserDestination()
+    {
+        return $this->userDestination;
+    }
+
+    /**
+     * @param User $userDestination
+     * @return Share
+     */
+    public function setUserDestination(User $userDestination)
+    {
+        $this->userDestination = $userDestination;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAccepted()
+    {
+        return $this->accepted;
+    }
+
+    /**
+     * @param bool $accepted
+     * @return Share
+     */
+    public function setAccepted($accepted)
+    {
+        $this->accepted = $accepted;
+        return $this;
+    }
+
+    /**
+     * @return Entry
+     */
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+
+    /**
+     * @param Entry $entry
+     * @return Share
+     */
+    public function setEntry(Entry $entry)
+    {
+        $this->entry = $entry;
+        return $this;
+    }
+}