1 files changed, 7 insertions, 31 deletions

diff --git a/Database/meth_dbsearch.php b/Database/meth_dbsearch.php
index a90925c..8a95a67 100644
--- a/Database/meth_dbsearch.php
+++ b/Database/meth_dbsearch.php
@@ -10,21 +10,15 @@
 require_once(dirname( __FILE__ )."/dbmain.php");
 // Extension de cette classe avec dbmain
 class DbSearch extends DbMain {
-    // Récupérer toutes les infos de la table userAccount
-    final public function search_all() {
-        $reqGetAll = "SELECT * FROM ".$this->tableUserAccount;
-        $data = $this->exec_cmd($reqGetAll, array())->fetchAll(PDO::FETCH_ASSOC);
-        return $data;
-    }
 
     // Récupération des infos d'un compte par son id
-    final public function search_user_by_id($id) {
+    final public function get_user_account_by_id($id) {
         $reqSearchUser = "SELECT userId, email, inscriptionDate, isClient, isPro, isAdmin
             FROM ".$this->tableUserAccount." WHERE userId = ?";
         $data = $this->exec_cmd($reqSearchUser, array($id))->fetch(PDO::FETCH_ASSOC);
         return $data;
     }
-
+    
     // Récupération des infos d'un utilisateur par son id
     final public function get_user_info_by_id($id) {
         $reqGetUserInfo = "SELECT lastname, firstname, job, degree, 
@@ -35,9 +29,10 @@ class DbSearch extends DbMain {
         return $data;
     }
 
-    // Récupération des infos d'un consultant par son nom
-    final public function search_consultant_by_name($research) {
-        $reqSearchConsultant = "SELECT userId, lastname, firstname, job, capability FROM ".$this->tableUserInfo."
+    // Récupération des infos d'un pro par son nom
+    final public function get_pro_info_by_lastname($research) {
+        $reqSearchConsultant = "SELECT ".$this->tableUserInfo.".userId, lastname, firstname, job, capability
+            FROM ".$this->tableUserInfo."
             INNER JOIN ".$this->tableUserAccount." 
             ON ".$this->tableUserInfo.".userId = ".$this->tableUserAccount.".userId
             WHERE isPro = '1' AND lastname LIKE CONCAT('%', ?, '%')";
@@ -46,7 +41,7 @@ class DbSearch extends DbMain {
     }
     
     // Récupération des notes d'un consultant par son nom
-    final public function get_consultant_note_by_name($name) {
+    final public function get_pro_note_by_lastname($name) {
         $reqCountMission = "SELECT note FROM ".$this->tableMission."
             INNER JOIN ".$this->tableUserInfo." 
             ON ".$this->tableMission.".proId = ".$this->tableUserInfo.".userId
@@ -55,24 +50,5 @@ class DbSearch extends DbMain {
         return $data;
     }
 
-    // Récupérations des missions d'un consultant par son id
-    final public function get_all_mission_by_id($id) {
-        $reqGetAllMission = "SELECT subject, note, review, lastname FROM ".$this->tableMission."
-            LEFT JOIN ".$this->tableUserInfo." 
-            ON ".$this->tableMission.".missionId = ".$this->tableUserInfo.".userId
-            WHERE proId = ?";
-        $data = $this->exec_cmd($reqGetAllMission, array($id))->fetchAll(PDO::FETCH_ASSOC);
-        return $data;
-    }
-
-    // Compte le nombre de mission d'un consultant par son nom
-    final public function count_consultant_mission_by_name($name) {
-        $reqCountMission = "SELECT COUNT(*) FROM ".$this->tableMission."
-            INNER JOIN ".$this->tableUserInfo." 
-            ON ".$this->tableMission.".proId = ".$this->tableUserInfo.".userId
-            WHERE lastname = ?";
-        $data = $this->exec_cmd($reqCountMission, array($name))->fetchAll(PDO::FETCH_ASSOC);
-        return $data;
-    }
 }
 ?>
\ No newline at end of file