Fixed sparse fieldsets array handling and one small aggregate data error

Author: Eric-Wasson

src/inc/apiv2/common/AbstractBaseAPI.class.php

@@ -561,6 +561,11 @@ protected function obj2Resource(object $obj, array $expandResult = [], array $sp
 
     $attributes = [];
     $relationships = [];
+
+    $sparseFieldsetsForObj = null;
+    if (is_array($sparseFieldsets) && array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets)) {
+      $sparseFieldsetsForObj = explode(",", $sparseFieldsets[$this->getObjectTypeName($obj)]);
+    }
 
     /* Collect attributes */
     foreach ($features as $name => $feature) {
@@ -571,7 +576,7 @@ protected function obj2Resource(object $obj, array $expandResult = [], array $sp
       }
 
       // If sparse fieldsets (https://jsonapi.org/format/#fetching-sparse-fieldsets) is used, return only the requested data
-      if (is_array($sparseFieldsets) && array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets) && !in_array($feature['alias'], $sparseFieldsets[$this->getObjectTypeName($obj)])) {
+      if (is_array($sparseFieldsetsForObj) && !in_array($feature['alias'], $sparseFieldsetsForObj)) {
         continue;
       }
 

src/inc/apiv2/model/tasks.routes.php

@@ -166,6 +166,8 @@ static function aggregateData(object $object, array $aggregateFieldsets = null):
     $keyspaceProgress = $object->getKeyspaceProgress();
 
     if(is_null($aggregateFieldsets) || (is_array($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets))) {
+      $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']);
+
       if(is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['task'])) {
         $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace);
       }
@@ -174,11 +176,11 @@ static function aggregateData(object $object, array $aggregateFieldsets = null):
         $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace);
       }
 
+      $activeAgents = [];
       if(is_null($aggregateFieldsets) || in_array("activeAgents", $aggregateFieldsets['task'])) {
         $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "=");
         $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]);
 
-        $activeAgents = [];
         foreach ($chunks as $chunk) {
           if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) {
             $activeAgents[$chunk->getAgentId()] = true;