mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'master' into 'master'
Add missing initiated by field in operation retrieval See merge request entgra/carbon-device-mgt!814
This commit is contained in:
Pahansith Gunathilake
commit
8234ace3e2
@ -66,7 +66,7 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
|
||||
@HeaderParam("If-Modified-Since") String ifModifiedSince) {
|
||||
Activity activity;
|
||||
DeviceManagementProviderService dmService;
|
||||
Response response = validateAdminUser();
|
||||
Response response = validateAdminPermission();
|
||||
if (response == null) {
|
||||
try {
|
||||
RequestValidationUtil.validateActivityId(id);
|
||||
@ -103,7 +103,7 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
|
||||
return Response.status(400).entity(
|
||||
new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
|
||||
}
|
||||
Response validationFailedResponse = validateAdminUser();
|
||||
Response validationFailedResponse = validateAdminPermission();
|
||||
if (validationFailedResponse == null) {
|
||||
List<Activity> activities;
|
||||
ActivityList activityList = new ActivityList();
|
||||
@ -184,7 +184,7 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
|
||||
log.debug("getActivities -> Operation Code : " +operationCode+ "offset " + offset + " limit: " + limit );
|
||||
}
|
||||
RequestValidationUtil.validatePaginationParameters(offset, limit);
|
||||
Response response = validateAdminUser();
|
||||
Response response = validateAdminPermission();
|
||||
if(response == null){
|
||||
List<Activity> activities;
|
||||
ActivityList activityList = new ActivityList();
|
||||
@ -272,7 +272,7 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("getActivities final timestamp " + timestamp);
|
||||
}
|
||||
Response response = validateAdminUser();
|
||||
Response response = validateAdminPermission();
|
||||
if (response == null) {
|
||||
ActivityList activityList = new ActivityList();
|
||||
DeviceManagementProviderService dmService;
|
||||
@ -330,19 +330,21 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
|
||||
}
|
||||
}
|
||||
|
||||
private Response validateAdminUser(){
|
||||
private Response validateAdminPermission() {
|
||||
//TODO: also check initiated by field to check current user has added the operation, if so allow access.
|
||||
try {
|
||||
if (!DeviceMgtAPIUtils.isAdmin()) {
|
||||
return Response.status(Response.Status.UNAUTHORIZED).entity("Unauthorized operation! Only admin role can perform " +
|
||||
"this operation.").build();
|
||||
if (!DeviceMgtAPIUtils.isAdminUser()) {
|
||||
return Response.status(Response.Status.UNAUTHORIZED)
|
||||
.entity("Unauthorized operation! Only users with CDM ADMIN PERMISSION " +
|
||||
"can perform this operation.").build();
|
||||
}
|
||||
return null;
|
||||
} catch (UserStoreException e) {
|
||||
String msg
|
||||
= "Error occurred while validating the user have admin role!";
|
||||
String msg = "Error occurred while validating the user have admin permission!";
|
||||
log.error(msg, e);
|
||||
return Response.serverError().entity(
|
||||
new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
package org.wso2.carbon.device.mgt.jaxrs.util;
|
||||
|
||||
import io.entgra.application.mgt.common.services.ApplicationManager;
|
||||
import io.entgra.application.mgt.common.services.SubscriptionManager;
|
||||
import org.apache.axis2.AxisFault;
|
||||
import org.apache.axis2.client.Options;
|
||||
import org.apache.axis2.java.security.SSLProtocolSocketFactory;
|
||||
@ -46,13 +47,13 @@ import org.apache.commons.httpclient.protocol.Protocol;
|
||||
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.CarbonConstants;
|
||||
import org.wso2.carbon.analytics.api.AnalyticsDataAPI;
|
||||
import org.wso2.carbon.analytics.stream.persistence.stub.EventStreamPersistenceAdminServiceStub;
|
||||
import org.wso2.carbon.base.ServerConfiguration;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||
import org.wso2.carbon.core.util.Utils;
|
||||
import io.entgra.application.mgt.common.services.SubscriptionManager;
|
||||
import org.wso2.carbon.device.mgt.common.Device;
|
||||
import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
|
||||
import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
|
||||
@ -81,6 +82,7 @@ import org.wso2.carbon.device.mgt.common.spi.OTPManagementService;
|
||||
import org.wso2.carbon.device.mgt.core.app.mgt.ApplicationManagementProviderService;
|
||||
import org.wso2.carbon.device.mgt.core.device.details.mgt.DeviceInformationManager;
|
||||
import org.wso2.carbon.device.mgt.core.dto.DeviceTypeVersion;
|
||||
import org.wso2.carbon.device.mgt.core.permission.mgt.PermissionUtils;
|
||||
import org.wso2.carbon.device.mgt.core.privacy.PrivacyComplianceProvider;
|
||||
import org.wso2.carbon.device.mgt.core.search.mgt.SearchManagerService;
|
||||
import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
|
||||
@ -141,6 +143,7 @@ import java.util.Queue;
|
||||
*/
|
||||
public class DeviceMgtAPIUtils {
|
||||
|
||||
private final static String CDM_ADMIN_PERMISSION = "/device-mgt/devices/any-device/permitted-actions-under-owning-device";
|
||||
private static final String NOTIFIER_FREQUENCY = "notifierFrequency";
|
||||
private static final String STREAM_DEFINITION_PREFIX = "iot.per.device.stream.";
|
||||
private static final String DEFAULT_HTTP_PROTOCOL = "https";
|
||||
@ -873,6 +876,27 @@ public class DeviceMgtAPIUtils {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static boolean isAdminUser() throws UserStoreException {
|
||||
int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
|
||||
String userName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
|
||||
UserRealm userRealm = DeviceMgtAPIUtils.getRealmService().getTenantUserRealm(tenantId);
|
||||
if (userRealm != null && userRealm.getAuthorizationManager() != null) {
|
||||
return userRealm.getAuthorizationManager()
|
||||
.isUserAuthorized(removeTenantDomain(userName),
|
||||
PermissionUtils.getAbsolutePermissionPath(CDM_ADMIN_PERMISSION),
|
||||
CarbonConstants.UI_PERMISSION_ACTION);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static String removeTenantDomain(String username) {
|
||||
String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
|
||||
if (username.endsWith(tenantDomain)) {
|
||||
return username.substring(0, username.lastIndexOf("@"));
|
||||
}
|
||||
return username;
|
||||
}
|
||||
|
||||
public static DeviceTypeVersion convertDeviceTypeVersionWrapper(String deviceTypeName, int deviceTypeId,
|
||||
DeviceTypeVersionWrapper deviceTypeVersion) {
|
||||
DeviceTypeVersion typeVersion = new DeviceTypeVersion();
|
||||
|
||||
@ -1172,10 +1172,10 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
Operation operation = null;
|
||||
try {
|
||||
Connection conn = OperationManagementDAOFactory.getConnection();
|
||||
String sql = "SELECT o.ID, o.TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, om.STATUS, o.OPERATION_CODE, " +
|
||||
"om.ID AS OM_MAPPING_ID, " +
|
||||
String sql = "SELECT o.ID, o.TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, om.STATUS, " +
|
||||
"o.OPERATION_CODE, o.INITIATED_BY, om.ID AS OM_MAPPING_ID, " +
|
||||
"om.UPDATED_TIMESTAMP FROM (SELECT ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP," +
|
||||
"OPERATION_CODE FROM DM_OPERATION WHERE id = ?) o INNER JOIN (SELECT * FROM " +
|
||||
"OPERATION_CODE, INITIATED_BY FROM DM_OPERATION WHERE id = ?) o INNER JOIN (SELECT * FROM " +
|
||||
"DM_ENROLMENT_OP_MAPPING dm where dm.OPERATION_ID = ? AND dm.ENROLMENT_ID = ?) om " +
|
||||
"ON o.ID = om.OPERATION_ID ";
|
||||
stmt = conn.prepareStatement(sql);
|
||||
@ -1197,6 +1197,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
||||
}
|
||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||
operation.setInitiatedBy(rs.getString("INITIATED_BY"));
|
||||
OperationDAOUtil.setActivityId(operation, rs.getInt("ID"));
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
@ -1214,11 +1215,11 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
PreparedStatement stmt = null;
|
||||
ResultSet rs = null;
|
||||
Operation operation;
|
||||
List<Operation> operations = new ArrayList<Operation>();
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
try {
|
||||
Connection conn = OperationManagementDAOFactory.getConnection();
|
||||
String sql = "SELECT o.ID, TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, o.OPERATION_CODE, om.ID AS OM_MAPPING_ID," +
|
||||
"om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
|
||||
String sql = "SELECT o.ID, TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, o.OPERATION_CODE, " +
|
||||
"o.INITIATED_BY, om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
|
||||
"INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
|
||||
"WHERE dm.ENROLMENT_ID = ? AND dm.STATUS = ?) om ON o.ID = om.OPERATION_ID ORDER BY o.CREATED_TIMESTAMP DESC";
|
||||
stmt = conn.prepareStatement(sql);
|
||||
@ -1238,6 +1239,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
||||
}
|
||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||
operation.setInitiatedBy(rs.getString("INITIATED_BY"));
|
||||
operation.setStatus(status);
|
||||
OperationDAOUtil.setActivityId(operation, rs.getInt("ID"));
|
||||
operations.add(operation);
|
||||
@ -1262,7 +1264,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
try {
|
||||
Connection conn = OperationManagementDAOFactory.getConnection();
|
||||
String sql = "SELECT o.ID, TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, o.OPERATION_CODE, " +
|
||||
"om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
|
||||
"o.INITIATED_BY, om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
|
||||
"INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
|
||||
"WHERE dm.ENROLMENT_ID = ? AND dm.STATUS = ?) om ON o.ID = om.OPERATION_ID ORDER BY " +
|
||||
"o.CREATED_TIMESTAMP DESC LIMIT ?,?";
|
||||
@ -1285,6 +1287,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
||||
}
|
||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||
operation.setInitiatedBy(rs.getString("INITIATED_BY"));
|
||||
operation.setStatus(status);
|
||||
OperationDAOUtil.setActivityId(operation, rs.getInt("OM_MAPPING_ID"));
|
||||
operations.add(operation);
|
||||
@ -1308,8 +1311,8 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
try {
|
||||
Connection conn = OperationManagementDAOFactory.getConnection();
|
||||
String sql = "SELECT o.ID, o.TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, " +
|
||||
"o.OPERATION_CODE, om.STATUS, om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
|
||||
"INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
|
||||
"o.OPERATION_CODE, o.INITIATED_BY, om.STATUS, om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP " +
|
||||
"FROM DM_OPERATION o INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
|
||||
"WHERE dm.ENROLMENT_ID = ?) om ON o.ID = om.OPERATION_ID " +
|
||||
"ORDER BY o.CREATED_TIMESTAMP DESC, o.ID DESC";
|
||||
stmt = conn.prepareStatement(sql);
|
||||
@ -1328,6 +1331,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
||||
}
|
||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||
operation.setInitiatedBy(rs.getString("INITIATED_BY"));
|
||||
operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
|
||||
operations.add(operation);
|
||||
}
|
||||
@ -1344,7 +1348,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
public List<? extends Operation> getOperationsForDevice(int enrolmentId, PaginationRequest request)
|
||||
throws OperationManagementDAOException {
|
||||
Operation operation;
|
||||
List<Operation> operations = new ArrayList<Operation>();
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
String createdTo = null;
|
||||
String createdFrom = null;
|
||||
DateFormat simple = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
|
||||
@ -1362,12 +1366,13 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
Long updatedTo = request.getOperationLogFilters().getUpdatedDayTo();
|
||||
List<String> operationCode = request.getOperationLogFilters().getOperationCode();
|
||||
List<String> status = request.getOperationLogFilters().getStatus();
|
||||
String sql = "SELECT " +
|
||||
StringBuilder sql = new StringBuilder("SELECT " +
|
||||
"o.ID, " +
|
||||
"TYPE, " +
|
||||
"o.CREATED_TIMESTAMP, " +
|
||||
"o.RECEIVED_TIMESTAMP, " +
|
||||
"o.OPERATION_CODE, " +
|
||||
"o.INITIATED_BY, " +
|
||||
"om.STATUS, " +
|
||||
"om.ID AS OM_MAPPING_ID, " +
|
||||
"om.UPDATED_TIMESTAMP " +
|
||||
@ -1381,55 +1386,55 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
"FROM " +
|
||||
"DM_ENROLMENT_OP_MAPPING dm " +
|
||||
"WHERE " +
|
||||
"dm.ENROLMENT_ID = ?";
|
||||
"dm.ENROLMENT_ID = ?");
|
||||
|
||||
if (updatedFrom != null && updatedFrom != 0 && updatedTo != null && updatedTo != 0) {
|
||||
sql = sql + " AND dm.UPDATED_TIMESTAMP BETWEEN ? AND ?";
|
||||
sql.append(" AND dm.UPDATED_TIMESTAMP BETWEEN ? AND ?");
|
||||
isUpdatedDayProvided = true;
|
||||
}
|
||||
sql = sql + ") om ON o.ID = om.OPERATION_ID ";
|
||||
sql.append(") om ON o.ID = om.OPERATION_ID ");
|
||||
if (createdFrom != null && !createdFrom.isEmpty() && createdTo != null && !createdTo.isEmpty()) {
|
||||
sql = sql + " WHERE o.CREATED_TIMESTAMP BETWEEN ? AND ?";
|
||||
sql.append(" WHERE o.CREATED_TIMESTAMP BETWEEN ? AND ?");
|
||||
isCreatedDayProvided = true;
|
||||
}
|
||||
if ((isCreatedDayProvided) && (status != null && !status.isEmpty())) {
|
||||
int size = status.size();
|
||||
sql = sql + " AND (om.STATUS = ? ";
|
||||
sql.append(" AND (om.STATUS = ? ");
|
||||
for (int i = 0; i < size - 1; i++) {
|
||||
sql = sql + " OR om.STATUS = ?";
|
||||
sql.append(" OR om.STATUS = ?");
|
||||
}
|
||||
sql = sql + ")";
|
||||
sql.append(")");
|
||||
isStatusProvided = true;
|
||||
} else if ((!isCreatedDayProvided) && (status != null && !status.isEmpty())) {
|
||||
int size = status.size();
|
||||
sql = sql + " WHERE (om.STATUS = ? ";
|
||||
sql.append(" WHERE (om.STATUS = ? ");
|
||||
for (int i = 0; i < size - 1; i++) {
|
||||
sql = sql + " OR om.STATUS = ?";
|
||||
sql.append(" OR om.STATUS = ?");
|
||||
}
|
||||
sql = sql + ")";
|
||||
sql.append(")");
|
||||
isStatusProvided = true;
|
||||
}
|
||||
if ((isCreatedDayProvided || isStatusProvided) && (operationCode != null && !operationCode.isEmpty())) {
|
||||
int size = operationCode.size();
|
||||
sql = sql + " AND (o.OPERATION_CODE = ? ";
|
||||
sql.append(" AND (o.OPERATION_CODE = ? ");
|
||||
for (int i = 0; i < size - 1; i++) {
|
||||
sql = sql + " OR o.OPERATION_CODE = ?";
|
||||
sql.append(" OR o.OPERATION_CODE = ?");
|
||||
}
|
||||
sql = sql + ")";
|
||||
sql.append(")");
|
||||
isOperationCodeProvided = true;
|
||||
} else if ((!isCreatedDayProvided && !isStatusProvided) && (operationCode != null && !operationCode.isEmpty())) {
|
||||
int size = operationCode.size();
|
||||
sql = sql + " WHERE (o.OPERATION_CODE = ? ";
|
||||
sql.append(" WHERE (o.OPERATION_CODE = ? ");
|
||||
for (int i = 0; i < size - 1; i++) {
|
||||
sql = sql + " OR o.OPERATION_CODE = ?";
|
||||
sql.append(" OR o.OPERATION_CODE = ?");
|
||||
}
|
||||
sql = sql + ")";
|
||||
sql.append(")");
|
||||
isOperationCodeProvided = true;
|
||||
}
|
||||
sql = sql + " ORDER BY o.CREATED_TIMESTAMP DESC LIMIT ?,?";
|
||||
sql.append(" ORDER BY o.CREATED_TIMESTAMP DESC LIMIT ?,?");
|
||||
try {
|
||||
Connection conn = OperationManagementDAOFactory.getConnection();
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql.toString())) {
|
||||
int paramIndex = 1;
|
||||
stmt.setInt(paramIndex++, enrolmentId);
|
||||
if (isUpdatedDayProvided) {
|
||||
@ -1441,15 +1446,13 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
stmt.setString(paramIndex++, createdTo);
|
||||
}
|
||||
if (isStatusProvided) {
|
||||
int size = status.size();
|
||||
for (int i = 0; i < size; i++) {
|
||||
stmt.setString(paramIndex++, status.get(i));
|
||||
for (String s : status) {
|
||||
stmt.setString(paramIndex++, s);
|
||||
}
|
||||
}
|
||||
if (isOperationCodeProvided) {
|
||||
int size = operationCode.size();
|
||||
for (int i = 0; i < size; i++) {
|
||||
stmt.setString(paramIndex++, operationCode.get(i));
|
||||
for (String s : operationCode) {
|
||||
stmt.setString(paramIndex++, s);
|
||||
}
|
||||
}
|
||||
stmt.setInt(paramIndex++, request.getStartIndex());
|
||||
@ -1467,6 +1470,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
||||
}
|
||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||
operation.setInitiatedBy(rs.getString("INITIATED_BY"));
|
||||
operation.setStatus(Operation.Status.valueOf(rs.getString("STATUS")));
|
||||
OperationDAOUtil.setActivityId(operation, rs.getInt("ID"));
|
||||
operations.add(operation);
|
||||
@ -1593,7 +1597,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
try {
|
||||
Connection connection = OperationManagementDAOFactory.getConnection();
|
||||
stmt = connection.prepareStatement("SELECT o.ID, o.TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, " +
|
||||
"o.OPERATION_CODE, om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
|
||||
"o.OPERATION_CODE, o.INITIATED_BY, om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM DM_OPERATION o " +
|
||||
"INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
|
||||
"WHERE dm.ENROLMENT_ID = ? AND dm.STATUS = ?) om ON o.ID = om.OPERATION_ID " +
|
||||
"ORDER BY om.UPDATED_TIMESTAMP ASC, om.ID ASC LIMIT 1");
|
||||
@ -1615,6 +1619,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
||||
}
|
||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||
operation.setInitiatedBy(rs.getString("INITIATED_BY"));
|
||||
operation.setStatus(Operation.Status.PENDING);
|
||||
OperationDAOUtil.setActivityId(operation, rs.getInt("ID"));
|
||||
}
|
||||
@ -1635,10 +1640,10 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
List<Operation> operations = new ArrayList<>();
|
||||
try {
|
||||
Connection conn = OperationManagementDAOFactory.getConnection();
|
||||
String sql = "SELECT o.ID, TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, OPERATION_CODE, om.ID AS OM_MAPPING_ID, " +
|
||||
"om.UPDATED_TIMESTAMP FROM (SELECT o.ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, OPERATION_CODE " +
|
||||
"FROM DM_OPERATION o WHERE o.TYPE = ?) o " +
|
||||
"INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
|
||||
String sql = "SELECT o.ID, TYPE, o.CREATED_TIMESTAMP, o.RECEIVED_TIMESTAMP, OPERATION_CODE, o.INITIATED_BY," +
|
||||
" om.ID AS OM_MAPPING_ID, om.UPDATED_TIMESTAMP FROM " +
|
||||
"(SELECT o.ID, TYPE, CREATED_TIMESTAMP, RECEIVED_TIMESTAMP, OPERATION_CODE, INITIATED_BY " +
|
||||
"FROM DM_OPERATION o WHERE o.TYPE = ?) o INNER JOIN (SELECT * FROM DM_ENROLMENT_OP_MAPPING dm " +
|
||||
"WHERE dm.ENROLMENT_ID = ? AND dm.STATUS = ?) om ON o.ID = om.OPERATION_ID ORDER BY o.CREATED_TIMESTAMP ASC";
|
||||
|
||||
stmt = conn.prepareStatement(sql);
|
||||
@ -1659,6 +1664,7 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
new java.sql.Timestamp((rs.getLong("UPDATED_TIMESTAMP") * 1000)).toString());
|
||||
}
|
||||
operation.setCode(rs.getString("OPERATION_CODE"));
|
||||
operation.setInitiatedBy(rs.getString("INITIATED_BY"));
|
||||
OperationDAOUtil.setActivityId(operation, rs.getInt("ID"));
|
||||
operations.add(operation);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user