refactor: optimize conditinos of queryFacadeImpl (traas-stack#507)

sw1136562366 · Jun 15, 2023 · 44b8a1c · 44b8a1c
1 parent a1dec14
commit 44b8a1c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.../home-service/src/main/java/io/holoinsight/server/home/biz/service/TenantInitService.java b/.../home-service/src/main/java/io/holoinsight/server/home/biz/service/TenantInitService.java
@@ -59,7 +59,7 @@ public interface TenantInitService {
    */
   String getTsdbTenant(String tenant);
 
-  Boolean checkConditions(String workspace, List<QueryFilter> filters);
+  Boolean checkConditions(String workspace, String metric, List<QueryFilter> filters);
 
 
   /**

diff --git a/...c/main/java/io/holoinsight/server/home/biz/service/impl/DefaultTenantInitServiceImpl.java b/...c/main/java/io/holoinsight/server/home/biz/service/impl/DefaultTenantInitServiceImpl.java
@@ -51,7 +51,7 @@ public String getTsdbTenant(String tenant) {
   }
 
   @Override
-  public Boolean checkConditions(String workspace, List<QueryFilter> filters) {
+  public Boolean checkConditions(String workspace, String metric, List<QueryFilter> filters) {
     return true;
   }
 

diff --git a/...ome/home-web/src/main/java/io/holoinsight/server/home/web/controller/QueryFacadeImpl.java b/...ome/home-web/src/main/java/io/holoinsight/server/home/web/controller/QueryFacadeImpl.java
@@ -460,8 +460,8 @@ public QueryProto.QueryRequest convertRequest(DataQueryRequest request) {
 
       QueryProto.Datasource.Builder datasourceBuilder = QueryProto.Datasource.newBuilder();
       toProtoBean(datasourceBuilder, d);
-      Boolean aBoolean =
-          tenantInitService.checkConditions(ms.getWorkspace(), datasourceBuilder.getFiltersList());
+      Boolean aBoolean = tenantInitService.checkConditions(ms.getWorkspace(),
+          datasourceBuilder.getMetric(), datasourceBuilder.getFiltersList());
       if (!aBoolean) {
         throw new MonitorException("workspace is illegal");
       }