feature: REST API /testproject/:id => id can be in addition to the DB…

… ID or the NAME, the test case PREFIX
TestLinkOpenSourceTRMS · Jul 6, 2019 · c2ebbbc · c2ebbbc
1 parent c9c1240
commit c2ebbbc
Showing 1 changed file with 28 additions and 30 deletions.
diff --git a/lib/api/rest/v2/tlRestApi.class.php b/lib/api/rest/v2/tlRestApi.class.php
@@ -111,7 +111,7 @@ public function __construct() {
 
     // GET Routes
     // test route with anonymous function 
-    $this->app->get('/who', function () { echo __CLASS__ . ' : Get Route /who';});
+    $this->app->get('/who', function () { echo __CLASS__ . ' : You have called the Get Route /who';});
 
     // using middleware for authentication
     // https://docs.slimframework.com/routing/middleware/
@@ -221,17 +221,16 @@ function authenticate(\Slim\Route $route) {
   /**
    *
    */
-  public function whoAmI()
-  {    
-    echo json_encode(array('name' => __CLASS__ . ' : Get Route /whoAmI'));
+  public function whoAmI() {    
+    echo json_encode(array('name' => __CLASS__ . ' : You have called Get Route /whoAmI'));
   }
 
   /**
    *
    */
-  public function superman()
-  {    
-    echo json_encode(array('name' => __CLASS__ . ' : Get Route /superman'));
+  public function superman() {    
+    echo json_encode(
+      array('name' => __CLASS__ . ' : You have called the Get Route /superman'));
   }
 
 
@@ -245,42 +244,41 @@ public function getProjects($idCard=null, $opt=null)
   {
     $options = array_merge(array('output' => 'rest'), (array)$opt);
     $op = array('status' => 'ok', 'message' => 'ok', 'item' => null);
-    if(is_null($idCard))
-    {
+    if(is_null($idCard)) {
       $opOptions = array('output' => 'array_of_map', 'order_by' => " ORDER BY name ", 'add_issuetracker' => true,
                           'add_reqmgrsystem' => true);
       $op['item'] = $this->tprojectMgr->get_accessible_for_user($this->userID,$opOptions);
-    }  
-    else
-    {
-      $opOptions = array('output' => 'map','field_set' => 'id', 'format' => 'simple');
+    } else {
+      $opOptions = array('output' => 'map',
+                         'field_set' => 'prefix', 
+                         'format' => 'simple');
       $zx = $this->tprojectMgr->get_accessible_for_user($this->userID,$opOptions);
-      if( ($safeID = intval($idCard)) > 0)
-      {
-        if( isset($zx[$safeID]) )
-        {
-          $op['item'] = $this->tprojectMgr->get_by_id($safeID);  
+
+      $targetID = null;
+      if( ($safeID = intval($idCard)) > 0) {
+        if( isset($zx[$safeID]) ) {
+          $targetID = $safeID;
         } 
       } 
-      else
-      {
-        // Will consider id = name
-        foreach( $zx as $key => $value ) 
-        {
-          if( strcmp($value['name'],$idCard) == 0 )
-          {
-            $safeString = $this->db->prepare_string($idCard);
-            $op['item'] = $this->tprojectMgr->get_by_name($safeString);
+      else {
+        // Will consider id = name or prefix
+        foreach( $zx as $itemID => $value ) {
+          if( strcmp($value['name'],$idCard) == 0 || 
+              strcmp($value['prefix'],$idCard) == 0 ) {
+            $targetID = $itemID;
             break;   
           }  
         }
-      } 
+      }
+
+      if( null != $targetID ) {
+        $op['item'] = $this->tprojectMgr->get_by_id($targetID);  
+      }  
     } 
 
     // Developer (silly?) information
     // json_encode() transforms maps in objects.
-    switch($options['output'])
-    {
+    switch($options['output']) {
       case 'internal':
         return $op['item'];
       break;