Fixed copilot suggestions

Author: jessevz

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

@@ -150,8 +150,15 @@ protected function getUpdateHandlers($id, $current_user): array {
   }
 
   /**
-   * Overridable function to aggregate data in the object. Currently only used for Tasks
-   * returns the aggregated data in key value pairs
+   * Overridable function to aggregate data in the object. Used for Tasks and Agents.
+   *
+   * @param object $object The object to aggregate data from.
+   * @param array &$includedData Array passed by reference; implementations can add related resources
+   *   for inclusion in the response by appending to this array.
+   * @return array Aggregated data as key-value pairs.
+   *
+   * Implementations should use $includedData to collect related resources that should be included
+   * in the API response, such as related entities or additional data.
    */
   public static function aggregateData(object $object, array &$includedData=[]): array
   {
@@ -1183,7 +1190,7 @@ protected function processExpands(
     // Add missing expands to expands in case they have been added in aggregateData()
     $expandKeys = array_keys($expandResult);
     $diffs = array_diff($expandKeys, $expands);
-    $expands = array_merge($expandKeys, $diffs);
+    $expands = array_merge($expands, $diffs);
 
     foreach ($expands as $expand) {
       if (!array_key_exists($object->getId(), $expandResult[$expand])) {
@@ -1197,16 +1204,16 @@ protected function processExpands(
           $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject));
         }
       } else {
-        if ($expandResultObject === null) {
+          if ($expandResultObject === null) {
             // to-only relation which is nullable
             continue;
-        }
+          }
         $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject));
       }
     }
 
     return $includedResources;
-}
+  }
 
   /**
    * Validate if user is allowed to access hashlist

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

@@ -38,11 +38,19 @@ protected function getUpdateHandlers($id, $current_user): array {
     ];
   }
 
+  /**
+   * Overridable function to aggregate data in the object. active chunk of agent is appended to
+   * $included_data.
+   *
+   * @param object $object the agent object were data is aggregated from
+   * @param array &$includedData
+   * @return array not used here 
+   */
   static function aggregateData(object $object, array &$included_data = []): array {
     $agentId = $object->getId();
     $qFs = [];
     $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "=");
-    $qFs[] = new QueryFilter(Chunk::STATE, 2, "=");
+    $qFs[] = new QueryFilter(Chunk::STATE, DHashcatStatus::RUNNING, "=");
 
     $active_chunk = Factory::getChunkFactory()->filter([Factory::FILTER => $qFs], true);
     if ($active_chunk !== NULL) {