Bug/1109 bug incorrect display of hashlists in the super hashlist table

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

@@ -11,8 +11,6 @@
 use DBA\JoinFilter;
 use DBA\Factory;
 use DBA\ContainFilter;
-use DBA\OrderFilter;
-use DBA\QueryFilter;
 use Middlewares\Utils\HttpErrorException;
 
 
@@ -120,31 +118,30 @@ final protected static function getManyToOneRelation(
 
 
     /**
-     * Retrieve ManyToOne relalation for $objects ('parents') of type $targetFactory via 'intermidate'
+     * Retrieve ManyToMany relation for $objects ('parents') of type $targetFactory via 'intermediate'
      * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by 
      * $filterField at $intermediateFactory.
      * 
      * @param array $objects Objects Fetch relation for selected Objects 
      * @param string $objectField Field to use as base for $objects
      * @param object $intermediateFactory Factory used as intermediate between parentObject and targetObject
-     * @param string $filterField Filter field of intermadiateObject to filter against $objects field
+     * @param string $filterField Filter field of intermediateObject to filter against $objects field
      * @param object $targetFactory Object properties of objects returned
      * @param string $joinField Field to connect 'intermediate' to 'target'
 
      * @return array 
      */
-    final protected static function getManyToOneRelationViaIntermediate(
+    final protected static function getManyToManyRelation(
       array $objects, 
       string $objectField,
       object $intermediateFactory,
       string $filterField,
       object $targetFactory,
-      string $joinField,
+      string $joinField
     ): array {
       assert($intermediateFactory instanceof AbstractModelFactory);
       assert($targetFactory instanceof AbstractModelFactory);
-      $retval = array();
-
+      $many2Many = array();
 
       /* Retrieve Parent -> Intermediate -> Target objects */
       $objectIds = [];
@@ -156,20 +153,21 @@ final protected static function getManyToOneRelationViaIntermediate(
       $jF = new JoinFilter($intermediateFactory, $joinField, $joinField);
       $hO = $targetFactory->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]);
 
-      /* Build mapping Parent -> Intermediate */
-      $i2p = [];
-      foreach($hO[$intermediateFactory->getModelName()] as $intermidiateObject) {
-        $kv = $intermidiateObject->getKeyValueDict();
-        $i2p[$kv[$joinField]] = $kv[$filterField];
-      }
-
-      /* Associate Target -> Parent (via Intermediate) */
-      foreach($hO[$targetFactory->getModelName()] as $targetObject) {
-        $parent = $i2p[$targetObject->getKeyValueDict()[$joinField]];
-        $retval[$parent][] = $targetObject;
+      $intermediateObjectList = $hO[$intermediateFactory->getModelName()];
+      $targetObjectList = $hO[$targetFactory->getModelName()];
+
+      $intermediateObject = current($intermediateObjectList);
+      $targetObject = current($targetObjectList);
+
+      while ($intermediateObject && $targetObject) {
+        $kv = $intermediateObject->getKeyValueDict();
+        $many2Many[$kv[$filterField]][] = $targetObject;
+
+        $intermediateObject = next($intermediateObjectList);
+        $targetObject = next($targetObjectList);
       }
-
-      return $retval;
+      
+      return $many2Many;
     }
 
   /** 
@@ -216,7 +214,7 @@ public function deleteOne(Request $request, Response $response, array $args): Re
 
 
   /**
-   * Request single object from database & validate permissons
+   * Request single object from database & validate permissions
    */
   protected function doFetch(Request $request, string $pk): mixed
   {

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

@@ -30,7 +30,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
       /* Expand requested section */
       switch($expand) {
         case 'userMembers':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             AccessGroup::ACCESS_GROUP_ID,
             Factory::getAccessGroupUserFactory(),
@@ -39,7 +39,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
             User::USER_ID
           );
         case 'agentMembers':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             AccessGroup::ACCESS_GROUP_ID,
             Factory::getAccessGroupAgentFactory(),

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

@@ -33,7 +33,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
       /* Expand requested section */
       switch($expand) {
         case 'accessGroups':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             Agent::AGENT_ID,
             Factory::getAccessGroupAgentFactory(),

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

@@ -58,7 +58,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
           );
         case 'hashlists':
           /* PARENT_HASHLIST_ID in use in intermediate table */
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects, 
             Hashlist::HASHLIST_ID,
             Factory::getHashlistHashlistFactory(),
@@ -67,7 +67,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
             Hashlist::HASHLIST_ID,
           );
         case 'tasks':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             Hashlist::HASHLIST_ID,
             Factory::getTaskWrapperFactory(),

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

@@ -31,7 +31,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
       /* Expand requested section */
       switch($expand) {
         case 'pretaskFiles':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             Pretask::PRETASK_ID,
             Factory::getFilePretaskFactory(),

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

@@ -30,7 +30,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
       /* Expand requested section */
       switch($expand) {
         case 'pretasks':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             Supertask::SUPERTASK_ID,
             Factory::getSupertaskPretaskFactory(),

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

@@ -34,7 +34,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
       /* Expand requested section */
       switch($expand) {
         case 'assignedAgents':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             Task::TASK_ID,
             Factory::getAssignmentFactory(),
@@ -57,7 +57,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
             CrackerBinaryType::CRACKER_BINARY_TYPE_ID
           );
         case 'hashlist':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             Task::TASK_WRAPPER_ID,
             Factory::getTaskWrapperFactory(),
@@ -73,7 +73,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
             Speed::TASK_ID
           );
         case 'files':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             Task::TASK_ID,
             Factory::getFileTaskFactory(),

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

@@ -31,7 +31,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed {
       /* Expand requested section */
       switch($expand) {
         case 'accessGroups':
-          return $this->getManyToOneRelationViaIntermediate(
+          return $this->getManyToManyRelation(
             $objects,
             User::USER_ID,
             Factory::getAccessGroupUserFactory(),