Removed duplicates functions in user course model

OrifInformatique · Jul 10, 2024 · f6ba8cb · f6ba8cb
1 parent 9ad4104
commit f6ba8cb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 49 deletions.
diff --git a/orif/plafor/Controllers/Apprentice.php b/orif/plafor/Controllers/Apprentice.php
@@ -246,7 +246,7 @@ public function list_user_courses($id_apprentice = null)
     public function save_user_course($id_apprentice = 0, $id_user_course = 0)
     {
         // Access permissions
-        if ($this->session->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_trainer) 
+        if($this->session->get('user_access')>=config('\User\Config\UserConfig')->access_lvl_trainer) 
         {
             $user_type_id = $this->user_type_model
                 ->where('access_level', config('\User\Config\UserConfig')->access_level_apprentice)
@@ -256,12 +256,12 @@ public function save_user_course($id_apprentice = 0, $id_user_course = 0)
                 ->where('fk_user_type', $user_type_id)
                 ->find($id_apprentice);
 
-            $user_course = $this->user_course_model->getUserCourseById($id_user_course);
+            $user_course = $this->user_course_model->find($id_user_course);
 
-            if (is_null($apprentice))
+            if(is_null($apprentice))
                 return redirect()->to(base_url('plafor/apprentice/list_apprentice'));
 
-            if (count($_POST) > 0) 
+            if(count($_POST) > 0)
             {
                 $fk_course_plan = $this->request->getPost('course_plan');
                 $new_user_course = array(
@@ -278,7 +278,7 @@ public function save_user_course($id_apprentice = 0, $id_user_course = 0)
 
                 else 
                 {
-                    $user_has_course = $this->user_course_model->getUserCourseByUserAndCoursePlan($user_type_id, $new_user_course['fk_course_plan']) ? true : false;
+                    $user_has_course = $this->user_course_model->where(['fk_user' => $id_apprentice, 'fk_course_plan' => $fk_course_plan])->findAll() ? true : false;
 
                     // If the apprentice already follows the course plan submitted, prevent the creation of the entry.
                     if(!$user_has_course)
@@ -322,7 +322,7 @@ public function save_user_course($id_apprentice = 0, $id_user_course = 0)
                     }
                 }
 
-                if ($this->user_course_model->errors() == null) 
+                if($this->user_course_model->errors() == null) 
                     return redirect()->to(base_url('plafor/apprentice/list_user_courses/' . $id_apprentice));
             }
 

diff --git a/orif/plafor/Models/UserCourseModel.php b/orif/plafor/Models/UserCourseModel.php
@@ -72,49 +72,6 @@ public static function getUserCourses($fk_user){
             ->findAll();
     }
 
-
-    /**
-     * Gets a specific user_course entry-
-     * 
-     * @param int $id_user_course ID of the user_course entry
-     * 
-     * @return array
-     * 
-     */
-    public static function getUserCourseById($id_user_course)
-    {
-        return UserCourseModel::getInstance()
-            ->where('id', $id_user_course)
-            ->first();
-    }
-
-    /**
-     * Gets the user_course id from the user_course entry.
-     * 
-     * @param int $fk_user ID of the user
-     * @param int $fk_course_plan ID of the course plan
-     * @param bool $onlyId If true, the function only returns the ID of the entry
-     * 
-     * @return array
-     * 
-     */
-    public static function getUserCourseByUserAndCoursePlan($fk_user, $fk_course_plan, $onlyId = false)
-    {
-        $user_course = UserCourseModel::getInstance()
-            ->where(
-            [
-                'fk_user' => $fk_user,
-                'fk_course_plan' => $fk_course_plan
-            ])
-            ->first();
-
-        if($onlyId)
-            return $user_course['id'];
-
-        else
-            return $user_course;
-    }
-
     /**
      * @param $fkCoursePlanId
      * @return array