From 5f50fd44d2e6fbb53f4cab1a32bb52fc69748c35 Mon Sep 17 00:00:00 2001
From: Andrii Shvaika <ashvayka@thingsboard.io>
Date: Mon, 9 Nov 2020 14:06:20 +0200
Subject: [PATCH] Usage Records implementation

---
 .../server/controller/TenantController.java           |  2 ++
 .../apiusage/DefaultTbApiUsageStateService.java       |  9 +++++++--
 .../thingsboard/server/common/data/TenantProfile.java | 11 +++++++++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/controller/TenantController.java b/application/src/main/java/org/thingsboard/server/controller/TenantController.java
index 83e3d98b1b..a42cbb0f91 100644
--- a/application/src/main/java/org/thingsboard/server/controller/TenantController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/TenantController.java
@@ -93,6 +93,8 @@ public class TenantController extends BaseController {
             }
             tenantProfileCache.evict(tenant.getId());
             tbClusterService.onTenantChange(tenant, null);
+            tbClusterService.onEntityStateChange(tenant.getId(), tenant.getId(),
+                    newTenant ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
             return tenant;
         } catch (Exception e) {
             throw handleException(e);
diff --git a/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java b/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
index 42f980909a..2c8879ba94 100644
--- a/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/apiusage/DefaultTbApiUsageStateService.java
@@ -243,6 +243,7 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
 
     private void updateTenantState(TenantApiUsageState state, TenantProfile tenantProfile) {
         TenantProfileData oldProfileData = state.getTenantProfileData();
+        state.setTenantProfileId(tenantProfile.getId());
         state.setTenantProfileData(tenantProfile.getProfileData());
         Map<ApiFeature, Boolean> result = state.checkStateUpdatedDueToThresholds();
         if (!result.isEmpty()) {
@@ -257,8 +258,10 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
         long ts = System.currentTimeMillis();
         List<TsKvEntry> profileThresholds = new ArrayList<>();
         for (ApiUsageRecordKey key : ApiUsageRecordKey.values()) {
-            if (oldData == null || oldData.getProfileThreshold(key) != newData.getProfileThreshold(key)) {
-                profileThresholds.add(new BasicTsKvEntry(ts, new LongDataEntry(key.getApiLimitKey(), newData.getProfileThreshold(key))));
+            long newProfileThreshold = newData.getProfileThreshold(key);
+            if (oldData == null || oldData.getProfileThreshold(key) != newProfileThreshold) {
+                log.info("[{}] Updating profile threshold [{}]:[{}]", tenantId, key, newProfileThreshold);
+                profileThresholds.add(new BasicTsKvEntry(ts, new LongDataEntry(key.getApiLimitKey(), newProfileThreshold)));
             }
         }
         if (!profileThresholds.isEmpty()) {
@@ -267,6 +270,7 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
     }
 
     private void persistAndNotify(TenantApiUsageState state, Map<ApiFeature, Boolean> result) {
+        log.info("[{}] Detected update of the API state: {}", state.getTenantId(), result);
         apiUsageStateService.update(state.getApiUsageState());
         clusterService.onApiStateChange(state.getApiUsageState(), null);
         long ts = System.currentTimeMillis();
@@ -320,6 +324,7 @@ public class DefaultTbApiUsageStateService implements TbApiUsageStateService {
                         }
                     }
                 }
+                log.debug("[{}] Initialized state: {}", tenantId, dbStateEntity);
                 myTenantStates.put(tenantId, tenantState);
             } catch (InterruptedException | ExecutionException e) {
                 log.warn("[{}] Failed to fetch api usage state from db.", tenantId, e);
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java b/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
index 5e5f4a09de..acb9c239b8 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
@@ -21,6 +21,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.server.common.data.id.TenantProfileId;
+import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
 import org.thingsboard.server.common.data.tenant.profile.TenantProfileData;
 
 import java.io.ByteArrayInputStream;
@@ -79,15 +80,21 @@ public class TenantProfile extends SearchTextBased<TenantProfileId> implements H
                     profileData = mapper.readValue(new ByteArrayInputStream(profileDataBytes), TenantProfileData.class);
                 } catch (IOException e) {
                     log.warn("Can't deserialize tenant profile data: ", e);
-                    return null;
+                    return createDefaultTenantProfileData();
                 }
                 return profileData;
             } else {
-                return null;
+                return createDefaultTenantProfileData();
             }
         }
     }
 
+    public TenantProfileData createDefaultTenantProfileData() {
+        TenantProfileData tpd = new TenantProfileData();
+        tpd.setConfiguration(new DefaultTenantProfileConfiguration());
+        return tpd;
+    }
+
     public void setProfileData(TenantProfileData data) {
         this.profileData = data;
         try {