Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into app-details-fix-10260-1

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

@@ -1445,13 +1445,13 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
                 + "AR.PACKAGE_NAME, "
                 + "AR.VERSION, "
                 + "DS.SUBSCRIBED_BY, "
-                + "DS.STATUS, "
                 + "DS.ACTION_TRIGGERED_FROM "
                 + "FROM AP_APP_SUB_OP_MAPPING SOP "
                 + "JOIN AP_DEVICE_SUBSCRIPTION DS ON SOP.AP_DEVICE_SUBSCRIPTION_ID = DS.ID "
                 + "JOIN AP_APP_RELEASE AR ON DS.AP_APP_RELEASE_ID = AR.ID "
                 + "JOIN AP_APP AP ON AP.ID = AR.AP_APP_ID "
-                + " WHERE SOP.OPERATION_ID = ? AND SOP.TENANT_ID = ?";
+                + "WHERE SOP.OPERATION_ID = ? AND SOP.TENANT_ID = ? "
+                + "LIMIT 1";
 
             Connection conn = this.getDBConnection();
             try (PreparedStatement stmt = conn.prepareStatement(sql)) {

components/application-mgt/io.entgra.device.mgt.core.application.mgt.core/src/main/java/io/entgra/device/mgt/core/application/mgt/core/util/DAOUtil.java

@@ -383,7 +383,6 @@ public class DAOUtil {
             activity.setAppType(rs.getString("TYPE"));
             activity.setUsername(rs.getString("SUBSCRIBED_BY"));
             activity.setPackageName(rs.getString("PACKAGE_NAME"));
-            activity.setStatus(rs.getString("STATUS"));
             activity.setVersion(rs.getString("VERSION"));
             activity.setTriggeredBy(rs.getString("ACTION_TRIGGERED_FROM"));
             activities.add(activity);

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/ActivityProviderServiceImpl.java

@@ -175,7 +175,6 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
                     activity.setUsername(appActivity.getUsername());
                     activity.setPackageName(appActivity.getPackageName());
                     activity.setAppName(appActivity.getAppName());
-                    activity.setStatus(appActivity.getStatus());
                     activity.setAppType(appActivity.getAppType());
                     activity.setVersion(appActivity.getVersion());
                     activity.setTriggeredBy(appActivity.getTriggeredBy());