From 6c8887995a9b5de7beb3ae1243c6dc9e45bda120 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Tue, 25 Feb 2025 13:23:26 +0200
Subject: [PATCH] fixed license, included edqs tests to test suite

---
 docker/docker-compose.edqs.yml                 |  2 +-
 edqs/src/main/conf/edqs.conf                   |  2 +-
 edqs/src/main/conf/logback.xml                 |  2 +-
 .../server/msa/ContainerTestSuite.java         |  3 ++-
 .../thingsboard/server/msa/TestRestClient.java | 10 +++++++---
 .../msa/edqs/EdqsEntityDataQueryTest.java      | 18 +++++++++++-------
 msa/black-box-tests/src/test/resources/all.xml | 10 ++++++++++
 msa/edqs/docker/Dockerfile                     |  2 +-
 msa/edqs/docker/start-tb-edqs.sh               |  2 +-
 msa/edqs/pom.xml                               |  2 +-
 10 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/docker/docker-compose.edqs.yml b/docker/docker-compose.edqs.yml
index 3a01a3c970..c50740faeb 100644
--- a/docker/docker-compose.edqs.yml
+++ b/docker/docker-compose.edqs.yml
@@ -1,5 +1,5 @@
 #
-# Copyright © 2016-2024 The Thingsboard Authors
+# Copyright © 2016-2025 The Thingsboard Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/edqs/src/main/conf/edqs.conf b/edqs/src/main/conf/edqs.conf
index ae880ef7e8..3f96fd590d 100644
--- a/edqs/src/main/conf/edqs.conf
+++ b/edqs/src/main/conf/edqs.conf
@@ -1,5 +1,5 @@
 #
-# Copyright © 2016-2024 The Thingsboard Authors
+# Copyright © 2016-2025 The Thingsboard Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/edqs/src/main/conf/logback.xml b/edqs/src/main/conf/logback.xml
index 4ff57d48ab..850a28b212 100644
--- a/edqs/src/main/conf/logback.xml
+++ b/edqs/src/main/conf/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-    Copyright © 2016-2024 The Thingsboard Authors
+    Copyright © 2016-2025 The Thingsboard Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
index a3c1e62ea3..52ec50723d 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/ContainerTestSuite.java
@@ -165,7 +165,8 @@ public class ContainerTestSuite {
 
             // to trigger edqs synchronization
             addToFile(targetDir, "tb-node.env",
-                    Map.of("TB_EDQS_SYNC_ENABLED", "true"));
+                    Map.of("TB_EDQS_SYNC_ENABLED", "true",
+                            "TB_EDQS_API_ENABLED", "true"));
 
             testContainer = new DockerComposeContainerImpl<>(composeFiles)
                     .withPull(false)
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
index 9763b51e1b..ed4b54f2fc 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/TestRestClient.java
@@ -28,7 +28,6 @@ import io.restassured.internal.ValidatableResponseImpl;
 import io.restassured.path.json.JsonPath;
 import io.restassured.response.ValidatableResponse;
 import io.restassured.specification.RequestSpecification;
-import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
 import org.thingsboard.server.common.data.Device;
@@ -114,6 +113,11 @@ public class TestRestClient {
         requestSpec.header(JWT_TOKEN_HEADER_PARAM, "Bearer " + token);
     }
 
+    public void resetToken() {
+        token = null;
+        refreshToken = null;
+    }
+
     public Tenant postTenant(Tenant tenant) {
         return given().spec(requestSpec).body(tenant)
                 .post("/api/tenant")
@@ -494,11 +498,11 @@ public class TestRestClient {
 
     public UserId createUserAndLogin(User user, String password) {
         UserId userId = postUser(user).getId();
-        getUserToken(userId.getId().toString());
+        getAndSetUserToken(userId.getId().toString());
         return userId;
     }
 
-    public void getUserToken(String id) {
+    public void getAndSetUserToken(String id) {
         ObjectNode tokenInfo = given().spec(requestSpec)
                 .get("/api/user/" + id + "/token")
                 .then()
diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
index 55a5f11821..6c0a507431 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/edqs/EdqsEntityDataQueryTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2016-2024 The Thingsboard Authors
+ * Copyright © 2016-2025 The Thingsboard Authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultCustom
 import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultDeviceProfile;
 import static org.thingsboard.server.msa.ui.utils.EntityPrototypes.defaultTenantAdmin;
 
+@DisableUIListeners
 public class EdqsEntityDataQueryTest extends AbstractContainerTest {
 
     private TenantId tenantId;
@@ -70,7 +71,7 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
     @BeforeClass
     public void beforeClass() throws Exception {
         testRestClient.login("sysadmin@thingsboard.org", "sysadmin");
-        await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> testRestClient.isEdqsApiEnabled());
+        await().atMost(60, TimeUnit.SECONDS).until(() -> testRestClient.isEdqsApiEnabled());
 
         tenantId = testRestClient.postTenant(EntityPrototypes.defaultTenantPrototype("Tenant")).getId();
         tenantAdminId = testRestClient.createUserAndLogin(defaultTenantAdmin(tenantId, "tenantAdmin@thingsboard.org"), "tenant");
@@ -97,6 +98,7 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
 
     @AfterClass
     public void afterClass() {
+        testRestClient.resetToken();
         testRestClient.login("sysadmin@thingsboard.org", "sysadmin");
         testRestClient.deleteTenant(tenantId);
         testRestClient.deleteTenant(tenantId2);
@@ -111,13 +113,14 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
                 .atMost(30, TimeUnit.SECONDS)
                 .until(() -> testRestClient.postCountDataQuery(query).compareTo(97L * 2) >= 0);
 
-        testRestClient.getUserToken(tenantAdminId.getId().toString());
+        testRestClient.getAndSetUserToken(tenantAdminId.getId().toString());
         await("Waiting for total device count")
                 .atMost(30, TimeUnit.SECONDS)
                 .until(() -> testRestClient.postCountDataQuery(query).equals(97L));
 
+        testRestClient.resetToken();
         testRestClient.login("sysadmin@thingsboard.org", "sysadmin");
-        testRestClient.getUserToken(tenant2AdminId.getId().toString());
+        testRestClient.getAndSetUserToken(tenant2AdminId.getId().toString());
         await("Waiting for total device count")
                 .atMost(30, TimeUnit.SECONDS)
                 .until(() -> testRestClient.postCountDataQuery(query).equals(97L));
@@ -126,16 +129,17 @@ public class EdqsEntityDataQueryTest extends AbstractContainerTest {
     @Test
     public void testRetrieveTenantDevicesByDeviceTypeFilter() {
         // login tenant admin
-        testRestClient.getUserToken(tenantAdminId.getId().toString());
+        testRestClient.getAndSetUserToken(tenantAdminId.getId().toString());
         checkUserDevices(tenantDevices);
 
         // login customer user
-        testRestClient.getUserToken(customerUserId.getId().toString());
+        testRestClient.getAndSetUserToken(customerUserId.getId().toString());
         checkUserDevices(tenantDevices.subList(0, 12));
 
         // login other tenant admin
+        testRestClient.resetToken();
         testRestClient.login("sysadmin@thingsboard.org", "sysadmin");
-        testRestClient.getUserToken(tenant2AdminId.getId().toString());
+        testRestClient.getAndSetUserToken(tenant2AdminId.getId().toString());
         checkUserDevices(tenant2Devices);
     }
 
diff --git a/msa/black-box-tests/src/test/resources/all.xml b/msa/black-box-tests/src/test/resources/all.xml
index 6a34467930..c1b005989e 100644
--- a/msa/black-box-tests/src/test/resources/all.xml
+++ b/msa/black-box-tests/src/test/resources/all.xml
@@ -87,4 +87,14 @@
             <package name="org.thingsboard.server.msa.ui.tests.alarmassignee.*"/>
         </packages>
     </test>
+    <test name="Edqs tests">
+        <groups>
+            <run>
+                <exclude name="broken"/>
+            </run>
+        </groups>
+        <packages>
+            <package name="org.thingsboard.server.msa.edqs.*"/>
+        </packages>
+    </test>
 </suite>
\ No newline at end of file
diff --git a/msa/edqs/docker/Dockerfile b/msa/edqs/docker/Dockerfile
index e634029bbf..e9099c09c5 100644
--- a/msa/edqs/docker/Dockerfile
+++ b/msa/edqs/docker/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Copyright © 2016-2024 The Thingsboard Authors
+# Copyright © 2016-2025 The Thingsboard Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/msa/edqs/docker/start-tb-edqs.sh b/msa/edqs/docker/start-tb-edqs.sh
index bdd1ee48d3..deb0f70eff 100755
--- a/msa/edqs/docker/start-tb-edqs.sh
+++ b/msa/edqs/docker/start-tb-edqs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright © 2016-2024 The Thingsboard Authors
+# Copyright © 2016-2025 The Thingsboard Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/msa/edqs/pom.xml b/msa/edqs/pom.xml
index 7e7a244cc2..f22cb0187c 100644
--- a/msa/edqs/pom.xml
+++ b/msa/edqs/pom.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright © 2016-2024 The Thingsboard Authors
+    Copyright © 2016-2025 The Thingsboard Authors
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.