From 933d1447d2cef1f0c82c90a3e19c942d43c59543 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Tue, 14 Jan 2025 12:08:53 +0100
Subject: [PATCH] refactoring due to comments (removed serviceId duplications
 in ToUsageStatsServiceMsgPack)

---
 .../service/apiusage/DefaultTbApiUsageStateService.java    | 7 ++++---
 common/proto/src/main/proto/queue.proto                    | 2 +-
 .../queue/usagestats/DefaultTbApiUsageReportClient.java    | 3 +--
 3 files changed, 6 insertions(+), 6 deletions(-)

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 803d85b57a..0cc02e5cf4 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
@@ -157,11 +157,12 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
 
     @Override
     public void process(TbProtoQueueMsg<ToUsageStatsServiceMsgPack> msgPack, TbCallback callback) {
-        msgPack.getValue().getMsgsList().forEach(this::process);
+        String serviceId = msgPack.getValue().getServiceId();
+        msgPack.getValue().getMsgsList().forEach(msg -> process(msg, serviceId));
         callback.onSuccess();
     }
 
-    private void process(ToUsageStatsServiceMsg statsMsg) {
+    private void process(ToUsageStatsServiceMsg statsMsg, String serviceId) {
         TenantId tenantId = TenantId.fromUUID(new UUID(statsMsg.getTenantIdMSB(), statsMsg.getTenantIdLSB()));
         EntityId ownerId;
         if (statsMsg.getCustomerIdMSB() != 0 && statsMsg.getCustomerIdLSB() != 0) {
@@ -170,7 +171,7 @@ public class DefaultTbApiUsageStateService extends AbstractPartitionBasedService
             ownerId = tenantId;
         }
 
-        processEntityUsageStats(tenantId, ownerId, statsMsg.getValuesList(), statsMsg.getServiceId());
+        processEntityUsageStats(tenantId, ownerId, statsMsg.getValuesList(), serviceId);
     }
 
     private void processEntityUsageStats(TenantId tenantId, EntityId ownerId, List<UsageStatsKVProto> values, String serviceId) {
diff --git a/common/proto/src/main/proto/queue.proto b/common/proto/src/main/proto/queue.proto
index 3541654b73..0e318c3b30 100644
--- a/common/proto/src/main/proto/queue.proto
+++ b/common/proto/src/main/proto/queue.proto
@@ -1615,11 +1615,11 @@ message ToUsageStatsServiceMsg {
   repeated UsageStatsKVProto values = 5;
   int64 customerIdMSB = 6;
   int64 customerIdLSB = 7;
-  string serviceId = 8;
 }
 
 message ToUsageStatsServiceMsgPack {
   repeated ToUsageStatsServiceMsg msgs = 1;
+  string serviceId = 2;
 }
 
 message ToOtaPackageStateServiceMsg {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java b/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java
index e667256e06..8c0439362b 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/usagestats/DefaultTbApiUsageReportClient.java
@@ -115,7 +115,6 @@ public class DefaultTbApiUsageReportClient implements TbApiUsageReportClient {
                         newStatsMsg.setCustomerIdLSB(customerId.getId().getLeastSignificantBits());
                     }
 
-                    newStatsMsg.setServiceId(serviceInfoProvider.getServiceId());
                     return newStatsMsg;
                 });
 
@@ -124,7 +123,6 @@ public class DefaultTbApiUsageReportClient implements TbApiUsageReportClient {
                         .setValue(value);
                 statsMsg.addValues(statsItem.build());
             });
-            statsForKey.clear();
         }
 
         Map<TopicPartitionInfo, List<ToUsageStatsServiceMsg>> reportStatsPerTpi = new HashMap<>();
@@ -160,6 +158,7 @@ public class DefaultTbApiUsageReportClient implements TbApiUsageReportClient {
                 .map(partition ->
                         ToUsageStatsServiceMsgPack.newBuilder()
                                 .addAllMsgs(partition)
+                                .setServiceId(serviceInfoProvider.getServiceId())
                                 .build())
                 .toList();
     }