Changing the data type of DESCRIPTION from VARCHAR to TEXT

Reviewed-on: community/device-mgt-core#291

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/grafana-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>analytics-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/analytics-mgt/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.analytics.extension/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.annotations/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.extension.rest.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.api/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/apimgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.common/src/main/java/io/entgra/device/mgt/core/application/mgt/common/Filter.java

@@ -113,6 +113,11 @@ public class Filter {
      */
     private String favouredBy;
 
+    /**
+     * Checking if retired apps needs to be excluded
+     */
+    private boolean isNotRetired;
+
     public int getLimit() {
         return limit;
     }
@@ -208,4 +213,12 @@ public class Filter {
     public void setFavouredBy(String favouredBy) {
         this.favouredBy = favouredBy;
     }
+
+    public boolean isNotRetired() {
+        return isNotRetired;
+    }
+
+    public void setNotRetired(boolean notRetired) {
+        isNotRetired = notRetired;
+    }
 }

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java

@@ -180,6 +180,9 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         if (deviceTypeId != -1) {
             sql += "AND AP_APP.DEVICE_TYPE_ID = ? ";
         }
+        if (filter.isNotRetired()) {
+            sql +=  "AND AP_APP.STATUS != 'RETIRED' ";
+        }
         sql += "GROUP BY AP_APP.ID ORDER BY AP_APP.ID ";
         if (StringUtils.isNotEmpty(filter.getSortBy())) {
             sql += filter.getSortBy() +" ";
@@ -308,6 +311,9 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
         if (deviceTypeId != -1) {
             sql += " AND AP_APP.DEVICE_TYPE_ID = ?";
         }
+        if (filter.isNotRetired()) {
+            sql +=  " AND AP_APP.STATUS != 'RETIRED'";
+        }
 
         try {
             conn = this.getDBConnection();

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/impl/SubscriptionManagerImpl.java

@@ -177,6 +177,8 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         try {
             // Only for iOS devices
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
+            // Ignore checking device type if app is a web clip
+            if(!applicationDTO.getType().equals("WEB_CLIP")){
                 if (DeviceTypes.IOS.toString().equalsIgnoreCase(APIUtil.getDeviceTypeData(applicationDTO
                         .getDeviceTypeId()).getName())) {
                     // TODO: replace getAssetByAppId with the correct one in DAO
@@ -196,6 +198,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
                         vppManager.addAssociation(storedAsset, users);
                     }
                 }
+            }
         } catch (BadRequestException e) {
             String msg = "Device Type not found";
             log.error(msg, e);

components/application-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/AbstractCertificateDAOImpl.java

@@ -53,8 +53,8 @@ public abstract class AbstractCertificateDAOImpl implements CertificateDAO{
         try {
             conn = this.getConnection();
             stmt = conn.prepareStatement(
-                    "INSERT INTO DM_DEVICE_CERTIFICATE (SERIAL_NUMBER, CERTIFICATE, TENANT_ID, USERNAME)"
+                    "INSERT INTO DM_DEVICE_CERTIFICATE (SERIAL_NUMBER, CERTIFICATE, TENANT_ID, USERNAME, DEVICE_IDENTIFIER)"
-                    + " VALUES (?,?,?,?)");
+                    + " VALUES (?,?,?,?,?)");
             PrivilegedCarbonContext threadLocalCarbonContext = PrivilegedCarbonContext.
                                                                                               getThreadLocalCarbonContext();
             String username = threadLocalCarbonContext.getUsername();
@@ -70,6 +70,7 @@ public abstract class AbstractCertificateDAOImpl implements CertificateDAO{
                 stmt.setBytes(2, bytes);
                 stmt.setInt(3, certificate.getTenantId());
                 stmt.setString(4, username);
+                stmt.setString(5, certificate.getDeviceIdentifier());
                 stmt.addBatch();
             }
             stmt.executeBatch();

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/GenericCertificateDAOImpl.java

@@ -67,7 +67,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                sql += " AND DEVICE_IDENTIFIER = ?";
+                sql += " AND DEVICE_IDENTIFIER LIKE ?";
             }
 
             if (StringUtils.isNotEmpty(username)) {
@@ -83,7 +83,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
                 }
 
                 if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
 
                 if (StringUtils.isNotEmpty(username)) {
@@ -129,7 +129,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                query += "AND DEVICE_IDENTIFIER = ? ";
+                query += "AND DEVICE_IDENTIFIER LIKE ? ";
                 isCertificateDeviceIdentifierProvided = true;
             }
 
@@ -147,7 +147,7 @@ public class GenericCertificateDAOImpl extends AbstractCertificateDAOImpl {
                     stmt.setString(paramIdx++, "%" + serialNumber + "%");
                 }
                 if (isCertificateDeviceIdentifierProvided) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
                 if (isCertificateUsernameProvided) {
                     stmt.setString(paramIdx++, "%" + username + "%");

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/OracleCertificateDAOImpl.java

@@ -68,7 +68,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                query += "AND DEVICE_IDENTIFIER = ? ";
+                query += "AND DEVICE_IDENTIFIER LIKE ? ";
                 isCertificateDeviceIdentifierProvided = true;
             }
 
@@ -86,7 +86,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
                     stmt.setString(paramIdx++, "%" + serialNumber + "%");
                 }
                 if (isCertificateDeviceIdentifierProvided) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
                 if (isCertificateUsernameProvided) {
                     stmt.setString(paramIdx++, "%" + username + "%");
@@ -140,7 +140,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                sql += " AND DEVICE_IDENTIFIER = ?";
+                sql += " AND DEVICE_IDENTIFIER LIKE ?";
             }
 
             if (StringUtils.isNotEmpty(username)) {
@@ -156,7 +156,7 @@ public class OracleCertificateDAOImpl extends AbstractCertificateDAOImpl {
                 }
 
                 if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
 
                 if (StringUtils.isNotEmpty(username)) {

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/PostgreSQLCertificateDAOImpl.java

@@ -68,7 +68,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                query += "AND DEVICE_IDENTIFIER = ? ";
+                query += "AND DEVICE_IDENTIFIER LIKE ? ";
                 isCertificateDeviceIdentifierProvided = true;
             }
 
@@ -86,7 +86,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
                     stmt.setString(paramIdx++, "%" + serialNumber + "%");
                 }
                 if (isCertificateDeviceIdentifierProvided) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
                 if (isCertificateUsernameProvided) {
                     stmt.setString(paramIdx++, "%" + username + "%");
@@ -140,7 +140,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                sql += " AND DEVICE_IDENTIFIER = ?";
+                sql += " AND DEVICE_IDENTIFIER LIKE ?";
             }
 
             if (StringUtils.isNotEmpty(username)) {
@@ -156,7 +156,7 @@ public class PostgreSQLCertificateDAOImpl extends AbstractCertificateDAOImpl {
                 }
 
                 if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
 
                 if (StringUtils.isNotEmpty(username)) {

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/dao/impl/SQLServerCertificateDAOImpl.java

@@ -68,7 +68,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                query += "AND DEVICE_IDENTIFIER = ? ";
+                query += "AND DEVICE_IDENTIFIER LIKE ? ";
                 isCertificateDeviceIdentifierProvided = true;
             }
 
@@ -86,7 +86,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
                     stmt.setString(paramIdx++, "%" + serialNumber + "%");
                 }
                 if (isCertificateDeviceIdentifierProvided) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
                 if (isCertificateUsernameProvided) {
                     stmt.setString(paramIdx++, "%" + username + "%");
@@ -140,7 +140,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
             }
 
             if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                sql += " AND DEVICE_IDENTIFIER = ?";
+                sql += " AND DEVICE_IDENTIFIER LIKE ?";
             }
 
             if (StringUtils.isNotEmpty(username)) {
@@ -156,7 +156,7 @@ public class SQLServerCertificateDAOImpl extends AbstractCertificateDAOImpl {
                 }
 
                 if (StringUtils.isNotEmpty(deviceIdentifier)) {
-                    stmt.setString(paramIdx++, deviceIdentifier);
+                    stmt.setString(paramIdx++, "%" + deviceIdentifier + "%");
                 }
 
                 if (StringUtils.isNotEmpty(username)) {

components/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.core/src/main/java/io/entgra/device/mgt/core/certificate/mgt/core/impl/CertificateGenerator.java

@@ -871,6 +871,7 @@ public class CertificateGenerator {
                     new io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate();
             List<io.entgra.device.mgt.core.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
             certificate.setTenantId(tenantId);
+            certificate.setDeviceIdentifier(commonName);
             certificate.setCertificate(issuedCert);
             certificates.add(certificate);
             saveCertInKeyStore(certificates);

components/certificate-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.pull.notification/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.userstore.role.mapper/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/api/ActivityInfoProviderService.java

@@ -396,7 +396,7 @@ public interface ActivityInfoProviderService {
             tags = "Device Activity Info Provider",
             extensions = {
                     @Extension(properties = {
-                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity")
+                            @ExtensionProperty(name = Constants.SCOPE, value = "dm:activity:get")
                     })
             },
             nickname = "getDeviceActivitiesWithFilters"

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/api/DeviceManagementService.java

@@ -1287,7 +1287,8 @@ public interface DeviceManagementService {
             produces = MediaType.APPLICATION_JSON,
             httpMethod = "PUT",
             value = "Remove Multiple Devices Specified by Device IDs and Device Type",
-            notes = "Deletes multiple devices of the specified device type specified by their device IDs and returns the status of the deletion operation.",
+            notes = "Deletes multiple devices of the specified device type specified by their device IDs" +
+                    " and returns the status of the dis-enrollment operation.",
             tags = "Device Management",
             extensions = {
                     @Extension(properties = {
@@ -1319,7 +1320,7 @@ public interface DeviceManagementService {
             })
     Response disenrollMultipleDevices(@ApiParam(
             name = "deviceTypeWithDeviceIds",
-            value = "The properties to advanced search devices.",
+            value = "Device type and corresponding device IDs for disenrollment",
             required = true)
                                       DisenrollRequest deviceTypeWithDeviceIds);
     @GET

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/api/UserManagementService.java

@@ -145,7 +145,7 @@ import javax.ws.rs.core.Response;
                         description = "Adding a User",
                         key = "um:users:cred:change",
                         roles = {"Internal/devicemgt-user"},
-                        permissions = {"/login/password/update"}
+                        permissions = {"/device-mgt/users/password/update"}
                 ),
                 @Scope(
                         name = "Sending Enrollment Invitations to Users",

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -491,17 +491,22 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         List<DeviceIdentifier> failedToDisenrollDevices = new ArrayList<>();
 
         Map<String, List<String>> list = deviceTypeWithDeviceIds.getDeviceTypeWithDeviceIds();
+        String deviceType;
+        List<String> deviceIds;
+        DeviceIdentifier deviceIdentifier;
+        Device persistedDevice;
+        boolean response;
 
         for (Map.Entry<String, List<String>> entry : list.entrySet()) {
-            String deviceType = entry.getKey();
+            deviceType = entry.getKey();
-            List<String> deviceIds = entry.getValue();
+            deviceIds = entry.getValue();
 
             for (String deviceId : deviceIds) {
-                DeviceIdentifier deviceIdentifier = new DeviceIdentifier(deviceId, deviceType);
+                deviceIdentifier = new DeviceIdentifier(deviceId, deviceType);
                 try {
-                    Device persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier, true);
+                    persistedDevice = deviceManagementProviderService.getDevice(deviceIdentifier, true);
                     if (persistedDevice != null) {
-                        boolean response = deviceManagementProviderService.disenrollDevice(deviceIdentifier);
+                        response = deviceManagementProviderService.disenrollDevice(deviceIdentifier);
                         if (response) {
                             successfullyDisenrolledDevices.add(deviceIdentifier);
                         } else {
@@ -509,6 +514,10 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                         }
                     } else {
                         failedToDisenrollDevices.add(deviceIdentifier);
+                        if(log.isDebugEnabled()){
+                            String msg = "Error encountered while dis-enrolling device of type: " + deviceType + " with " + deviceId;
+                            log.error(msg);
+                        }
                     }
                 } catch (DeviceManagementException e) {
                     String msg = "Error encountered while dis-enrolling device of type: " + deviceType + " with " + deviceId;

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/RoleManagementServiceImpl.java

@@ -670,7 +670,7 @@ public class RoleManagementServiceImpl implements RoleManagementService {
         if ((filter == null) || filter.isEmpty()) {
             filter = "*";
         } else {
-            filter += "*";
+            filter = "*" + filter + "*";
         }
         if (log.isDebugEnabled()) {
             log.debug("Getting the list of user roles");

components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -480,7 +480,7 @@ public class UserManagementServiceImpl implements UserManagementService {
 
         try {
             if (StringUtils.isNotEmpty(username)) {
-                commonUsers = getUserList(null, username);
+                commonUsers = getUserList(null, "*" + username + "*");
             }
             if (commonUsers != null) {
                 commonUsers.remove(Constants.APIM_RESERVED_USER);
@@ -488,7 +488,7 @@ public class UserManagementServiceImpl implements UserManagementService {
             }
 
             if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(firstName)) {
-                tempList = getUserList(Constants.USER_CLAIM_FIRST_NAME, firstName);
+                tempList = getUserList(Constants.USER_CLAIM_FIRST_NAME, "*" + firstName + "*");
                 if (commonUsers == null) {
                     commonUsers = tempList;
                 } else {
@@ -497,7 +497,7 @@ public class UserManagementServiceImpl implements UserManagementService {
             }
 
             if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(lastName)) {
-                tempList = getUserList(Constants.USER_CLAIM_LAST_NAME, lastName);
+                tempList = getUserList(Constants.USER_CLAIM_LAST_NAME, "*" + lastName + "*");
                 if (commonUsers == null || commonUsers.size() == 0) {
                     commonUsers = tempList;
                 } else {
@@ -506,7 +506,7 @@ public class UserManagementServiceImpl implements UserManagementService {
             }
 
             if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(emailAddress)) {
-                tempList = getUserList(Constants.USER_CLAIM_EMAIL_ADDRESS, emailAddress);
+                tempList = getUserList(Constants.USER_CLAIM_EMAIL_ADDRESS, "*" + emailAddress + "*");
                 if (commonUsers == null || commonUsers.size() == 0) {
                     commonUsers = tempList;
                 } else {

components/device-mgt/io.entgra.device.mgt.core.device.mgt.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.config.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractGeofenceDAOImpl.java

@@ -153,7 +153,7 @@ public abstract class AbstractGeofenceDAOImpl implements GeofenceDAO {
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 stmt.setInt(index++, tenantId);
                 if (isNameProvided) {
-                    stmt.setString(index++, request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
+                    stmt.setString(index++, "%" + request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
                 }
                 stmt.setInt(index++, request.getRowCount());
                 stmt.setInt(index, request.getStartIndex());
@@ -190,7 +190,7 @@ public abstract class AbstractGeofenceDAOImpl implements GeofenceDAO {
                     "WHERE FENCE_NAME LIKE ?" +
                     "AND TENANT_ID = ? ";
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
-                stmt.setString(1, fenceName + "%");
+                stmt.setString(1, "%" + fenceName + "%");
                 stmt.setInt(2, tenantId);
                 try (ResultSet rst = stmt.executeQuery()) {
                     geofenceData = extractGeofenceData(rst);

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/ApplicationDAOImpl.java

@@ -286,31 +286,36 @@ public class ApplicationDAOImpl implements ApplicationDAO {
                         "IS_ACTIVE, " +
                         "TENANT_ID " +
                     "FROM DM_APPLICATION " +
-                    "WHERE NOT EXISTS " +
+                    "WHERE PLATFORM = ? AND " +
-                        "(SELECT " +
+                    "TENANT_ID = ? AND " +
-                            "ID " +
+                    "NOT EXISTS (SELECT ID " +
                     "FROM DM_APPLICATION A " +
                     "WHERE A.NAME = DM_APPLICATION.NAME " +
-                        "AND A.ID < DM_APPLICATION.ID) " +
+                    "AND A.ID < DM_APPLICATION.ID AND " +
-                    "AND PLATFORM = ? " +
+                    "PLATFORM = ? AND TENANT_ID = ?) ";
-                    "AND TENANT_ID = ? ";
+
         try {
             String filter = request.getFilter();
             if (filter != null) {
                 sql = sql + "AND NAME LIKE ? ";
             }
+            if (request != null && request.getRowCount() != -1) {
                 sql = sql + "LIMIT ? OFFSET ?";
+            }
             Connection conn = this.getConnection();
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 int paramIdx = 1;
                 stmt.setString(paramIdx++, request.getDeviceType());
                 stmt.setInt(paramIdx++, tenantId);
+                stmt.setString(paramIdx++, request.getDeviceType());
+                stmt.setInt(paramIdx++, tenantId);
                 if (filter != null){
                     stmt.setString(paramIdx++, filter);
                 }
+                if (request != null && request.getRowCount() != -1) {
                     stmt.setInt(paramIdx++, request.getRowCount());
                     stmt.setInt(paramIdx, request.getStartIndex());
-
+                }
                 try (ResultSet rs = stmt.executeQuery()) {
                     while (rs.next()) {
                         application = loadApplication(rs);

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java

@@ -18,13 +18,13 @@
 
 package io.entgra.device.mgt.core.device.mgt.core.dao.impl.device;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import io.entgra.device.mgt.core.device.mgt.common.Count;
 import io.entgra.device.mgt.core.device.mgt.common.Device;
-import io.entgra.device.mgt.core.device.mgt.common.DeviceBilling;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
 import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
 import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException;
 import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
@@ -1474,4 +1474,35 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
         return geoClusters;
     }
      */
+
+    @Override
+    public void refactorDeviceStatus(Connection conn, List<Device> validDevices) throws DeviceManagementDAOException {
+        String updateQuery = "UPDATE DM_DEVICE_STATUS SET STATUS = ? WHERE ID = ?";
+        String selectLastMatchingRecordQuery = "SELECT TOP 1 ID FROM DM_DEVICE_STATUS WHERE ENROLMENT_ID = ? AND DEVICE_ID = ? ORDER BY ID DESC";
+
+        try (PreparedStatement selectStatement = conn.prepareStatement(selectLastMatchingRecordQuery);
+             PreparedStatement updateStatement = conn.prepareStatement(updateQuery)) {
+
+            for (Device device : validDevices) {
+
+                selectStatement.setInt(1, device.getEnrolmentInfo().getId());
+                selectStatement.setInt(2, device.getId());
+
+                ResultSet resultSet = selectStatement.executeQuery();
+                int lastRecordId = 0;
+                if (resultSet.next()) {
+                    lastRecordId = resultSet.getInt("ID");
+                }
+
+                updateStatement.setString(1, String.valueOf(EnrolmentInfo.Status.DELETED));
+                updateStatement.setInt(2, lastRecordId);
+                updateStatement.execute();
+            }
+
+        } catch (SQLException e) {
+            String msg = "SQL error occurred while updating device status properties.";
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
+        }
+    }
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/GenericGeofenceDAOImpl.java

@@ -143,7 +143,7 @@ public class GenericGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 stmt.setInt(index++, tenantId);
                 if (isNameProvided) {
-                    stmt.setString(index++, request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
+                    stmt.setString(index++, request.getProperty("%" + DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
                 }
                 stmt.setInt(index++, request.getRowCount());
                 stmt.setInt(index, request.getStartIndex());
@@ -180,7 +180,7 @@ public class GenericGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
                     "WHERE FENCE_NAME LIKE ?" +
                     "AND TENANT_ID = ? ";
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
-                stmt.setString(1, fenceName + "%");
+                stmt.setString(1,"%" + fenceName + "%");
                 stmt.setInt(2, tenantId);
                 try (ResultSet rst = stmt.executeQuery()) {
                     geofenceData = extractGeofenceData(rst);

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/geofence/SQLServerGeofenceDAOImpl.java

@@ -71,7 +71,7 @@ public class SQLServerGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                 stmt.setInt(index++, tenantId);
                 if (isNameProvided) {
-                    stmt.setString(index++, request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
+                    stmt.setString(index++, "%" + request.getProperty(DeviceManagementConstants.GeoServices.FENCE_NAME).toString() + "%");
                 }
                 stmt.setInt(index++, request.getStartIndex());
                 stmt.setInt(index, request.getRowCount());
@@ -166,4 +166,48 @@ public class SQLServerGeofenceDAOImpl extends AbstractGeofenceDAOImpl {
             throw new DeviceManagementDAOException(msg, e);
         }
     }
+
+    @Override
+    public List<GeofenceData> getGeoFences(int groupId, int tenantId) throws DeviceManagementDAOException {
+        try {
+            Connection conn = this.getConnection();
+            String sql = "SELECT " +
+                    "G.ID AS FENCE_ID, " +
+                    "FENCE_NAME, " +
+                    "DESCRIPTION, " +
+                    "LATITUDE, " +
+                    "LONGITUDE, " +
+                    "RADIUS, " +
+                    "GEO_JSON, " +
+                    "FENCE_SHAPE " +
+                    "FROM DM_GEOFENCE G " +
+                    "JOIN DM_GEOFENCE_GROUP_MAPPING M ON G.ID = M.FENCE_ID " +
+                    "WHERE M.GROUP_ID = ? AND TENANT_ID = ?";
+
+            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+                stmt.setInt(1, groupId);
+                stmt.setInt(2, tenantId);
+                ResultSet rst = stmt.executeQuery();
+                List <GeofenceData> geofenceDataList = new ArrayList<>();
+                while (rst.next()) {
+                    GeofenceData geofenceData = new GeofenceData();
+                    geofenceData.setId(rst.getInt("FENCE_ID"));
+                    geofenceData.setFenceName(rst.getString("FENCE_NAME"));
+                    geofenceData.setDescription(rst.getString("DESCRIPTION"));
+                    geofenceData.setLatitude(rst.getDouble("LATITUDE"));
+                    geofenceData.setLongitude(rst.getDouble("LONGITUDE"));
+                    geofenceData.setRadius(rst.getFloat("RADIUS"));
+                    geofenceData.setGeoJson(rst.getString("GEO_JSON"));
+                    geofenceData.setFenceShape(rst.getString("FENCE_SHAPE"));
+                    geofenceDataList.add(geofenceData);
+                }
+                return geofenceDataList;
+            }
+        } catch (SQLException e) {
+            String msg = "Error occurred while retrieving Geo fences of group " + groupId
+                    + " and tenant " + tenantId;
+            log.error(msg, e);
+            throw new DeviceManagementDAOException(msg, e);
+        }
+    }
 }

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/mgt/dao/impl/ConfigOperationMSSQLDAOImpl.java

@@ -26,6 +26,7 @@ import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.ConfigOperati
 import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.Operation;
 import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOException;
 import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -52,7 +53,7 @@ public class ConfigOperationMSSQLDAOImpl extends GenericOperationDAOImpl {
             operation.setCreatedTimeStamp(new Timestamp(new Date().getTime()).toString());
             Connection connection = OperationManagementDAOFactory.getConnection();
             String sql = "INSERT INTO DM_OPERATION(TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, OPERATION_CODE, " +
-                    "INITIATED_BY, OPERATION_DETAILS) VALUES (?, ?, ?, ?, ?, ?)";
+                    "INITIATED_BY, OPERATION_DETAILS, TENANT_ID) VALUES (?, ?, ?, ?, ?, ?, ?)";
             try (PreparedStatement stmt = connection.prepareStatement(sql, new String[]{"id"})) {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 ObjectOutputStream oos = new ObjectOutputStream(baos);
@@ -64,6 +65,7 @@ public class ConfigOperationMSSQLDAOImpl extends GenericOperationDAOImpl {
                 stmt.setString(4, operation.getCode());
                 stmt.setString(5, operation.getInitiatedBy());
                 stmt.setBytes(6, operationBytes);
+                stmt.setInt(7, PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
                 stmt.executeUpdate();
                 try (ResultSet rs = stmt.getGeneratedKeys()) {
                     int id = -1;

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/operation/mgt/dao/impl/operation/SQLServerOperationDAOImpl.java

@@ -177,12 +177,12 @@ public class SQLServerOperationDAOImpl extends GenericOperationDAOImpl {
                         operation = new Operation();
                         operation.setId(rs.getInt("ID"));
                         operation.setType(Operation.Type.valueOf(rs.getString("TYPE")));
-                        operation.setCreatedTimeStamp(new Timestamp(rs.getLong("CREATED_TIMESTAMP") * 1000L).toString());
+                        operation.setCreatedTimeStamp(new Timestamp(rs.getLong("CREATED_TIMESTAMP") * 1000L).toInstant().toString());
                         if (rs.getLong("UPDATED_TIMESTAMP") == 0) {
                             operation.setReceivedTimeStamp("");
                         } else {
                             operation.setReceivedTimeStamp(
-                                    new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
+                                    new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toInstant().toString());
                         }
                         operation.setCode(rs.getString("OPERATION_CODE"));
                         operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));

components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -1093,10 +1093,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     public double generateCost(List<Device> allDevices, Timestamp startDate, Timestamp endDate,  Cost tenantCost, List<Device> deviceStatusNotAvailable, double totalCost) throws DeviceManagementException {
+        List<DeviceStatus> deviceStatus;
         for (Device device : allDevices) {
             long dateDiff = 0;
-            device.setDeviceStatusInfo(getDeviceStatusHistory(device, null, endDate, true));
+            deviceStatus = getDeviceStatusHistory(device, null, endDate, true);
-            List<DeviceStatus> deviceStatus = device.getDeviceStatusInfo();
             if (device.getEnrolmentInfo().getDateOfEnrolment() < startDate.getTime()) {
                 if (!deviceStatus.isEmpty() && (String.valueOf(deviceStatus.get(0).getStatus()).equals("REMOVED")
                         || String.valueOf(deviceStatus.get(0).getStatus()).equals("DELETED"))) {

components/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/io.entgra.device.mgt.core.device.mgt.url.printer/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/heartbeat-management/io.entgra.device.mgt.core.server.bootup.heartbeat.beacon/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>heartbeat-management</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/heartbeat-management/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/io.entgra.device.mgt.core.device.mgt.oauth.extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/io.entgra.device.mgt.core.identity.jwt.client.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/logger/io.entgra.device.mgt.core.notification.logger/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>logger</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
     </parent>
 
     <artifactId>io.entgra.device.mgt.core.notification.logger</artifactId>

components/logger/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>operation-template-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/operation-template-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.decision.point/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.information.point/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/io.entgra.device.mgt.core.policy.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>subtype-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/subtype-mgt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/task-mgt/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.common/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>task-manager</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-manager/io.entgra.device.mgt.core.task.mgt.core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-manager</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-manager/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-watcher/io.entgra.device.mgt.core.task.mgt.watcher/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-watcher</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/task-mgt/task-watcher/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>task-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.common/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>tenant-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>tenant-mgt</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/tenant-mgt/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/transport-mgt/email-sender/io.entgra.device.mgt.core.transport.mgt.email.sender.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>email-sender</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/transport-mgt/email-sender/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>transport-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/transport-mgt/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>sms-handler</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.common/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>sms-handler</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>sms-handler</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/transport-mgt/sms-handler/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>transport-mgt</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>ui-request-interceptor</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

components/ui-request-interceptor/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
         <groupId>io.entgra.device.mgt.core</groupId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>webapp-authenticator-framework</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/webapp-authenticator-framework/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>io.entgra.device.mgt.core.parent</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt-feature</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>io.entgra.device.mgt.core</groupId>
         <artifactId>grafana-mgt-feature</artifactId>
-        <version>5.0.32-SNAPSHOT</version>
+        <version>5.0.33-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>