Changed logic for getSpGroups method

* Function getSpGroup require only one parameter($spEntityId)
* Uses new model Resource
* Changed logic for getting list of assigned groups for facility from Perun

Author: vyskocilpavel

CHANGELOG.md

@@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file.
 - Connectors methods are not static for now.
 - Added constructors to Adapters, which allows specified config file for each connections.
 - New properties voId and uniqueName in Group model
+- Function getSpGroup require only one param($spEntityId)
 
  ## [v1.0.0]
 

lib/Adapter.php

@@ -71,11 +71,10 @@ public abstract function getMemberGroups($user, $vo);
 
 	/**
 	 * @param string $spEntityId entity id of the sp
-	 * @param sspmod_perun_model_Vo $vo
 	 * @return sspmod_perun_model_Group[] from vo which are assigned to all facilities with spEntityId.
 	 * registering to those groups should should allow access to the service
 	 */
-	public abstract function getSpGroups($spEntityId, $vo);
+	public abstract function getSpGroups($spEntityId);
 
 	/**
 	 * @param sspmod_perun_model_User $user

lib/AdapterLdap.php

@@ -100,7 +100,7 @@ public function getMemberGroups($user, $vo)
 	}
 
 
-	public function getSpGroups($spEntityId, $vo)
+	public function getSpGroups($spEntityId)
 	{
 		$resources = $this->connector->searchForEntities($this->ldapBase,
 			"(&(objectClass=perunResource)(entityID=$spEntityId))",
@@ -109,15 +109,17 @@ public function getSpGroups($spEntityId, $vo)
 
 		$groups = array();
 		foreach ($resources as $resource) {
-			foreach ($resource['assignedGroupId'] as $groupId) {
-				$group = $this->connector->searchForEntity("perunGroupId=$groupId,perunVoId=" . $resource['perunVoId'][0] . "," . $this->ldapBase,
-					"(objectClass=perunGroup)",
-					array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
-				);
-				array_push($groups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunVoId'][0], $group['cn'], $group['perunUniqueGroupName'][0], $group['description'][0]));
+			if (isset($resource['assignedGroupId'])) {
+				foreach ($resource['assignedGroupId'] as $groupId) {
+					$group = $this->connector->searchForEntity("perunGroupId=$groupId,perunVoId=" . $resource['perunVoId'][0] . "," . $this->ldapBase,
+						"(objectClass=perunGroup)",
+						array("perunGroupId", "cn", "perunUniqueGroupName", "perunVoId", "description")
+					);
+					array_push($groups, new sspmod_perun_model_Group($group['perunGroupId'][0], $group['perunVoId'][0], $group['cn'], $group['perunUniqueGroupName'][0], $group['description'][0]));
+				}
 			}
-		}
 
+		}
 		$groups = $this->removeDuplicateEntities($groups);
 
 		return $groups;

lib/AdapterRpc.php

@@ -104,46 +104,37 @@ public function getMemberGroups($user, $vo)
 	}
 
 
-	public function getSpGroups($spEntityId, $vo)
+	public function getSpGroups($spEntityId)
 	{
-		$resources = $this->connector->get('resourcesManager', 'getResources', array(
-			'vo' => $vo->getId(),
+		$perunAttr = $this->connector->get('facilitiesManager', 'getFacilitiesByAttribute', array(
+			'attributeName' => 'urn:perun:facility:attribute-def:def:entityID',
+			'attributeValue' => $spEntityId,
+		))[0];
+		$facility = new sspmod_perun_model_Facility($perunAttr['id'], $perunAttr['name'], $perunAttr['description'], $spEntityId);
+
+		$perunAttrs = $this->connector->get('facilitiesManager', 'getAssignedResources', array(
+			'facility' => $facility->getId(),
 		));
 
-		$spFacilityIds = array();
-		$spResources = array();
-		foreach ($resources as $resource) {
-			if (!array_key_exists($resource['facilityId'], $spFacilityIds)) {
-				$attribute = $this->connector->get('attributesManager', 'getAttribute', array(
-					'facility' => $resource['facilityId'],
-					'attributeName' => 'urn:perun:facility:attribute-def:def:entityID',
-				));
-				if ($attribute['value'] === $spEntityId) {
-					$spFacilityIds[$resource['facilityId']] = true;
-				} else {
-					$spFacilityIds[$resource['facilityId']] = false;
-				}
-			}
-			if ($spFacilityIds[$resource['facilityId']]) {
-				array_push($spResources, $resource);
-			}
+		$resources = array();
+		foreach ($perunAttrs as $perunAttr) {
+			array_push($resources, new sspmod_perun_model_Resource($perunAttr['id'], $perunAttr['voId'], $perunAttr['facilityId'], $perunAttr['name']));
 		}
 
 		$spGroups = array();
-		foreach ($spResources as $spResource) {
-			$groups = $this->connector->get('resourcesManager', 'getAssignedGroups', array(
-				'resource' => $spResource['id'],
+		foreach ($resources as $resource) {
+			$groups = sspmod_perun_RpcConnector::get('resourcesManager', 'getAssignedGroups', array(
+				'resource' => $resource->getId(),
 			));
-			$convertedGroups = array();
+
 			foreach ($groups as $group) {
 				$attr = $this->connector->get('attributesManager', 'getAttribute', array(
 					'group' => $group['id'],
 					'attributeName' => 'urn:perun:group:attribute-def:virt:voShortName'
 				));
 				$uniqueName = $attr['value'] . ":" . $group['name'];
-				array_push($convertedGroups, new sspmod_perun_model_Group($group['id'], $group['voId'], $group['name'], $uniqueName, $group['description']));
+				array_push($spGroups, new sspmod_perun_model_Group($group['id'],$group['voId'], $group['name'], $uniqueName, $group['description']));
 			}
-			$spGroups = array_merge($spGroups, $convertedGroups);
 		}
 
 		$spGroups = $this->removeDuplicateEntities($spGroups);