3 files changed, 356 insertions, 15 deletions

diff --git a/src/Wallabag/GroupBundle/Entity/Group.php b/src/Wallabag/GroupBundle/Entity/Group.php
index 1381d1ea..31c82837 100644
--- a/src/Wallabag/GroupBundle/Entity/Group.php
+++ b/src/Wallabag/GroupBundle/Entity/Group.php
@@ -8,11 +8,50 @@ use Doctrine\ORM\Mapping as ORM;
 use Wallabag\UserBundle\Entity\User;
 
 /**
- * @ORM\Entity
+ * @ORM\Entity(repositoryClass="Wallabag\GroupBundle\Repository\GroupRepository")
  * @ORM\Table(name="`group`")
  */
 class Group extends BaseGroup
 {
+
+    /**
+     * User Roles
+     */
+
+    /** User can only preview presentations */
+    const ROLE_READ_ONLY = 1;
+
+    /** User can create new presentations */
+    const ROLE_WRITE = 2;
+
+    /** User can manage all group presentations */
+    const ROLE_MANAGE_ENTRIES = 3;
+
+    /** User can manage users in the group */
+    const ROLE_MANAGE_USERS = 5;
+
+    /** User can rename and delete the group */
+    const ROLE_ADMIN = 10;
+
+    /**
+     * Group join access
+     */
+
+    /** Any user can join the group */
+    const ACCESS_OPEN = 1;
+
+    /** An user needs to request to join the group */
+    const ACCESS_REQUEST = 2;
+
+    /** An user need the password to access the group */
+    const ACCESS_PASSWORD = 3;
+
+    /** An user needs to be invited to join the group */
+    const ACCESS_INVITATION_ONLY = 4;
+
+    /** An user needs to be invited to join the group, and the group is not publicly listed */
+    const ACCESS_HIDDEN = 10;
+
     /**
      * @ORM\Id
      * @ORM\Column(type="integer")
@@ -21,38 +60,141 @@ class Group extends BaseGroup
     protected $id;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Wallabag\UserBundle\Entity\User", mappedBy="groups", cascade={"persist"})
+     * @ORM\Column(type="integer", options={"default" : 1})
+     */
+    protected $acceptSystem;
+
+    /**
+     * @ORM\Column(type="integer", options={"default" : 2})
+     */
+    protected $defaultRole;
+
+    /**
+     * @ORM\Column(type="string", nullable=true)
+     */
+    protected $password;
+    protected $plainPassword;
+
+    /**
+     * @ORM\ManyToMany(targetEntity="Wallabag\CoreBundle\Entity\Entry", mappedBy="groupShares", cascade={"persist"})
+     */
+    protected $entries;
+
+    /**
+     * @ORM\OneToMany(targetEntity="UserGroup", mappedBy="group", cascade={"persist"})
      */
     protected $users;
 
-    public function getUsers()
+    public function __construct($name = '', array $roles = [])
     {
-        return $this->users ?: $this->users = new ArrayCollection();
+        parent::__construct($name, $roles);
+        $this->defaultRole = self::ROLE_READ_ONLY;
+        $this->acceptSystem = self::ACCESS_REQUEST;
     }
 
-    public function addUser(User $user)
+    /**
+     * @return ArrayCollection
+     */
+    public function getUsers()
     {
-        if (!$this->getUsers()->contains($user)) {
-            $this->getUsers()->add($user);
+        $userObj = new ArrayCollection();
+        foreach ($this->users as $userGroup) {
+            /** @var UserGroup $userGroup */
+            $userObj->add($userGroup->getUser());
         }
+        return $userObj;
+    }
 
-        return $this;
+    /**
+     * @return int
+     */
+    public function getDefaultRole()
+    {
+        return $this->defaultRole;
     }
 
     /**
-     * {@inheritdoc}
+     * @return int
      */
-    public function removeUser(User $user)
+    public function getAcceptSystem()
     {
-        if ($this->getUsers()->contains($user)) {
-            $this->getUsers()->removeElement($user);
-        }
+        return $this->acceptSystem;
+    }
+
+    /**
+     * @param int $acceptSystem
+     */
+    public function setAcceptSystem($acceptSystem)
+    {
+        $this->acceptSystem = $acceptSystem;
+    }
 
-        return $this;
+    /**
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password ?: '';
+    }
+
+    /**
+     * @param string $password
+     */
+    public function setPassword($password)
+    {
+        $this->password = $password;
+    }
+
+    /**
+     * @return string
+     */
+    public function getPlainPassword()
+    {
+        return $this->plainPassword ?: '';
+    }
+
+    /**
+     * @param string $plainPassword
+     */
+    public function setPlainPassword($plainPassword)
+    {
+        $this->plainPassword = $plainPassword;
+    }
+
+    /**
+     * @param int $defaultRole
+     */
+    public function setDefaultRole($defaultRole)
+    {
+        $this->defaultRole = $defaultRole;
     }
 
     public function __toString()
     {
-        return $this->getName();
+        return $this->name;
+    }
+
+    public function getRequests()
+    {
+        $requests = new ArrayCollection();
+        foreach ($this->users as $user) /** @var UserGroup $user */
+        {
+            if (!$user->isAccepted()) {
+                $requests->add($user->getUser());
+            }
+        }
+        return $requests;
+    }
+
+    public function getInvited()
+    {
+        $invited = new ArrayCollection();
+        foreach ($this->users as $userGroup) /** @var UserGroup $userGroup */
+        {
+            if ($userGroup->getInvitation()) {
+                $invited->add($userGroup);
+            }
+        }
+        return $invited;
     }
 }
diff --git a/src/Wallabag/GroupBundle/Entity/Invitation.php b/src/Wallabag/GroupBundle/Entity/Invitation.php
new file mode 100644
index 00000000..6946bede
--- /dev/null
+++ b/src/Wallabag/GroupBundle/Entity/Invitation.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Wallabag\GroupBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity
+ */
+class Invitation
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="string", length=6)
+     */
+    protected $code;
+
+    /**
+     * @var \DateTime
+     * @ORM\Column(type="datetime")
+     */
+    protected $date;
+
+    /**
+     * @ORM\OneToOne(targetEntity="UserGroup", mappedBy="invitation")
+     */
+    protected $userGroup;
+
+    public function __construct(UserGroup $userGroup)
+    {
+        // generate identifier only once, here a 6 characters length code
+        $this->code = substr(md5(uniqid(rand(), true)), 0, 6);
+        $this->date = new \DateTime();
+        $this->userGroup = $userGroup;
+    }
+
+    public function getCode()
+    {
+        return $this->code;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getDate(): \DateTime
+    {
+        return $this->date;
+    }
+
+    /**
+     * @param \DateTime $date
+     */
+    public function setDate(\DateTime $date)
+    {
+        $this->date = $date;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getUserGroup(): UserGroup
+    {
+        return $this->userGroup;
+    }
+
+    /**
+     * @param mixed $userGroup
+     */
+    public function setUserGroup(UserGroup $userGroup)
+    {
+        $this->userGroup = $userGroup;
+    }
+}
diff --git a/src/Wallabag/GroupBundle/Entity/UserGroup.php b/src/Wallabag/GroupBundle/Entity/UserGroup.php
new file mode 100644
index 00000000..22d1400a
--- /dev/null
+++ b/src/Wallabag/GroupBundle/Entity/UserGroup.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace Wallabag\GroupBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use FOS\UserBundle\Model\GroupInterface;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Wallabag\UserBundle\Entity\User;
+
+/**
+ * @ORM\Entity(repositoryClass="Wallabag\GroupBundle\Repository\UserGroupRepository")
+ * @UniqueEntity({"user_id", "group_id"})
+ * @ORM\Table(name="fos_user_group")
+ */
+class UserGroup
+{
+    /**
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @ORM\Column(name="role", type="integer")
+     */
+    private $role;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User", inversedBy="userGroups")
+     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
+     */
+    private $user;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Wallabag\GroupBundle\Entity\Group", inversedBy="users")
+     * @ORM\JoinColumn(name="group_id", referencedColumnName="id")
+     */
+    private $group;
+
+    /**
+     * @ORM\Column(name="accepted", type="boolean", options={"default" : false})
+     */
+    private $accepted;
+
+    /**
+     * @ORM\OneToOne(targetEntity="Wallabag\GroupBundle\Entity\Invitation", inversedBy="userGroup", cascade={"persist", "remove"})
+     * @ORM\JoinColumn(name="invitation", referencedColumnName="code")
+     */
+    protected $invitation;
+
+    /**
+     * UserGroup constructor.
+     * @param User $user
+     * @param Group $group
+     * @param $role
+     */
+    public function __construct(User $user, Group $group, $role, $request = false)
+    {
+        $this->user = $user;
+        $this->group = $group;
+        $this->role = $role;
+        $this->accepted = $request;
+    }
+
+    /**
+     * @return Group
+     */
+    public function getGroup()
+    {
+        return $this->group;
+    }
+
+    /**
+     * @return int
+     */
+    public function getRole()
+    {
+        return $this->role;
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * @param int $role
+     * @return UserGroup
+     */
+    public function setRole($role)
+    {
+        $this->role = $role;
+        return $this;
+    }
+
+    /**
+     * @param bool $accepted
+     */
+    public function setAccepted($accepted)
+    {
+        $this->accepted = $accepted;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAccepted()
+    {
+        return $this->accepted;
+    }
+
+    public function setInvitation($invitation)
+    {
+        $this->invitation = $invitation;
+    }
+
+    public function getInvitation()
+    {
+        return $this->invitation;
+    }
+}