Revert "Merge branch 'master' into 'master'"

This reverts merge request !785
revert-52ce2907
Dharmakeerthi Lasantha 3 years ago
parent 52ce29076a
commit eb13d1b70d

@ -848,16 +848,16 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
} }
} }
subscriptionDAO.addDeviceSubscription(username, subInsertingDeviceIds, subType,
Operation.Status.PENDING.toString(), applicationReleaseId, tenantId);
if (!subUpdatingDeviceIds.isEmpty()) { if (!subUpdatingDeviceIds.isEmpty()) {
subscriptionDAO.updateDeviceSubscription(username, subUpdatingDeviceIds, action, subType, subscriptionDAO.updateDeviceSubscription(username, subUpdatingDeviceIds, action, subType,
Operation.Status.PENDING.toString(), applicationReleaseId, tenantId); Operation.Status.PENDING.toString(), applicationReleaseId, tenantId);
} }
subUpdatingDeviceIds.addAll(subInsertingDeviceIds);
if (!subInsertingDeviceIds.isEmpty()) { if (!subUpdatingDeviceIds.isEmpty()) {
subscriptionDAO.addDeviceSubscription(username, subInsertingDeviceIds, subType,
Operation.Status.PENDING.toString(), applicationReleaseId, tenantId);
List<Integer> deviceSubIds = new ArrayList<>( List<Integer> deviceSubIds = new ArrayList<>(
subscriptionDAO.getDeviceSubIds(subInsertingDeviceIds, applicationReleaseId, tenantId)); subscriptionDAO.getDeviceSubIds(subUpdatingDeviceIds, applicationReleaseId, tenantId));
subscriptionDAO.addOperationMapping(operationId, deviceSubIds, tenantId); subscriptionDAO.addOperationMapping(operationId, deviceSubIds, tenantId);
} }
} }

Loading…
Cancel
Save