From c82dc7029f9b63a29ae91510c5e0c884ed4b852a Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Mon, 3 Jun 2024 15:38:42 +0200
Subject: [PATCH] upgrade improvements for gateway device rate limits

---
 .../update/DefaultDataUpdateService.java      | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
index bb52445665..6636de3ff1 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/update/DefaultDataUpdateService.java
@@ -105,20 +105,35 @@ public class DefaultDataUpdateService implements DataUpdateService {
             var configurationOpt = tenantProfile.getProfileConfiguration();
             configurationOpt.ifPresent(configuration -> {
                 boolean updated = false;
-                if (configuration.getTransportDeviceMsgRateLimit() != null && configuration.getTransportGatewayMsgRateLimit() == null) {
-                    configuration.setTransportGatewayMsgRateLimit(configuration.getTransportDeviceMsgRateLimit());
-                    configuration.setTransportGatewayDeviceMsgRateLimit(configuration.getTransportDeviceMsgRateLimit());
-                    updated = true;
+                if (configuration.getTransportDeviceMsgRateLimit() != null) {
+                    if (configuration.getTransportGatewayMsgRateLimit() == null) {
+                        configuration.setTransportGatewayMsgRateLimit(configuration.getTransportDeviceMsgRateLimit());
+                        updated = true;
+                    }
+                    if (configuration.getTransportGatewayDeviceMsgRateLimit() == null) {
+                        configuration.setTransportGatewayDeviceMsgRateLimit(configuration.getTransportDeviceMsgRateLimit());
+                        updated = true;
+                    }
                 }
-                if (configuration.getTransportDeviceTelemetryMsgRateLimit() != null && configuration.getTransportGatewayTelemetryMsgRateLimit() == null) {
-                    configuration.setTransportGatewayTelemetryMsgRateLimit(configuration.getTransportDeviceTelemetryMsgRateLimit());
-                    configuration.setTransportGatewayDeviceTelemetryMsgRateLimit(configuration.getTransportDeviceTelemetryMsgRateLimit());
-                    updated = true;
+                if (configuration.getTransportDeviceTelemetryMsgRateLimit() != null) {
+                    if (configuration.getTransportGatewayTelemetryMsgRateLimit() == null) {
+                        configuration.setTransportGatewayTelemetryMsgRateLimit(configuration.getTransportDeviceTelemetryMsgRateLimit());
+                        updated = true;
+                    }
+                    if (configuration.getTransportGatewayDeviceTelemetryMsgRateLimit() == null) {
+                        configuration.setTransportGatewayDeviceTelemetryMsgRateLimit(configuration.getTransportDeviceTelemetryMsgRateLimit());
+                        updated = true;
+                    }
                 }
-                if (configuration.getTransportDeviceTelemetryDataPointsRateLimit() != null && configuration.getTransportGatewayTelemetryDataPointsRateLimit() == null) {
-                    configuration.setTransportGatewayTelemetryDataPointsRateLimit(configuration.getTransportDeviceTelemetryDataPointsRateLimit());
-                    configuration.setTransportGatewayDeviceTelemetryDataPointsRateLimit(configuration.getTransportDeviceTelemetryDataPointsRateLimit());
-                    updated = true;
+                if (configuration.getTransportDeviceTelemetryDataPointsRateLimit() != null) {
+                    if (configuration.getTransportGatewayTelemetryDataPointsRateLimit() == null) {
+                        configuration.setTransportGatewayTelemetryDataPointsRateLimit(configuration.getTransportDeviceTelemetryDataPointsRateLimit());
+                        updated = true;
+                    }
+                    if (configuration.getTransportGatewayDeviceTelemetryDataPointsRateLimit() == null) {
+                        configuration.setTransportGatewayDeviceTelemetryDataPointsRateLimit(configuration.getTransportDeviceTelemetryDataPointsRateLimit());
+                        updated = true;
+                    }
                 }
                 if (updated) {
                     try {