Internal: Remove c_id, session_id from Link

public/main/inc/lib/link.lib.php

@@ -475,7 +475,7 @@ class Link extends Model
         }
 
         $sql = "SELECT * FROM $tbl_link
-                WHERE c_id = $course_id AND iid= $id ";
+                WHERE iid= $id ";
         $result = Database::query($sql);
         $data = [];
         if (Database::num_rows($result)) {

src/CoreBundle/Entity/Course.php

@@ -69,7 +69,7 @@ class Course extends AbstractResource implements ResourceInterface, ResourceWith
     /**
      * @var string The course title
      *
-     * @Assert\NotBlank()
+     * @Assert\NotBlank(message="A Course requires a title")
      *
      * @Groups({"course:read", "course:write", "course_rel_user:read", "session_rel_course_rel_user:read"})
      *
@@ -133,9 +133,9 @@ class Course extends AbstractResource implements ResourceInterface, ResourceWith
     protected $sessionUserSubscriptions;
 
     /**
-     * @ORM\OneToMany(targetEntity="Chamilo\CourseBundle\Entity\CGroup", mappedBy="course", cascade={"persist", "remove"})
+     * ORM\OneToMany(targetEntity="Chamilo\CourseBundle\Entity\CGroup", mappedBy="course", cascade={"persist", "remove"})
      */
-    protected $groups;
+    //protected $groups;
 
     /**
      * @var CTool[]|ArrayCollection

src/CourseBundle/Entity/CLink.php

@@ -12,13 +12,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * CLink.
  *
- * @ORM\Table(
- *  name="c_link",
- *  indexes={
- *      @ORM\Index(name="course", columns={"c_id"}),
- *      @ORM\Index(name="session_id", columns={"session_id"})
- *  }
- * )
+ * @ORM\Table(name="c_link")
  * @ORM\Entity
  */
 class CLink extends AbstractResource implements ResourceInterface
@@ -32,13 +26,6 @@ class CLink extends AbstractResource implements ResourceInterface
      */
     protected $iid;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     */
-    protected $cId;
-
     /**
      * @var string
      * @Assert\NotBlank()
@@ -48,6 +35,7 @@ class CLink extends AbstractResource implements ResourceInterface
 
     /**
      * @var string
+     * @Assert\NotBlank()
      * @ORM\Column(name="title", type="string", length=150, nullable=true)
      */
     protected $title;
@@ -88,13 +76,6 @@ class CLink extends AbstractResource implements ResourceInterface
      */
     protected $target;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="session_id", type="integer", nullable=true)
-     */
-    protected $sessionId;
-
     public function __construct()
     {
         $this->displayOrder = 0;
@@ -249,59 +230,11 @@ class CLink extends AbstractResource implements ResourceInterface
         return $this->target;
     }
 
-    /**
-     * Set sessionId.
-     *
-     * @param int $sessionId
-     *
-     * @return CLink
-     */
-    public function setSessionId($sessionId)
-    {
-        $this->sessionId = $sessionId;
-
-        return $this;
-    }
-
-    /**
-     * Get sessionId.
-     *
-     * @return int
-     */
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
     public function getIid(): int
     {
         return $this->iid;
     }
 
-    /**
-     * Set cId.
-     *
-     * @param int $cId
-     *
-     * @return CLink
-     */
-    public function setCId($cId)
-    {
-        $this->cId = $cId;
-
-        return $this;
-    }
-
-    /**
-     * Get cId.
-     *
-     * @return int
-     */
-    public function getCId()
-    {
-        return $this->cId;
-    }
-
     public function getCategory(): ?CLinkCategory
     {
         return $this->category;

src/CourseBundle/Entity/CLinkCategory.php

@@ -16,8 +16,6 @@ use Symfony\Component\Validator\Constraints as Assert;
  * @ORM\Table(
  *  name="c_link_category",
  *  indexes={
- *      @ORM\Index(name="course", columns={"c_id"}),
- *      @ORM\Index(name="session_id", columns={"session_id"})
  *  }
  * )
  * @ORM\Entity
@@ -33,13 +31,6 @@ class CLinkCategory extends AbstractResource implements ResourceInterface
      */
     protected $iid;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     */
-    protected $cId;
-
     /**
      * @var string
      * @Assert\NotBlank()
@@ -61,13 +52,6 @@ class CLinkCategory extends AbstractResource implements ResourceInterface
      */
     protected $displayOrder;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="session_id", type="integer", nullable=true)
-     */
-    protected $sessionId;
-
     /**
      * @var ArrayCollection|CLink[]
      *
@@ -77,6 +61,7 @@ class CLinkCategory extends AbstractResource implements ResourceInterface
 
     public function __construct()
     {
+        $this->displayOrder = 0;
     }
 
     public function __toString(): string
@@ -161,54 +146,6 @@ class CLinkCategory extends AbstractResource implements ResourceInterface
         return $this->displayOrder;
     }
 
-    /**
-     * Set sessionId.
-     *
-     * @param int $sessionId
-     *
-     * @return CLinkCategory
-     */
-    public function setSessionId($sessionId)
-    {
-        $this->sessionId = $sessionId;
-
-        return $this;
-    }
-
-    /**
-     * Get sessionId.
-     *
-     * @return int
-     */
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * Set cId.
-     *
-     * @param int $cId
-     *
-     * @return CLinkCategory
-     */
-    public function setCId($cId)
-    {
-        $this->cId = $cId;
-
-        return $this;
-    }
-
-    /**
-     * Get cId.
-     *
-     * @return int
-     */
-    public function getCId()
-    {
-        return $this->cId;
-    }
-
     /**
      * Resource identifier.
      */

src/CourseBundle/Repository/CLinkCategoryRepository.php

@@ -41,7 +41,6 @@ final class CLinkCategoryRepository extends ResourceRepository implements GridIn
         /** @var CLink $newResource */
         $newResource = $form->getData();
         $newResource
-            ->setCId($course->getId())
             ->setDisplayOrder(0)
             ->setOnHomepage(0)
         ;

src/CourseBundle/Repository/CLinkRepository.php

@@ -31,7 +31,6 @@ final class CLinkRepository extends ResourceRepository implements GridInterface
         /** @var CLink $newResource */
         $newResource = $form->getData();
         $newResource
-            ->setCId($course->getId())
             ->setDisplayOrder(0)
             ->setOnHomepage(0)
         ;