Internal: Remove cid and session id from CAnnouncement.php

public/main/inc/lib/AnnouncementManager.php

@@ -641,7 +641,6 @@ class AnnouncementManager
 
         $courseId = $courseInfo['real_id'];
         $tbl_announcement = Database::get_course_table(TABLE_ANNOUNCEMENT);
-        $authorId = empty($authorId) ? api_get_user_id() : $authorId;
 
         if (empty($end_date)) {
             $end_date = api_get_utc_datetime();
@@ -655,12 +654,10 @@ class AnnouncementManager
 
         $announcement = new CAnnouncement();
         $announcement
-            ->setCId($courseId)
             ->setContent($newContent)
             ->setTitle($title)
             ->setEndDate(new DateTime($end_date))
             ->setDisplayOrder($order)
-            ->setSessionId($sessionId)
         ;
 
         $announcement
@@ -672,7 +669,6 @@ class AnnouncementManager
             ->setParent($course)
         ;
 
-        $repo = Container::getAnnouncementRepository();
         $em = Database::getManager();
 
         $em->persist($announcement);
@@ -758,9 +754,9 @@ class AnnouncementManager
             self::addAnnouncementToAllUsersInSessions($announcement);
         }
 
-        $repo->getEntityManager()->persist($announcement);
-        $repo->getEntityManager()->persist($resourceNode);
-        $repo->getEntityManager()->flush();
+        $em->persist($resourceNode);
+        $em->persist($announcement);
+        $em->flush();
 
         return $announcement;
     }

src/CourseBundle/Entity/CAnnouncement.php

@@ -12,13 +12,7 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * CAnnouncement.
  *
- * @ORM\Table(
- *  name="c_announcement",
- *  indexes={
- *      @ORM\Index(name="course", columns={"c_id"}),
- *      @ORM\Index(name="session_id", columns={"session_id"})
- *  }
- * )
+ * @ORM\Table(name="c_announcement")
  * @ORM\Entity
  */
 class CAnnouncement extends AbstractResource implements ResourceInterface, ResourceToCourseInterface
@@ -32,20 +26,6 @@ class CAnnouncement extends AbstractResource implements ResourceInterface, Resou
      */
     protected $iid;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer", nullable=true)
-     */
-    protected $id;
-
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="c_id", type="integer")
-     */
-    protected $cId;
-
     /**
      * @var string
      *
@@ -81,13 +61,6 @@ class CAnnouncement extends AbstractResource implements ResourceInterface, Resou
      */
     protected $emailSent;
 
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="session_id", type="integer", nullable=true)
-     */
-    protected $sessionId;
-
     /**
      * @var CAnnouncementAttachment[]
      *
@@ -238,78 +211,6 @@ class CAnnouncement extends AbstractResource implements ResourceInterface, Resou
         return $this->emailSent;
     }
 
-    /**
-     * Set sessionId.
-     *
-     * @param int $sessionId
-     *
-     * @return CAnnouncement
-     */
-    public function setSessionId($sessionId)
-    {
-        $this->sessionId = $sessionId;
-
-        return $this;
-    }
-
-    /**
-     * Get sessionId.
-     *
-     * @return int
-     */
-    public function getSessionId()
-    {
-        return $this->sessionId;
-    }
-
-    /**
-     * Set id.
-     *
-     * @param int $id
-     *
-     * @return CAnnouncement
-     */
-    public function setId($id)
-    {
-        $this->id = $id;
-
-        return $this;
-    }
-
-    /**
-     * Get id.
-     *
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Set cId.
-     *
-     * @param int $cId
-     *
-     * @return CAnnouncement
-     */
-    public function setCId($cId)
-    {
-        $this->cId = $cId;
-
-        return $this;
-    }
-
-    /**
-     * Get cId.
-     *
-     * @return int
-     */
-    public function getCId()
-    {
-        return $this->cId;
-    }
-
     public function getIid(): int
     {
         return $this->iid;