Update with latest changes to swagger schema

aces · Dec 16, 2022 · 0b5d507 · 0b5d507
1 parent abeb634
commit 0b5d507
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 36 deletions.
diff --git a/modules/dataquery/php/provisioners/recentqueries.class.inc b/modules/dataquery/php/provisioners/recentqueries.class.inc
@@ -23,10 +23,7 @@ class RecentQueries extends \LORIS\Data\Provisioners\DBRowProvisioner
     function __construct(protected \LORIS\LorisInstance $loris, \User $user)
     {
         parent::__construct(
-            "SELECT dq.QueryID, RunTime, Query,
-               IF(dpq.QueryID IS NULL, 'Unstarred', 'Starred') as Starred,
-               IF(dsq.QueryID IS NULL, 'Unshared', 'Shared') as Shared,
-               name.Name
+            "SELECT drq.RunID, dq.QueryID, RunTime, Query
             FROM dataquery_queries dq
                 JOIN dataquery_run_queries drq ON (dq.QueryID=drq.QueryID)
                 LEFT JOIN dataquery_starred_queries_rel dpq ON
@@ -35,7 +32,7 @@ class RecentQueries extends \LORIS\Data\Provisioners\DBRowProvisioner
                     (dq.QueryID=dsq.QueryID AND dsq.SharedBy=:userid)
                 LEFT JOIN dataquery_query_names name ON 
                     (dq.QueryID=name.QueryID AND name.UserID=:userid)
-            WHERE drq.UserID=:userid
+            WHERE drq.UserID=:userid AND drq.RunID IS NOT NULL
             ORDER BY drq.RunTime DESC",
             ['userid' => $user->getId()]
         );
@@ -56,10 +53,8 @@ class RecentQueries extends \LORIS\Data\Provisioners\DBRowProvisioner
                 loris: $this->loris,
                 queryID: intval($row['QueryID']),
                 query: json_decode($row['Query'], true),
-                name: $row['Name'] ?? '',
-                starred: $row['Starred'] === 'Starred',
-                shared: $row['Shared'] === 'Shared',
             ),
+            RunID: intval($row['RunID']),
             runTime: $row['RunTime'],
         );
         return $qr;

diff --git a/modules/dataquery/php/queries.class.inc b/modules/dataquery/php/queries.class.inc
@@ -49,16 +49,11 @@ class Queries extends \NDB_Page
                 return new \LORIS\Http\Response\JSON\OK(
                     [
                         'recent'     => iterator_to_array(
-                            $this->getRecentQueries($user),
+                            $this->getRecentRuns($user),
                             false,
                         ),
-                        'shared'     => iterator_to_array(
-                            $this->getSharedQueries($user),
-                            false,
-                        ),
-                        'topqueries' => iterator_to_array(
-                            $this->getTopQueries($user),
-                            false,
+                        'queries' => iterator_to_array(
+                            $this->getUserAccessibleQueries($user),
                         ),
                     ]
                 );
@@ -129,13 +124,28 @@ class Queries extends \NDB_Page
      *
      * @return \Traversable
      */
-    public function getRecentQueries(\User $user) : iterable
+    public function getUserAccessibleQueries(\User $user) : iterable
     {
-        return (new provisioners\RecentQueries($this->loris, $user))
-            //->filter(new AccessibleResourceFilter())
+        return (new provisioners\AllUserQueries($this->loris, $user))
+            // ->filter(new AccessibleResourceFilter())
             ->execute($user);
     }
 
+
+    /**
+     * Get a list of recent query runs for this user
+     *
+     * @param \User $user The user getting the queries.
+     *
+     * @return \Traversable
+     */
+    public function getRecentRuns(\User $user) : iterable
+    {
+        return (new provisioners\RecentQueries($this->loris, $user))
+                //->filter(new AccessibleResourceFilter())
+                ->execute($user);
+    }
+
     /**
      * Get a list of shared queries for this user
      *

diff --git a/modules/dataquery/php/query.class.inc b/modules/dataquery/php/query.class.inc
@@ -29,9 +29,6 @@ class Query implements \LORIS\StudyEntities\AccessibleResource,
     \LORIS\Data\DataInstance
 {
     protected $data;
-    public readonly string $name;
-    protected $sharedBy;
-
     /**
      * Construct a Query object
      *
@@ -49,10 +46,10 @@ class Query implements \LORIS\StudyEntities\AccessibleResource,
         protected \LORIS\LorisInstance $loris,
         public readonly int $queryID,
         ?array $query=null,
-        ?string $name=null,
-        ?array $sharedBy=null,
+        protected readonly ?string $name=null,
+        protected ?string $adminname=null,
+        protected ?array $sharedBy=null,
         protected ?bool $starred=null,
-        protected ?bool $shared=null
     ) {
         if ($query !== null) {
             $this->data = $query;
@@ -71,13 +68,6 @@ class Query implements \LORIS\StudyEntities\AccessibleResource,
             }
             $this->data = json_decode($data, true);
         }
-
-        if ($name !== null) {
-            $this->name = $name;
-        }
-        if ($sharedBy !== null) {
-            $this->sharedBy = $sharedBy;
-        }
     }
 
     /**
@@ -735,22 +725,31 @@ class Query implements \LORIS\StudyEntities\AccessibleResource,
      */
     public function jsonSerialize() : mixed
     {
+        $factory = \NDB_Factory::singleton();
         $result = [
+            'self' => $factory->settings()->getBaseURL() . '/dataquery/queries/' . $this->queryID,
             'QueryID' => $this->queryID,
             'Query'   => $this->data,
         ];
         if ($this->name !== null && $this->name !== '') {
             $result['Name'] = $this->name;
         }
+        if ($this->adminname !== null && $this->adminname !== '') {
+            $result['AdminName'] = $this->adminname;
+            $result['Pinned'] = true;
+        } else {
+            $result['Pinned'] = false;
+        }
+
         if ($this->sharedBy !== null) {
             $result['SharedBy'] = $this->sharedBy;
+            $result['Public'] = true;
+        } else {
+            $result['Public'] = false;
         }
         if ($this->starred !== null) {
             $result['Starred'] = $this->starred;
         }
-        if ($this->shared !== null) {
-            $result['Shared'] = $this->shared;
-        }
         return $result;
     }
 }
diff --git a/modules/dataquery/php/queryrun.class.inc b/modules/dataquery/php/queryrun.class.inc
@@ -119,9 +119,15 @@ class QueryRun implements \LORIS\StudyEntities\AccessibleResource,
      */
     public function jsonSerialize() : mixed
     {
+        $factory = \NDB_Factory::singleton();
+        $baseURL = $factory->settings()->getBaseURL();
         $result = [
+            'self' => $baseURL 
+                . '/dataquery/queries/' . $this->query->queryID . '/run/' . $this->runID,
+            'Query'   => $this->query->queryID,
             'RunTime' => $this->runTime,
-            'Query'   => $this->query,
+            'QueryID'   => $this->query->queryID,
+            'QueryRunID' => $this->runID,
         ];
         return $result;
     }