Merge pull request mtierltd#1 from Hawiak/fix/163_fix-project-search

Implemented searchByName method to be used when searching for a proje…
printplaatreparatie · Jun 14, 2022 · 5d436f0 · 5d436f0
2 parents be5d3ed + 6de6233
commit 5d436f0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/lib/Controller/AjaxController.php b/lib/Controller/AjaxController.php
@@ -720,7 +720,13 @@ public function deleteProjectWithData($id) {
 	 * @NoAdminRequired
 	 */
 	public function getProjects(){
-		$projects = $this->projectMapper->findAll($this->userId);
+	    $projectName = $this->request->term ?? null;
+
+	    if ($projectName) {
+	        $projects = $this->projectMapper->searchByName($this->userId, $projectName);
+        } else {
+            $projects = $this->projectMapper->findAll($this->userId);
+        }
 		$parray = json_decode(json_encode($projects), true);
 		foreach($parray as $pi => $pv){
 			if (isset($pv->id)) {

diff --git a/lib/Db/ProjectMapper.php b/lib/Db/ProjectMapper.php
@@ -16,14 +16,21 @@ public function __construct(IDBConnection $db) {
     public function findByName($name) {
         $sql = 'SELECT * FROM `*PREFIX*timetracker_project` ' .
             'WHERE upper(`name`) = ?';
-            
+
             try {
                 $e = $this->findEntity($sql, [strtoupper($name)]);
                 return $e;
             } catch (\OCP\AppFramework\Db\DoesNotExistException $e){
                 return null;
             }
-
+
+    }
+
+    public function searchByName($user, string $name) {
+        $name = strtoupper($name);
+        $sql = 'SELECT tp.* FROM `*PREFIX*timetracker_project` tp LEFT JOIN `*PREFIX*timetracker_user_to_project` up ON up.project_id = tp.id WHERE up.`user_uid` = ? AND upper(tp.`name`) LIKE ? ORDER BY tp.`name`';
+
+        return $this->findEntities($sql, [$user, $name ."%"]);
     }
 
     /**
@@ -59,17 +66,17 @@ public function findAllAdmin($getArchived = 0){
     public function delete($project_id) {
         $sql = 'delete FROM `*PREFIX*timetracker_project` ' .
             ' where id = ?';
-            
+
             try {
                 $this->execute($sql, [$project_id]);
                 return;
             } catch (\OCP\AppFramework\Db\DoesNotExistException $e){
                 return;
             }
-        
+
     }
 
 
 
-   
-}
+
+}