Was added checks on entity-views obj fiew method for fetch update queries startTs & entdTs and other

viktorbasanets
1 parent ad48ecab
Showing 1 changed file with 81 additions and 5 deletions
dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
--- a/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
View file @66b3302
+++ b/dao/src/main/java/org/thingsboard/server/dao/timeseries/BaseTimeseriesService.java
View file @66b3302
 /**
  * Copyright © 2016-2018 The Thingsboard Authors
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,12 +21,18 @@ import com.google.common.util.concurrent.ListenableFuture;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.EntityViewId;
+import org.thingsboard.server.common.data.kv.BaseTsKvQuery;
 import org.thingsboard.server.common.data.kv.TsKvEntry;
 import org.thingsboard.server.common.data.kv.TsKvQuery;
+import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.service.Validator;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -44,10 +50,17 @@ public class BaseTimeseriesService implements TimeseriesService {
     @Autowired
     private TimeseriesDao timeseriesDao;
+    @Autowired
+    private EntityViewService entityViewService;
+
     @Override
     public ListenableFuture<List<TsKvEntry>> findAll(EntityId entityId, List<TsKvQuery> queries) {
         validate(entityId);
         queries.forEach(query -> validate(query));
+        if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
+            EntityView entityView = entityViewService.findEntityViewById((EntityViewId) entityId);
+            return timeseriesDao.findAllAsync(entityView.getEntityId(), updateQueriesForEntityView(entityView, queries));
+        }
         return timeseriesDao.findAllAsync(entityId, queries);
     }
@@ -56,7 +69,13 @@ public class BaseTimeseriesService implements TimeseriesService {
         validate(entityId);
         List<ListenableFuture<TsKvEntry>> futures = Lists.newArrayListWithExpectedSize(keys.size());
         keys.forEach(key -> Validator.validateString(key, "Incorrect key " + key));
-        keys.forEach(key -> futures.add(timeseriesDao.findLatest(entityId, key)));
+        if (false/*entityId.getEntityType().equals(EntityType.ENTITY_VIEW)*/) {
+            EntityView entityView = entityViewService.findEntityViewById((EntityViewId) entityId);
+            Collection<String> newKeys = chooseKeysForEntityView(entityView, keys);
+            newKeys.forEach(newKey -> futures.add(timeseriesDao.findLatest(entityView.getEntityId(), newKey)));
+        } else {
+            keys.forEach(key -> futures.add(timeseriesDao.findLatest(entityId, key)));
+        }
         return Futures.allAsList(futures);
     }
@@ -69,6 +88,11 @@ public class BaseTimeseriesService implements TimeseriesService {
     @Override
     public ListenableFuture<List<Void>> save(EntityId entityId, TsKvEntry tsKvEntry) {
         validate(entityId);
+        try {
+            checkForNonEntityView(entityId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         if (tsKvEntry == null) {
             throw new IncorrectParameterException("Key value entry can't be null");
         }
@@ -79,6 +103,11 @@ public class BaseTimeseriesService implements TimeseriesService {
     @Override
     public ListenableFuture<List<Void>> save(EntityId entityId, List<TsKvEntry> tsKvEntries, long ttl) {
+        try {
+            checkForNonEntityView(entityId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         List<ListenableFuture<Void>> futures = Lists.newArrayListWithExpectedSize(tsKvEntries.size() * INSERTS_PER_ENTRY);
         for (TsKvEntry tsKvEntry : tsKvEntries) {
             if (tsKvEntry == null) {
@@ -90,11 +119,47 @@ public class BaseTimeseriesService implements TimeseriesService {
     }
     private void saveAndRegisterFutures(List<ListenableFuture<Void>> futures, EntityId entityId, TsKvEntry tsKvEntry, long ttl) {
+        try {
+            checkForNonEntityView(entityId);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         futures.add(timeseriesDao.savePartition(entityId, tsKvEntry.getTs(), tsKvEntry.getKey(), ttl));
         futures.add(timeseriesDao.saveLatest(entityId, tsKvEntry));
         futures.add(timeseriesDao.save(entityId, tsKvEntry, ttl));
     }
+    private List<TsKvQuery> updateQueriesForEntityView(EntityView entityView, List<TsKvQuery> queries) {
+        List<TsKvQuery> newQueries = new ArrayList<>();
+        entityView.getKeys().getTimeseries()
+                .forEach(viewKey -> queries
+                        .forEach(query -> {
+                            if (query.getKey().equals(viewKey)) {
+                                if (entityView.getStartTs() == 0 && entityView.getEndTs() == 0) {
+                                    newQueries.add(updateQuery(query.getStartTs(), query.getEndTs(), viewKey, query));
+                                } else if (entityView.getStartTs() == 0 && entityView.getEndTs() != 0) {
+                                    newQueries.add(updateQuery(query.getStartTs(), entityView.getEndTs(), viewKey, query));
+                                } else if (entityView.getStartTs() != 0 && entityView.getEndTs() == 0) {
+                                    newQueries.add(updateQuery(entityView.getStartTs(), query.getEndTs(), viewKey, query));
+                                } else {
+                                    newQueries.add(updateQuery(entityView.getStartTs(), entityView.getEndTs(), viewKey, query));
+                                }
+                            }}));
+        return newQueries;
+    }
+
+    @Deprecated /*Will be a modified*/
+    private Collection<String> chooseKeysForEntityView(EntityView entityView, Collection<String> keys) {
+        Collection<String> newKeys = new ArrayList<>();
+        entityView.getKeys().getTimeseries()
+                .forEach(viewKey -> keys
+                        .forEach(key -> {
+                            if (key.equals(viewKey)) {
+                                newKeys.add(key);
+                            }}));
+        return newKeys;
+    }
+
     private static void validate(EntityId entityId) {
         Validator.validateEntityId(entityId, "Incorrect entityId " + entityId);
     }
@@ -108,4 +173,15 @@ public class BaseTimeseriesService implements TimeseriesService {
             throw new IncorrectParameterException("Incorrect TsKvQuery. Aggregation can't be empty");
         }
     }
+
+    private static TsKvQuery updateQuery(Long startTs, Long endTs, String viewKey, TsKvQuery query) {
+        return startTs <= query.getStartTs() && endTs >= query.getEndTs() ? query :
+                new BaseTsKvQuery(viewKey, startTs, endTs, query.getInterval(), query.getLimit(), query.getAggregation());
+    }
+
+    private static void checkForNonEntityView(EntityId entityId) throws Exception {
+        if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
+            throw new Exception("Entity-views were read only");
+        }
+    }
 }