You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/02/23 21:13:05 UTC
airavata git commit: fixing parentEntityId search issue
Repository: airavata
Updated Branches:
refs/heads/develop 6931cd3c6 -> deda93758
fixing parentEntityId search issue
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/deda9375
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/deda9375
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/deda9375
Branch: refs/heads/develop
Commit: deda93758c3d3018d98f1dbbd2256afcc6c60550
Parents: 6931cd3
Author: scnakandala <su...@gmail.com>
Authored: Thu Feb 23 16:13:00 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Feb 23 16:13:00 2017 -0500
----------------------------------------------------------------------
.../sharing/registry/db/repositories/EntityRepository.java | 6 ++++--
.../sharing/registry/server/SharingRegistryServerHandler.java | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/deda9375/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
index a221fb6..4cf06f7 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/EntityRepository.java
@@ -42,8 +42,9 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
super(Entity.class, EntityEntity.class);
}
- public List<Entity> getChildEntities(String parentId) throws SharingRegistryException {
+ public List<Entity> getChildEntities(String domainId, String parentId) throws SharingRegistryException {
HashMap<String, String> filters = new HashMap<>();
+ filters.put(DBConstants.EntityTable.DOMAIN_ID, domainId);
filters.put(DBConstants.EntityTable.PARENT_ENTITY_ID, parentId);
return select(filters, 0, -1);
}
@@ -72,7 +73,8 @@ public class EntityRepository extends AbstractRepository<Entity, EntityEntity, E
if (searchCriteria.getSearchCondition() != null && searchCriteria.getSearchCondition().equals(SearchCondition.NOT)) {
query += "S.PERMISSION_TYPE_ID != '" + searchCriteria.getValue() + "' AND ";
} else {
- query += "S.PERMISSION_TYPE_ID = '" + searchCriteria.getValue() + "' AND ";
+ query += "S.PERMISSION_TYPE_ID IN ('" + searchCriteria.getValue() + "', '"
+ + (new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId) + "') AND ";
}
}else if(searchCriteria.getSearchField().equals(EntitySearchField.FULL_TEXT)){
try {
http://git-wip-us.apache.org/repos/asf/airavata/blob/deda9375/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
index de6dd80..5a222ce 100644
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
@@ -779,7 +779,7 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
if(cascadePermission){
//Adding permission for the specified users/groups for all child entities
- (new EntityRepository()).getChildEntities(entityId).stream().forEach(e-> temp.addLast(e));
+ (new EntityRepository()).getChildEntities(domainId, entityId).stream().forEach(e -> temp.addLast(e));
while(temp.size() > 0){
Entity entity = temp.pop();
String childEntityId = entity.entityId;
@@ -795,7 +795,7 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac
sharing.setCreatedTime(System.currentTimeMillis());
sharing.setUpdatedTime(System.currentTimeMillis());
sharings.add(sharing);
- (new EntityRepository()).getChildEntities(childEntityId).stream().forEach(e-> temp.addLast(e));
+ (new EntityRepository()).getChildEntities(domainId, childEntityId).stream().forEach(e -> temp.addLast(e));
}
}
}