Merge branch 'master' into 'master'

Remove duplicates in getApplications API

Closes product-iots#342

See merge request entgra/carbon-device-mgt!467
feature/appm-store/pbac
Dharmakeerthi Lasantha 5 years ago
commit d8d0530943

@ -277,9 +277,9 @@ public class ApplicationDAOImpl implements ApplicationDAO {
throws DeviceManagementDAOException { throws DeviceManagementDAOException {
List<Application> applications = new ArrayList<>(); List<Application> applications = new ArrayList<>();
Application application; Application application;
String sql = "Select " + String sql = "SELECT " +
"ID," + "ID, " +
" NAME, " + "NAME, " +
"APP_IDENTIFIER, " + "APP_IDENTIFIER, " +
"PLATFORM, " + "PLATFORM, " +
"CATEGORY, " + "CATEGORY, " +
@ -291,9 +291,15 @@ public class ApplicationDAOImpl implements ApplicationDAO {
"MEMORY_USAGE, " + "MEMORY_USAGE, " +
"IS_ACTIVE, " + "IS_ACTIVE, " +
"TENANT_ID " + "TENANT_ID " +
"From DM_APPLICATION " + "FROM DM_APPLICATION " +
"WHERE PLATFORM = ? " + "WHERE NOT EXISTS " +
"AND TENANT_ID = ? LIMIT ? OFFSET ?"; "(SELECT " +
"ID " +
"FROM DM_APPLICATION A " +
"WHERE A.NAME = DM_APPLICATION.NAME " +
"AND A.ID < DM_APPLICATION.ID) " +
"AND PLATFORM = ? " +
"AND TENANT_ID = ? LIMIT ? OFFSET ?";
try { try {
Connection conn = this.getConnection(); Connection conn = this.getConnection();
try (PreparedStatement stmt = conn.prepareStatement(sql)) { try (PreparedStatement stmt = conn.prepareStatement(sql)) {

Loading…
Cancel
Save