Mod: refactor: change function name getManyToOneRelationViaIntermedia…

…te to getManyToManyRelation
hashtopolis · Oct 25, 2024 · 0b300ad · 0b300ad
1 parent 47363a8
commit 0b300ad
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php
@@ -118,7 +118,7 @@ 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.
      * 
@@ -131,7 +131,7 @@ final protected static function getManyToOneRelation(
 
      * @return array 
      */
-    final protected static function getManyToOneRelationViaIntermediate(
+    final protected static function getManyToManyRelation(
       array $objects, 
       string $objectField,
       object $intermediateFactory,

diff --git a/src/inc/apiv2/model/accessgroups.routes.php b/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(),

diff --git a/src/inc/apiv2/model/agents.routes.php b/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(),

diff --git a/src/inc/apiv2/model/hashlists.routes.php b/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(),

diff --git a/src/inc/apiv2/model/pretasks.routes.php b/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(),

diff --git a/src/inc/apiv2/model/supertasks.routes.php b/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(),

diff --git a/src/inc/apiv2/model/tasks.routes.php b/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(),

diff --git a/src/inc/apiv2/model/users.routes.php b/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(),