Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added support for ids to UserQuery

Rich Turner5274500e051d
diff --git a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
index 8127a3021..153c51a21 100644
--- a/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
+++ b/manager/src/main/java/org/openremote/manager/security/ManagerKeycloakIdentityProvider.java
@@ -179,6 +179,16 @@ public class ManagerKeycloakIdentityProvider extends KeycloakIdentityProvider im
sb.append(" AND ?").append(parameters.size() + 1).append(" <@ get_asset_tree_path(ua.asset_id)");
parameters.add(query.pathPredicate.path);
}
+ if (query.ids != null && query.ids.length > 0) {
+ sb.append(" AND u.id IN (?");
+ parameters.add(query.ids[0]);
+
+ for (int i = 1; i < query.ids.length; i++) {
+ sb.append(",?");
+ parameters.add(query.ids[i]);
+ }
+ sb.append(")");
+ }
return sb.toString();
}
diff --git a/model/src/main/java/org/openremote/model/query/AssetQuery.java b/model/src/main/java/org/openremote/model/query/AssetQuery.java
index 40db5d34e..aefa1bc22 100644
--- a/model/src/main/java/org/openremote/model/query/AssetQuery.java
+++ b/model/src/main/java/org/openremote/model/query/AssetQuery.java
@@ -426,7 +426,7 @@ public class AssetQuery {
public String toString() {
return getClass().getSimpleName() + "{" +
"select=" + select +
- ", id='" + ids + '\'' +
+ ", ids=" + (ids != null ? Arrays.toString(ids) : "null") +
", name=" + names +
", parent=" + parents +
", path=" + paths +
diff --git a/model/src/main/java/org/openremote/model/query/UserQuery.java b/model/src/main/java/org/openremote/model/query/UserQuery.java
index 74f793559..095874005 100644
--- a/model/src/main/java/org/openremote/model/query/UserQuery.java
+++ b/model/src/main/java/org/openremote/model/query/UserQuery.java
@@ -5,12 +5,15 @@ import org.openremote.model.query.filter.PathPredicate;
import org.openremote.model.query.filter.TenantPredicate;
import org.openremote.model.query.filter.UserAssetPredicate;
+import java.util.Arrays;
+
public class UserQuery {
// Restriction predicates
public TenantPredicate tenantPredicate;
public UserAssetPredicate assetPredicate;
public PathPredicate pathPredicate;
+ public String[] ids;
public int limit;
public UserQuery() {
@@ -31,6 +34,11 @@ public class UserQuery {
return this;
}
+ public UserQuery ids(String...ids) {
+ this.ids = ids;
+ return this;
+ }
+
public UserQuery limit(int limit) {
this.limit = limit;
return this;
@@ -42,6 +50,7 @@ public class UserQuery {
"tenantPredicate=" + tenantPredicate +
", assetPredicate=" + assetPredicate +
", pathPredicate=" + pathPredicate +
+ ", ids=" + (ids != null ? Arrays.toString(ids) : "null") +
", limit=" + limit +
'}';
}