add gid to ApplicationQuery

Thomas · ludomikula · commit 62c3d3c52f19 · 2024-07-03T16:33:01.000+02:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
@@ -132,7 +132,7 @@ public boolean agencyProfile() {
     public ApplicationQuery getQueryByViewModeAndQueryId(boolean isViewMode, String queryId) {
         return (isViewMode ? getLiveQueries() : getEditingQueries())
                 .stream()
-                .filter(query -> queryId.equals(query.getId()))
+                .filter(query -> queryId.equals(query.getId()) || queryId.equals(query.getGid()))
                 .findFirst()
                 .orElseThrow(() -> new BizException(BizError.QUERY_NOT_FOUND, "LIBRARY_QUERY_NOT_FOUND"));
     }
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQuery.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/query/model/ApplicationQuery.java
@@ -17,6 +17,8 @@ public class ApplicationQuery {
 
     private final String id;
 
+    private final String gid;
+
     private final String name;
 
     private final BaseQuery baseQuery;
@@ -27,13 +29,15 @@ public class ApplicationQuery {
 
     @JsonCreator
     public ApplicationQuery(@JsonProperty("id") String id,
+            @JsonProperty("gid") String gid,
             @JsonProperty("name") String name,
             @JsonProperty("datasourceId") String datasourceId,
             @JsonProperty("comp") Map<String, Object> queryConfig,
             @JsonProperty("triggerType") String triggerType,
             @JsonProperty("timeout") String timeoutStr,
             @JsonProperty("compType") String compType) {
         this.id = id;
+        this.gid = gid;
         this.name = name;
         this.triggerType = triggerType;
         this.timeoutStr = timeoutStr;

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public boolean agencyProfile() {`
`132`	`132`	`public ApplicationQuery getQueryByViewModeAndQueryId(boolean isViewMode, String queryId) {`
`133`	`133`	`return (isViewMode ? getLiveQueries() : getEditingQueries())`
`134`	`134`	`.stream()`
`135`		`- .filter(query -> queryId.equals(query.getId()))`
	`135`	`+ .filter(query -> queryId.equals(query.getId()) \|\| queryId.equals(query.getGid()))`
`136`	`136`	`.findFirst()`
`137`	`137`	`.orElseThrow(() -> new BizException(BizError.QUERY_NOT_FOUND, "LIBRARY_QUERY_NOT_FOUND"));`
`138`	`138`	`}`