Merge pull request #55 from BaranekD/CodeOptimalization

Code optimalization

Author: vyskocilpavel

CHANGELOG.md

@@ -43,6 +43,7 @@ All notable changes to this project will be documented in this file.
     - sspmod_perun_LdapConnector to SimpleSAML\Module\perun\LdapConnector
     - sspmod_perun_RpcConnector to SimpleSAML\Module\perun\RpcConnector
  - Added disco-tpl template file
+ - Method getUsersGroupsOnFacility in AdapterRpc was optimized
 
  [Fixed]
  - Fixed the bug generating Array to string conversion Exception in PerunAttributes, 

lib/AdapterRpc.php

@@ -289,61 +289,45 @@ public function getFacilityAttribute($facility, $attrName)
         return $perunAttr['value'];
     }
 
+
     public function getUsersGroupsOnFacility($spEntityId, $userId)
     {
         $facilities = $this->connector->get('facilitiesManager', 'getFacilitiesByAttribute', array(
             'attributeName' => 'urn:perun:facility:attribute-def:def:entityID',
             'attributeValue' => $spEntityId,
         ));
 
-        $allowedResources = array();
-        foreach ($facilities as $facility) {
-            $resources = $this->connector->get('facilitiesManager', 'getAssignedResources', array(
-                'facility' => $facility['id'],
-            ));
-            $allowedResources = array_merge($allowedResources, $resources);
-        }
+        $groups = array();
 
-        $members = $this->connector->get('membersManager', 'getMembersByUser', array(
-            'user' => $userId,
-        ));
+        foreach ($facilities as $facility) {
+            $usersGroupsOnFacility = $this->connector->get(
+                'usersManager',
+                'getRichGroupsWhereUserIsActive',
+                array(
+                    'facility' => $facility['id'],
+                    'user' => $userId,
+                    'attrNames' => array('urn:perun:group:attribute-def:virt:voShortName')
+                )
+            );
 
-        $validMembers = array();
-        foreach ($members as $member) {
-            if ($member['status'] === 'VALID') {
-                array_push($validMembers, $member);
-            }
-        }
+            foreach ($usersGroupsOnFacility as $usersGroupOnFacility) {
+                if (isset($usersGroupOnFacility['attributes'][0]['friendlyName']) &&
+                    $usersGroupOnFacility['attributes'][0]['friendlyName'] == 'voShortName') {
+                    $uniqueName = $usersGroupOnFacility['attributes'][0]['value'] . ":" . $usersGroupOnFacility['name'];
 
-        $allGroups = array();
-        foreach ($allowedResources as $resource) {
-            foreach ($validMembers as $member) {
-                $groups = $this->connector->get('resourcesManager', 'getAssignedGroups', array(
-                    'resource' => $resource['id'],
-                    'member' => $member['id'],
-                ));
-                foreach ($groups as $group) {
-                    $attr = $this->connector->get('attributesManager', 'getAttribute', array(
-                        'group' => $group['id'],
-                        'attributeName' => 'urn:perun:group:attribute-def:virt:voShortName'
+                    array_push($groups, new Group(
+                        $usersGroupOnFacility['id'],
+                        $usersGroupOnFacility['voId'],
+                        $usersGroupOnFacility['name'],
+                        $uniqueName,
+                        $usersGroupOnFacility['description']
                     ));
-                    $uniqueName = $attr['value'] . ":" . $group['name'];
-                    array_push(
-                        $allGroups,
-                        new Group(
-                            $group['id'],
-                            $group['voId'],
-                            $group['name'],
-                            $uniqueName,
-                            $group['description']
-                        )
-                    );
                 }
             }
         }
+        $groups = $this->removeDuplicateEntities($groups);
 
-        $allGroups = $this->removeDuplicateEntities($allGroups);
-        return $allGroups;
+        return $groups;
     }
 
     public function getFacilitiesByEntityId($spEntityId)