mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into #11349
# Conflicts: # components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/service/DeviceManagementProviderService.java # 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
This commit is contained in:
nipuni
commit
fd67b39a46
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>grafana-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>grafana-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>grafana-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>analytics-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>apimgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>application-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -0,0 +1,103 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class CategorizedSubscriptionResult {
|
||||
private List<DeviceSubscriptionData> installedDevices;
|
||||
private List<DeviceSubscriptionData> pendingDevices;
|
||||
private List<DeviceSubscriptionData> errorDevices;
|
||||
private List<DeviceSubscriptionData> newDevices;
|
||||
private List<DeviceSubscriptionData> subscribedDevices;
|
||||
|
||||
public CategorizedSubscriptionResult(List<DeviceSubscriptionData> installedDevices,
|
||||
List<DeviceSubscriptionData> pendingDevices,
|
||||
List<DeviceSubscriptionData> errorDevices) {
|
||||
this.installedDevices = installedDevices;
|
||||
this.pendingDevices = pendingDevices;
|
||||
this.errorDevices = errorDevices;
|
||||
this.newDevices = null;
|
||||
this.subscribedDevices = null;
|
||||
}
|
||||
|
||||
public CategorizedSubscriptionResult(List<DeviceSubscriptionData> installedDevices,
|
||||
List<DeviceSubscriptionData> pendingDevices,
|
||||
List<DeviceSubscriptionData> errorDevices,
|
||||
List<DeviceSubscriptionData> newDevices) {
|
||||
this.installedDevices = installedDevices;
|
||||
this.pendingDevices = pendingDevices;
|
||||
this.errorDevices = errorDevices;
|
||||
this.newDevices = newDevices;
|
||||
this.subscribedDevices = null;
|
||||
}
|
||||
|
||||
public CategorizedSubscriptionResult(List<DeviceSubscriptionData> installedDevices,
|
||||
List<DeviceSubscriptionData> pendingDevices,
|
||||
List<DeviceSubscriptionData> errorDevices,
|
||||
List<DeviceSubscriptionData> newDevices,
|
||||
List<DeviceSubscriptionData> subscribedDevices) {
|
||||
this.installedDevices = installedDevices;
|
||||
this.pendingDevices = pendingDevices;
|
||||
this.errorDevices = errorDevices;
|
||||
this.newDevices = newDevices;
|
||||
this.subscribedDevices = subscribedDevices;
|
||||
}
|
||||
|
||||
public List<DeviceSubscriptionData> getInstalledDevices() {
|
||||
return installedDevices;
|
||||
}
|
||||
|
||||
public void setInstalledDevices(List<DeviceSubscriptionData> installedDevices) {
|
||||
this.installedDevices = installedDevices;
|
||||
}
|
||||
|
||||
public List<DeviceSubscriptionData> getPendingDevices() {
|
||||
return pendingDevices;
|
||||
}
|
||||
|
||||
public void setPendingDevices(List<DeviceSubscriptionData> pendingDevices) {
|
||||
this.pendingDevices = pendingDevices;
|
||||
}
|
||||
|
||||
public List<DeviceSubscriptionData> getErrorDevices() {
|
||||
return errorDevices;
|
||||
}
|
||||
|
||||
public void setErrorDevices(List<DeviceSubscriptionData> errorDevices) {
|
||||
this.errorDevices = errorDevices;
|
||||
}
|
||||
|
||||
public List<DeviceSubscriptionData> getNewDevices() {
|
||||
return newDevices;
|
||||
}
|
||||
|
||||
public void setNewDevices(List<DeviceSubscriptionData> newDevices) {
|
||||
this.newDevices = newDevices;
|
||||
}
|
||||
|
||||
public List<DeviceSubscriptionData> getSubscribedDevices() {
|
||||
return subscribedDevices;
|
||||
}
|
||||
|
||||
public void setSubscribedDevices(List<DeviceSubscriptionData> subscribedDevices) {
|
||||
this.subscribedDevices = subscribedDevices;
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,12 +26,22 @@ public class DeviceSubscriptionData {
|
||||
|
||||
private int subId;
|
||||
private String action;
|
||||
private long actionTriggeredTimestamp;
|
||||
private Timestamp actionTriggeredTimestamp;
|
||||
private String actionTriggeredFrom;
|
||||
private String actionTriggeredBy;
|
||||
private String actionType;
|
||||
private String status;
|
||||
private Device device;
|
||||
private String currentInstalledVersion;
|
||||
private int deviceId;
|
||||
private String deviceOwner;
|
||||
private String deviceStatus;
|
||||
private boolean unsubscribed;
|
||||
private String unsubscribedBy;
|
||||
private Timestamp unsubscribedTimestamp;
|
||||
private String deviceName;
|
||||
private String deviceIdentifier;
|
||||
private String type;
|
||||
|
||||
public String getAction() {
|
||||
return action;
|
||||
@ -41,14 +51,6 @@ public class DeviceSubscriptionData {
|
||||
this.action = action;
|
||||
}
|
||||
|
||||
public long getActionTriggeredTimestamp() {
|
||||
return actionTriggeredTimestamp;
|
||||
}
|
||||
|
||||
public void setActionTriggeredTimestamp(long actionTriggeredTimestamp) {
|
||||
this.actionTriggeredTimestamp = actionTriggeredTimestamp;
|
||||
}
|
||||
|
||||
public String getActionTriggeredBy() {
|
||||
return actionTriggeredBy;
|
||||
}
|
||||
@ -81,9 +83,13 @@ public class DeviceSubscriptionData {
|
||||
this.device = device;
|
||||
}
|
||||
|
||||
public String getCurrentInstalledVersion() { return currentInstalledVersion; }
|
||||
public String getCurrentInstalledVersion() {
|
||||
return currentInstalledVersion;
|
||||
}
|
||||
|
||||
public void setCurrentInstalledVersion(String currentInstalledVersion) { this.currentInstalledVersion = currentInstalledVersion; }
|
||||
public void setCurrentInstalledVersion(String currentInstalledVersion) {
|
||||
this.currentInstalledVersion = currentInstalledVersion;
|
||||
}
|
||||
|
||||
public int getSubId() {
|
||||
return subId;
|
||||
@ -92,4 +98,92 @@ public class DeviceSubscriptionData {
|
||||
public void setSubId(int subId) {
|
||||
this.subId = subId;
|
||||
}
|
||||
|
||||
public int getDeviceId() {
|
||||
return deviceId;
|
||||
}
|
||||
|
||||
public void setDeviceId(int deviceId) {
|
||||
this.deviceId = deviceId;
|
||||
}
|
||||
|
||||
public String getActionTriggeredFrom() {
|
||||
return actionTriggeredFrom;
|
||||
}
|
||||
|
||||
public void setActionTriggeredFrom(String actionTriggeredFrom) {
|
||||
this.actionTriggeredFrom = actionTriggeredFrom;
|
||||
}
|
||||
|
||||
public Timestamp getActionTriggeredTimestamp() {
|
||||
return actionTriggeredTimestamp;
|
||||
}
|
||||
|
||||
public void setActionTriggeredTimestamp(Timestamp actionTriggeredTimestamp) {
|
||||
this.actionTriggeredTimestamp = actionTriggeredTimestamp;
|
||||
}
|
||||
|
||||
public String getDeviceOwner() {
|
||||
return deviceOwner;
|
||||
}
|
||||
|
||||
public void setDeviceOwner(String deviceOwner) {
|
||||
this.deviceOwner = deviceOwner;
|
||||
}
|
||||
|
||||
public String getDeviceStatus() {
|
||||
return deviceStatus;
|
||||
}
|
||||
|
||||
public void setDeviceStatus(String deviceStatus) {
|
||||
this.deviceStatus = deviceStatus;
|
||||
}
|
||||
|
||||
public boolean isUnsubscribed() {
|
||||
return unsubscribed;
|
||||
}
|
||||
|
||||
public void setUnsubscribed(boolean unsubscribed) {
|
||||
this.unsubscribed = unsubscribed;
|
||||
}
|
||||
|
||||
public String getUnsubscribedBy() {
|
||||
return unsubscribedBy;
|
||||
}
|
||||
|
||||
public void setUnsubscribedBy(String unsubscribedBy) {
|
||||
this.unsubscribedBy = unsubscribedBy;
|
||||
}
|
||||
|
||||
public Timestamp getUnsubscribedTimestamp() {
|
||||
return unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public void setUnsubscribedTimestamp(Timestamp unsubscribedTimestamp) {
|
||||
this.unsubscribedTimestamp = unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public String getDeviceName() {
|
||||
return deviceName;
|
||||
}
|
||||
|
||||
public void setDeviceName(String deviceName) {
|
||||
this.deviceName = deviceName;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String getDeviceIdentifier() {
|
||||
return deviceIdentifier;
|
||||
}
|
||||
|
||||
public void setDeviceIdentifier(String deviceIdentifier) {
|
||||
this.deviceIdentifier = deviceIdentifier;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common.dto;
|
||||
|
||||
public class CategorizedSubscriptionCountsDTO {
|
||||
private String subscriptionType;
|
||||
private int subscriptionCount;
|
||||
private int unsubscriptionCount;
|
||||
|
||||
public CategorizedSubscriptionCountsDTO(String subscriptionType, int subscriptionCount, int unsubscriptionCount) {
|
||||
this.subscriptionType = subscriptionType;
|
||||
this.subscriptionCount = subscriptionCount;
|
||||
this.unsubscriptionCount = unsubscriptionCount;
|
||||
}
|
||||
|
||||
public String getSubscriptionType() {
|
||||
return subscriptionType;
|
||||
}
|
||||
|
||||
public void setSubscriptionType(String subscriptionType) {
|
||||
this.subscriptionType = subscriptionType;
|
||||
}
|
||||
|
||||
public int getSubscriptionCount() {
|
||||
return subscriptionCount;
|
||||
}
|
||||
|
||||
public void setSubscriptionCount(int subscriptionCount) {
|
||||
this.subscriptionCount = subscriptionCount;
|
||||
}
|
||||
|
||||
public int getUnsubscriptionCount() {
|
||||
return unsubscriptionCount;
|
||||
}
|
||||
|
||||
public void setUnsubscriptionCount(int unsubscriptionCount) {
|
||||
this.unsubscriptionCount = unsubscriptionCount;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common.dto;
|
||||
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OperationResponseDTO;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.List;
|
||||
|
||||
public class DeviceOperationDTO {
|
||||
private int deviceId;
|
||||
private String uuid;
|
||||
private String status;
|
||||
private int operationId;
|
||||
private String actionTriggeredFrom;
|
||||
private Timestamp actionTriggeredAt;
|
||||
private int appReleaseId;
|
||||
private String operationCode;
|
||||
private Object operationDetails;
|
||||
private Object operationProperties;
|
||||
private List<OperationResponseDTO> operationResponses;
|
||||
|
||||
public int getDeviceId() {
|
||||
return deviceId;
|
||||
}
|
||||
|
||||
public void setDeviceId(int deviceId) {
|
||||
this.deviceId = deviceId;
|
||||
}
|
||||
|
||||
public String getUuid() {
|
||||
return uuid;
|
||||
}
|
||||
|
||||
public void setUuid(String uuid) {
|
||||
this.uuid = uuid;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public int getOperationId() {
|
||||
return operationId;
|
||||
}
|
||||
|
||||
public void setOperationId(int operationId) {
|
||||
this.operationId = operationId;
|
||||
}
|
||||
|
||||
public String getActionTriggeredFrom() {
|
||||
return actionTriggeredFrom;
|
||||
}
|
||||
|
||||
public void setActionTriggeredFrom(String actionTriggeredFrom) {
|
||||
this.actionTriggeredFrom = actionTriggeredFrom;
|
||||
}
|
||||
|
||||
public Timestamp getActionTriggeredAt() {
|
||||
return actionTriggeredAt;
|
||||
}
|
||||
|
||||
public void setActionTriggeredAt(Timestamp actionTriggeredAt) {
|
||||
this.actionTriggeredAt = actionTriggeredAt;
|
||||
}
|
||||
|
||||
public int getAppReleaseId() {
|
||||
return appReleaseId;
|
||||
}
|
||||
|
||||
public void setAppReleaseId(int appReleaseId) {
|
||||
this.appReleaseId = appReleaseId;
|
||||
}
|
||||
|
||||
public String getOperationCode() {
|
||||
return operationCode;
|
||||
}
|
||||
|
||||
public void setOperationCode(String operationCode) {
|
||||
this.operationCode = operationCode;
|
||||
}
|
||||
|
||||
public Object getOperationDetails() {
|
||||
return operationDetails;
|
||||
}
|
||||
|
||||
public void setOperationDetails(Object operationDetails) {
|
||||
this.operationDetails = operationDetails;
|
||||
}
|
||||
|
||||
public Object getOperationProperties() {
|
||||
return operationProperties;
|
||||
}
|
||||
|
||||
public void setOperationProperties(Object operationProperties) {
|
||||
this.operationProperties = operationProperties;
|
||||
}
|
||||
|
||||
public List<OperationResponseDTO> getOperationResponses() {
|
||||
return operationResponses;
|
||||
}
|
||||
|
||||
public void setOperationResponses(List<OperationResponseDTO> operationResponses) {
|
||||
this.operationResponses = operationResponses;
|
||||
}
|
||||
}
|
||||
@ -31,44 +31,94 @@ public class DeviceSubscriptionDTO {
|
||||
private String actionTriggeredFrom;
|
||||
private String status;
|
||||
private int deviceId;
|
||||
private int appReleaseId;
|
||||
private String appUuid;
|
||||
|
||||
public int getId() { return id; }
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(int id) { this.id = id; }
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getSubscribedBy() { return subscribedBy; }
|
||||
public String getSubscribedBy() {
|
||||
return subscribedBy;
|
||||
}
|
||||
|
||||
public void setSubscribedBy(String subscribedBy) { this.subscribedBy = subscribedBy; }
|
||||
public void setSubscribedBy(String subscribedBy) {
|
||||
this.subscribedBy = subscribedBy;
|
||||
}
|
||||
|
||||
public Timestamp getSubscribedTimestamp() { return subscribedTimestamp; }
|
||||
public Timestamp getSubscribedTimestamp() {
|
||||
return subscribedTimestamp;
|
||||
}
|
||||
|
||||
public void setSubscribedTimestamp(Timestamp subscribedTimestamp) {
|
||||
this.subscribedTimestamp = subscribedTimestamp;
|
||||
}
|
||||
|
||||
public boolean isUnsubscribed() { return isUnsubscribed; }
|
||||
public boolean isUnsubscribed() {
|
||||
return isUnsubscribed;
|
||||
}
|
||||
|
||||
public void setUnsubscribed(boolean unsubscribed) { isUnsubscribed = unsubscribed; }
|
||||
public void setUnsubscribed(boolean unsubscribed) {
|
||||
isUnsubscribed = unsubscribed;
|
||||
}
|
||||
|
||||
public String getUnsubscribedBy() { return unsubscribedBy; }
|
||||
public String getUnsubscribedBy() {
|
||||
return unsubscribedBy;
|
||||
}
|
||||
|
||||
public void setUnsubscribedBy(String unsubscribedBy) { this.unsubscribedBy = unsubscribedBy; }
|
||||
public void setUnsubscribedBy(String unsubscribedBy) {
|
||||
this.unsubscribedBy = unsubscribedBy;
|
||||
}
|
||||
|
||||
public Timestamp getUnsubscribedTimestamp() { return unsubscribedTimestamp; }
|
||||
public Timestamp getUnsubscribedTimestamp() {
|
||||
return unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public void setUnsubscribedTimestamp(Timestamp unsubscribedTimestamp) {
|
||||
this.unsubscribedTimestamp = unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public String getActionTriggeredFrom() { return actionTriggeredFrom; }
|
||||
public String getActionTriggeredFrom() {
|
||||
return actionTriggeredFrom;
|
||||
}
|
||||
|
||||
public void setActionTriggeredFrom(String actionTriggeredFrom) { this.actionTriggeredFrom = actionTriggeredFrom; }
|
||||
public void setActionTriggeredFrom(String actionTriggeredFrom) {
|
||||
this.actionTriggeredFrom = actionTriggeredFrom;
|
||||
}
|
||||
|
||||
public String getStatus() { return status; }
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) { this.status = status; }
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public int getDeviceId() { return deviceId; }
|
||||
public int getDeviceId() {
|
||||
return deviceId;
|
||||
}
|
||||
|
||||
public void setDeviceId(int deviceId) { this.deviceId = deviceId; }
|
||||
public void setDeviceId(int deviceId) {
|
||||
this.deviceId = deviceId;
|
||||
}
|
||||
|
||||
public int getAppReleaseId() {
|
||||
return appReleaseId;
|
||||
}
|
||||
|
||||
public void setAppReleaseId(int appReleaseId) {
|
||||
this.appReleaseId = appReleaseId;
|
||||
}
|
||||
|
||||
public String getAppUuid() {
|
||||
return appUuid;
|
||||
}
|
||||
|
||||
public void setAppUuid(String appUuid) {
|
||||
this.appUuid = appUuid;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common.dto;
|
||||
|
||||
import io.entgra.device.mgt.core.application.mgt.common.CategorizedSubscriptionResult;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
public class DeviceSubscriptionResponseDTO {
|
||||
private int deviceCount;
|
||||
private Map<String, Double> statusPercentages;
|
||||
private CategorizedSubscriptionResult devices;
|
||||
|
||||
public DeviceSubscriptionResponseDTO(int deviceCount, Map<String, Double> statusPercentages,
|
||||
CategorizedSubscriptionResult devices) {
|
||||
this.deviceCount = deviceCount;
|
||||
this.statusPercentages = statusPercentages;
|
||||
this.devices = devices;
|
||||
}
|
||||
|
||||
public int getDeviceCount() {
|
||||
return deviceCount;
|
||||
}
|
||||
|
||||
public void setDeviceCount(int deviceCount) {
|
||||
this.deviceCount = deviceCount;
|
||||
}
|
||||
|
||||
public Map<String, Double> getStatusPercentages() {
|
||||
return statusPercentages;
|
||||
}
|
||||
|
||||
public void setStatusPercentages(Map<String, Double> statusPercentages) {
|
||||
this.statusPercentages = statusPercentages;
|
||||
}
|
||||
|
||||
public CategorizedSubscriptionResult getDevices() {
|
||||
return devices;
|
||||
}
|
||||
|
||||
public void setDevices(CategorizedSubscriptionResult devices) {
|
||||
this.devices = devices;
|
||||
}
|
||||
}
|
||||
@ -22,6 +22,7 @@ import java.sql.Timestamp;
|
||||
|
||||
public class GroupSubscriptionDTO {
|
||||
private int id;
|
||||
private String groupName;
|
||||
private String subscribedBy;
|
||||
private Timestamp subscribedTimestamp;
|
||||
private boolean isUnsubscribed;
|
||||
@ -29,6 +30,7 @@ public class GroupSubscriptionDTO {
|
||||
private Timestamp unsubscribedTimestamp;
|
||||
private String subscribedFrom;
|
||||
private int groupdId;
|
||||
private int appReleaseId;
|
||||
|
||||
public int getId() { return id; }
|
||||
|
||||
@ -61,4 +63,20 @@ public class GroupSubscriptionDTO {
|
||||
public int getGroupdId() { return groupdId; }
|
||||
|
||||
public void setGroupdId(int groupdId) { this.groupdId = groupdId; }
|
||||
|
||||
public String getGroupName() {
|
||||
return groupName;
|
||||
}
|
||||
|
||||
public void setGroupName(String groupName) {
|
||||
this.groupName = groupName;
|
||||
}
|
||||
|
||||
public int getAppReleaseId() {
|
||||
return appReleaseId;
|
||||
}
|
||||
|
||||
public void setAppReleaseId(int appReleaseId) {
|
||||
this.appReleaseId = appReleaseId;
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,51 +18,115 @@
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common.dto;
|
||||
|
||||
import io.entgra.device.mgt.core.application.mgt.common.CategorizedSubscriptionResult;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Map;
|
||||
|
||||
public class RoleSubscriptionDTO {
|
||||
private int id;
|
||||
private String subscribedBy;
|
||||
private Timestamp subscribedTimestamp;
|
||||
private boolean isUnsubscribed;
|
||||
private boolean unsubscribed;
|
||||
private String unsubscribedBy;
|
||||
private Timestamp unsubscribedTimestamp;
|
||||
private String subscribedFrom;
|
||||
private String roleName;
|
||||
private int appReleaseId;
|
||||
private int deviceCount;
|
||||
private Map<String, Double> statusPercentages;
|
||||
private CategorizedSubscriptionResult devices;
|
||||
|
||||
public int getId() { return id; }
|
||||
public String getSubscribedBy() {
|
||||
return subscribedBy;
|
||||
}
|
||||
|
||||
public void setId(int id) { this.id = id; }
|
||||
public void setSubscribedBy(String subscribedBy) {
|
||||
this.subscribedBy = subscribedBy;
|
||||
}
|
||||
|
||||
public String getSubscribedBy() { return subscribedBy; }
|
||||
|
||||
public void setSubscribedBy(String subscribedBy) { this.subscribedBy = subscribedBy; }
|
||||
|
||||
public Timestamp getSubscribedTimestamp() { return subscribedTimestamp; }
|
||||
public Timestamp getSubscribedTimestamp() {
|
||||
return subscribedTimestamp;
|
||||
}
|
||||
|
||||
public void setSubscribedTimestamp(Timestamp subscribedTimestamp) {
|
||||
this.subscribedTimestamp = subscribedTimestamp;
|
||||
}
|
||||
|
||||
public boolean isUnsubscribed() { return isUnsubscribed; }
|
||||
public boolean getUnsubscribed() {
|
||||
return unsubscribed;
|
||||
}
|
||||
|
||||
public void setUnsubscribed(boolean unsubscribed) { isUnsubscribed = unsubscribed; }
|
||||
public void setUnsubscribed(boolean unsubscribed) {
|
||||
this.unsubscribed = unsubscribed;
|
||||
}
|
||||
|
||||
public String getUnsubscribedBy() { return unsubscribedBy; }
|
||||
public boolean isUnsubscribed() {
|
||||
return isUnsubscribed;
|
||||
}
|
||||
|
||||
public void setUnsubscribedBy(String unsubscribedBy) { this.unsubscribedBy = unsubscribedBy; }
|
||||
public String getUnsubscribedBy() {
|
||||
return unsubscribedBy;
|
||||
}
|
||||
|
||||
public Timestamp getUnsubscribedTimestamp() { return unsubscribedTimestamp; }
|
||||
public void setUnsubscribedBy(String unsubscribedBy) {
|
||||
this.unsubscribedBy = unsubscribedBy;
|
||||
}
|
||||
|
||||
public Timestamp getUnsubscribedTimestamp() {
|
||||
return unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public void setUnsubscribedTimestamp(Timestamp unsubscribedTimestamp) {
|
||||
this.unsubscribedTimestamp = unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public String getSubscribedFrom() { return subscribedFrom; }
|
||||
public String getSubscribedFrom() {
|
||||
return subscribedFrom;
|
||||
}
|
||||
|
||||
public void setSubscribedFrom(String subscribedFrom) { this.subscribedFrom = subscribedFrom; }
|
||||
public void setSubscribedFrom(String subscribedFrom) {
|
||||
this.subscribedFrom = subscribedFrom;
|
||||
}
|
||||
|
||||
public String getRoleName() { return roleName; }
|
||||
public String getRoleName() {
|
||||
return roleName;
|
||||
}
|
||||
|
||||
public void setRoleName(String roleName) {
|
||||
this.roleName = roleName;
|
||||
}
|
||||
|
||||
public int getAppReleaseId() {
|
||||
return appReleaseId;
|
||||
}
|
||||
|
||||
public void setAppReleaseId(int appReleaseId) {
|
||||
this.appReleaseId = appReleaseId;
|
||||
}
|
||||
|
||||
public int getDeviceCount() {
|
||||
return deviceCount;
|
||||
}
|
||||
|
||||
public void setDeviceCount(int deviceCount) {
|
||||
this.deviceCount = deviceCount;
|
||||
}
|
||||
|
||||
public Map<String, Double> getStatusPercentages() {
|
||||
return statusPercentages;
|
||||
}
|
||||
|
||||
public void setStatusPercentages(Map<String, Double> statusPercentages) {
|
||||
this.statusPercentages = statusPercentages;
|
||||
}
|
||||
|
||||
public CategorizedSubscriptionResult getDevices() {
|
||||
return devices;
|
||||
}
|
||||
|
||||
public void setDevices(CategorizedSubscriptionResult devices) {
|
||||
this.devices = devices;
|
||||
}
|
||||
|
||||
public void setRoleName(String roleName) { this.roleName = roleName; }
|
||||
}
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common.dto;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class SubscriptionResponseDTO {
|
||||
|
||||
private String UUID;
|
||||
private List<SubscriptionsDTO> subscriptions;
|
||||
private List<DeviceOperationDTO> DevicesOperations;
|
||||
|
||||
public String getUUID() {
|
||||
return UUID;
|
||||
}
|
||||
|
||||
public void setUUID(String UUID) {
|
||||
this.UUID = UUID;
|
||||
}
|
||||
|
||||
public List<DeviceOperationDTO> getDevicesOperations() {
|
||||
return DevicesOperations;
|
||||
}
|
||||
|
||||
public void setDevicesOperations(List<DeviceOperationDTO> devicesOperations) {
|
||||
DevicesOperations = devicesOperations;
|
||||
}
|
||||
|
||||
public List<SubscriptionsDTO> getSubscriptions() {
|
||||
return subscriptions;
|
||||
}
|
||||
|
||||
public void setSubscriptions(List<SubscriptionsDTO> subscriptions) {
|
||||
this.subscriptions = subscriptions;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,162 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common.dto;
|
||||
|
||||
import io.entgra.device.mgt.core.application.mgt.common.CategorizedSubscriptionResult;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Map;
|
||||
|
||||
public class SubscriptionsDTO {
|
||||
private int id;
|
||||
private String owner;
|
||||
private String name;
|
||||
private String subscribedBy;
|
||||
private Timestamp subscribedTimestamp;
|
||||
private boolean unsubscribed;
|
||||
private String unsubscribedBy;
|
||||
private Timestamp unsubscribedTimestamp;
|
||||
private String subscribedFrom;
|
||||
private int appReleaseId;
|
||||
private int deviceCount;
|
||||
private String deviceOwner;
|
||||
private String deviceStatus;
|
||||
private Map<String, Double> statusPercentages;
|
||||
private CategorizedSubscriptionResult devices;
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getOwner() {
|
||||
return owner;
|
||||
}
|
||||
|
||||
public void setOwner(String owner) {
|
||||
this.owner = owner;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getSubscribedBy() {
|
||||
return subscribedBy;
|
||||
}
|
||||
|
||||
public void setSubscribedBy(String subscribedBy) {
|
||||
this.subscribedBy = subscribedBy;
|
||||
}
|
||||
|
||||
public Timestamp getSubscribedTimestamp() {
|
||||
return subscribedTimestamp;
|
||||
}
|
||||
|
||||
public void setSubscribedTimestamp(Timestamp subscribedTimestamp) {
|
||||
this.subscribedTimestamp = subscribedTimestamp;
|
||||
}
|
||||
|
||||
public String getUnsubscribedBy() {
|
||||
return unsubscribedBy;
|
||||
}
|
||||
|
||||
public void setUnsubscribedBy(String unsubscribedBy) {
|
||||
this.unsubscribedBy = unsubscribedBy;
|
||||
}
|
||||
|
||||
public Timestamp getUnsubscribedTimestamp() {
|
||||
return unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public void setUnsubscribedTimestamp(Timestamp unsubscribedTimestamp) {
|
||||
this.unsubscribedTimestamp = unsubscribedTimestamp;
|
||||
}
|
||||
|
||||
public String getSubscribedFrom() {
|
||||
return subscribedFrom;
|
||||
}
|
||||
|
||||
public void setSubscribedFrom(String subscribedFrom) {
|
||||
this.subscribedFrom = subscribedFrom;
|
||||
}
|
||||
|
||||
public int getAppReleaseId() {
|
||||
return appReleaseId;
|
||||
}
|
||||
|
||||
public void setAppReleaseId(int appReleaseId) {
|
||||
this.appReleaseId = appReleaseId;
|
||||
}
|
||||
|
||||
public int getDeviceCount() {
|
||||
return deviceCount;
|
||||
}
|
||||
|
||||
public void setDeviceCount(int deviceCount) {
|
||||
this.deviceCount = deviceCount;
|
||||
}
|
||||
|
||||
public String getDeviceOwner() {
|
||||
return deviceOwner;
|
||||
}
|
||||
|
||||
public void setDeviceOwner(String deviceOwner) {
|
||||
this.deviceOwner = deviceOwner;
|
||||
}
|
||||
|
||||
public String getDeviceStatus() {
|
||||
return deviceStatus;
|
||||
}
|
||||
|
||||
public void setDeviceStatus(String deviceStatus) {
|
||||
this.deviceStatus = deviceStatus;
|
||||
}
|
||||
|
||||
public Map<String, Double> getStatusPercentages() {
|
||||
return statusPercentages;
|
||||
}
|
||||
|
||||
public void setStatusPercentages(Map<String, Double> statusPercentages) {
|
||||
this.statusPercentages = statusPercentages;
|
||||
}
|
||||
|
||||
public CategorizedSubscriptionResult getDevices() {
|
||||
return devices;
|
||||
}
|
||||
|
||||
public void setDevices(CategorizedSubscriptionResult devices) {
|
||||
this.devices = devices;
|
||||
}
|
||||
|
||||
public boolean getUnsubscribed() {
|
||||
return unsubscribed;
|
||||
}
|
||||
|
||||
public void setUnsubscribed(boolean unsubscribed) {
|
||||
this.unsubscribed = unsubscribed;
|
||||
}
|
||||
}
|
||||
@ -18,11 +18,16 @@
|
||||
package io.entgra.device.mgt.core.application.mgt.common.services;
|
||||
|
||||
import io.entgra.device.mgt.core.application.mgt.common.ApplicationInstallResponse;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.CategorizedSubscriptionResult;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.CategorizedSubscriptionCountsDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.SubscriptionsDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceOperationDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceSubscriptionResponseDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.exception.ApplicationManagementException;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.SubscriptionType;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
|
||||
@ -194,7 +199,7 @@ public interface SubscriptionManager {
|
||||
* application release for given UUID, if an error occurred while getting device details of subscribed device ids,
|
||||
* if an error occurred while getting subscription details of given application release UUID.
|
||||
*/
|
||||
PaginationResult getAppSubscriptionDetails(PaginationRequest request, String appUUID, String actionStatus, String action, String installedVersion)
|
||||
CategorizedSubscriptionResult getAppSubscriptionDetails(PaginationRequest request, String appUUID, String actionStatus, String action, String installedVersion)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
/***
|
||||
@ -217,4 +222,94 @@ public interface SubscriptionManager {
|
||||
* @throws {@link SubscriptionManagementException} Exception of the subscription management
|
||||
*/
|
||||
Activity getOperationAppDetails(String id) throws SubscriptionManagementException;
|
||||
|
||||
/**
|
||||
* Retrieves the group details associated with a given app release UUID.
|
||||
*
|
||||
* @param uuid the UUID of the app release
|
||||
* @param subscriptionStatus the status of the subscription (subscribed or unsubscribed)
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link SubscriptionsDTO} which contains the details of subscriptions.
|
||||
* @throws ApplicationManagementException if an error occurs while fetching the group details
|
||||
*/
|
||||
List<SubscriptionsDTO> getGroupsSubscriptionDetailsByUUID(String uuid, String subscriptionStatus, int offset, int limit)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
/**
|
||||
* Retrieves the user details associated with a given app release UUID.
|
||||
*
|
||||
* @param uuid the UUID of the app release
|
||||
* @param subscriptionStatus the status of the subscription (subscribed or unsubscribed)
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link SubscriptionsDTO} which contains the details of subscriptions.
|
||||
* @throws ApplicationManagementException if an error occurs while fetching the user details
|
||||
*/
|
||||
List<SubscriptionsDTO> getUserSubscriptionsByUUID(String uuid, String subscriptionStatus, int offset, int limit)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
/**
|
||||
* Retrieves the Role details associated with a given app release UUID.
|
||||
*
|
||||
* @param uuid the UUID of the app release
|
||||
* @param subscriptionStatus the status of the subscription (subscribed or unsubscribed)
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link SubscriptionsDTO} which contains the details of subscriptions.
|
||||
* @throws ApplicationManagementException if an error occurs while fetching the role details
|
||||
*/
|
||||
List<SubscriptionsDTO> getRoleSubscriptionsByUUID(String uuid, String subscriptionStatus, int offset, int limit)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
/**
|
||||
* Retrieves the Device Subscription details associated with a given app release UUID.
|
||||
*
|
||||
* @param uuid the UUID of the app release
|
||||
* @param subscriptionStatus the status of the subscription (subscribed or unsubscribed)
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link DeviceSubscriptionResponseDTO} which contains the details of device subscriptions.
|
||||
* @throws ApplicationManagementException if an error occurs while fetching the device subscription details
|
||||
*/
|
||||
DeviceSubscriptionResponseDTO getDeviceSubscriptionsDetailsByUUID(String uuid, String subscriptionStatus, int offset, int limit)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
/**
|
||||
* Retrieves the All Device details associated with a given app release UUID.
|
||||
*
|
||||
* @param uuid the UUID of the app release
|
||||
* @param subscriptionStatus the status of the subscription (subscribed or unsubscribed)
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link DeviceSubscriptionResponseDTO} which contains the details of device subscriptions.
|
||||
* @throws ApplicationManagementException if an error occurs while fetching the subscription details
|
||||
*/
|
||||
DeviceSubscriptionResponseDTO getAllSubscriptionDetailsByUUID(String uuid, String subscriptionStatus, int offset, int limit)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
/**
|
||||
* This method is responsible for retrieving device subscription details related to the given UUID.
|
||||
*
|
||||
* @param deviceId the deviceId of the device that need to get operation details.
|
||||
* @param uuid the UUID of the application release.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link DeviceOperationDTO} which contains the details of device subscriptions.
|
||||
* @throws SubscriptionManagementException if there is an error while fetching the details.
|
||||
*/
|
||||
List<DeviceOperationDTO> getSubscriptionOperationsByUUIDAndDeviceID(int deviceId, String uuid, int offset, int limit)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
/**
|
||||
* This method is responsible for retrieving device counts details related to the given UUID.
|
||||
*
|
||||
* @param uuid the UUID of the application release.
|
||||
* @return {@link List<CategorizedSubscriptionCountsDTO>} which contains counts of subscriptions
|
||||
and unsubscription for each subscription type.
|
||||
* @throws SubscriptionManagementException if there is an error while fetching the details.
|
||||
*/
|
||||
List<CategorizedSubscriptionCountsDTO> getSubscriptionCountsByUUID(String uuid)
|
||||
throws ApplicationManagementException;
|
||||
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>application-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -18,8 +18,11 @@
|
||||
package io.entgra.device.mgt.core.application.mgt.core.dao;
|
||||
|
||||
import io.entgra.device.mgt.core.application.mgt.common.ExecutionStatus;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.GroupSubscriptionDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.SubscriptionsDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceSubscriptionDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.ApplicationReleaseDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceOperationDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.ScheduledSubscriptionDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionManagementException;
|
||||
import io.entgra.device.mgt.core.application.mgt.core.exception.ApplicationManagementDAOException;
|
||||
@ -312,4 +315,201 @@ public interface SubscriptionDAO {
|
||||
* @throws ApplicationManagementDAOException thrown if an error occurs while deleting data
|
||||
*/
|
||||
void deleteScheduledSubscriptionByTenant(int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of group subscriptions related to a appReleaseId.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param unsubscribe the Status of the subscription.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link GroupSubscriptionDTO} which contains the details of group subscriptions.
|
||||
* @throws ApplicationManagementDAOException if connection establishment fails.
|
||||
*/
|
||||
List<GroupSubscriptionDTO> getGroupsSubscriptionDetailsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId, int offset, int limit)
|
||||
throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of user subscriptions related to a appReleaseId.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param unsubscribe the Status of the subscription.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link SubscriptionsDTO} which contains the details of subscriptions.
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
List<SubscriptionsDTO> getUserSubscriptionsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId,
|
||||
int offset, int limit) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of role subscriptions related to a appReleaseId.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param unsubscribe the Status of the subscription.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link SubscriptionsDTO} which contains the details of subscriptions.
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
List<SubscriptionsDTO> getRoleSubscriptionsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId, int offset, int limit)
|
||||
throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of device subscriptions related to a appReleaseId.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param unsubscribe the Status of the subscription.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link DeviceSubscriptionDTO} which contains the details of device subscriptions.
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
List<DeviceSubscriptionDTO> getDeviceSubscriptionsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId, int offset, int limit)
|
||||
throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of device subscriptions related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param deviceId the deviceId of the device that need to get operation details.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link DeviceOperationDTO} which contains the details of device subscriptions.
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
List<DeviceOperationDTO> getSubscriptionOperationsByAppReleaseIDAndDeviceID(int appReleaseId, int deviceId, int tenantId, int offset, int limit)
|
||||
throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of device subscriptions related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param unsubscribe the Status of the subscription.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @param deviceIds deviceIds deviceIds to retrieve data.
|
||||
* @return {@link DeviceOperationDTO} which contains the details of device subscriptions.
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
List<DeviceSubscriptionDTO> getSubscriptionDetailsByDeviceIds(int appReleaseId, boolean unsubscribe, int tenantId, List<Integer> deviceIds)
|
||||
throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of device subscriptions related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param unsubscribe the Status of the subscription.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link DeviceOperationDTO} which contains the details of device subscriptions.
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
List<DeviceSubscriptionDTO> getAllSubscriptionsDetails(int appReleaseId, boolean unsubscribe, int tenantId, int offset, int limit)
|
||||
throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of all subscription types related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the appReleaseId of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getAllSubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of all unsubscription types related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getAllUnsubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of device subscriptions related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getDeviceSubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of device unsubscription related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getDeviceUnsubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of group subscriptions related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getGroupSubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of group unsubscription related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getGroupUnsubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of role subscriptions related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getRoleSubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of role unsubscription related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getRoleUnsubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of user subscriptions related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getUserSubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the counts of user unsubscription related to a UUID.
|
||||
*
|
||||
* @param appReleaseId the UUID of the application release.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link int} which contains the count of the subscription type
|
||||
* @throws ApplicationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
int getUserUnsubscriptionCount(int appReleaseId, int tenantId) throws ApplicationManagementDAOException;
|
||||
}
|
||||
|
||||
@ -17,6 +17,9 @@
|
||||
*/
|
||||
package io.entgra.device.mgt.core.application.mgt.core.dao.impl.subscription;
|
||||
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.GroupSubscriptionDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.DeviceOperationDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.common.dto.SubscriptionsDTO;
|
||||
import io.entgra.device.mgt.core.application.mgt.core.dao.SubscriptionDAO;
|
||||
import io.entgra.device.mgt.core.application.mgt.core.dao.impl.AbstractDAOImpl;
|
||||
import io.entgra.device.mgt.core.application.mgt.core.exception.UnexpectedServerErrorException;
|
||||
@ -44,6 +47,7 @@ import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.StringJoiner;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements SubscriptionDAO {
|
||||
private static final Log log = LogFactory.getLog(GenericSubscriptionDAOImpl.class);
|
||||
@ -1445,13 +1449,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)) {
|
||||
@ -1635,4 +1639,803 @@ public class GenericSubscriptionDAOImpl extends AbstractDAOImpl implements Subsc
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<GroupSubscriptionDTO> getGroupsSubscriptionDetailsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId, int offset, int limit)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Request received in DAO Layer to get groups related to the given AppReleaseID.");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
List<GroupSubscriptionDTO> groupDetails = new ArrayList<>();
|
||||
|
||||
String subscriptionStatusTime = unsubscribe ? "GS.UNSUBSCRIBED_TIMESTAMP" : "GS.SUBSCRIBED_TIMESTAMP";
|
||||
String sql = "SELECT GS.GROUP_NAME, GS.SUBSCRIBED_BY, GS.SUBSCRIBED_TIMESTAMP, GS.UNSUBSCRIBED, " +
|
||||
"GS.UNSUBSCRIBED_BY, GS.UNSUBSCRIBED_TIMESTAMP, GS.AP_APP_RELEASE_ID " +
|
||||
"FROM AP_GROUP_SUBSCRIPTION GS " +
|
||||
"WHERE GS.AP_APP_RELEASE_ID = ? AND GS.UNSUBSCRIBED = ? AND GS.TENANT_ID = ? " +
|
||||
"ORDER BY " + subscriptionStatusTime + " DESC " +
|
||||
"LIMIT ? OFFSET ?";
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setBoolean(2, unsubscribe);
|
||||
ps.setInt(3, tenantId);
|
||||
ps.setInt(4, limit);
|
||||
ps.setInt(5, offset);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
GroupSubscriptionDTO groupDetail;
|
||||
while (rs.next()) {
|
||||
groupDetail = new GroupSubscriptionDTO();
|
||||
groupDetail.setGroupName(rs.getString("GROUP_NAME"));
|
||||
groupDetail.setSubscribedBy(rs.getString("SUBSCRIBED_BY"));
|
||||
groupDetail.setSubscribedTimestamp(rs.getTimestamp("SUBSCRIBED_TIMESTAMP"));
|
||||
groupDetail.setUnsubscribed(rs.getBoolean("UNSUBSCRIBED"));
|
||||
groupDetail.setUnsubscribedBy(rs.getString("UNSUBSCRIBED_BY"));
|
||||
groupDetail.setUnsubscribedTimestamp(rs.getTimestamp("UNSUBSCRIBED_TIMESTAMP"));
|
||||
groupDetail.setAppReleaseId(rs.getInt("AP_APP_RELEASE_ID"));
|
||||
|
||||
groupDetails.add(groupDetail);
|
||||
}
|
||||
}
|
||||
return groupDetails;
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection to get groups for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
} catch (SQLException e) {
|
||||
String msg = "SQL Error occurred while getting groups for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SubscriptionsDTO> getUserSubscriptionsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId,
|
||||
int offset, int limit) throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Request received in DAO Layer to get user subscriptions related to the given UUID.");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
List<SubscriptionsDTO> userSubscriptions = new ArrayList<>();
|
||||
|
||||
String subscriptionStatusTime = unsubscribe ? "US.UNSUBSCRIBED_TIMESTAMP" : "US.SUBSCRIBED_TIMESTAMP";
|
||||
String sql = "SELECT US.USER_NAME, US.SUBSCRIBED_BY, US.SUBSCRIBED_TIMESTAMP, US.UNSUBSCRIBED, " +
|
||||
"US.UNSUBSCRIBED_BY, US.UNSUBSCRIBED_TIMESTAMP, US.AP_APP_RELEASE_ID " +
|
||||
"FROM AP_USER_SUBSCRIPTION US " +
|
||||
"WHERE US.AP_APP_RELEASE_ID = ? AND US.UNSUBSCRIBED = ? AND US.TENANT_ID = ? " +
|
||||
"ORDER BY " + subscriptionStatusTime + " DESC " +
|
||||
"LIMIT ? OFFSET ?";
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setBoolean(2, unsubscribe);
|
||||
ps.setInt(3, tenantId);
|
||||
ps.setInt(4, limit);
|
||||
ps.setInt(5, offset);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
SubscriptionsDTO userSubscription;
|
||||
userSubscription = new SubscriptionsDTO();
|
||||
userSubscription.setName(rs.getString("USER_NAME"));
|
||||
userSubscription.setSubscribedBy(rs.getString("SUBSCRIBED_BY"));
|
||||
userSubscription.setSubscribedTimestamp(rs.getTimestamp("SUBSCRIBED_TIMESTAMP"));
|
||||
userSubscription.setUnsubscribed(rs.getBoolean("UNSUBSCRIBED"));
|
||||
userSubscription.setUnsubscribedBy(rs.getString("UNSUBSCRIBED_BY"));
|
||||
userSubscription.setUnsubscribedTimestamp(rs.getTimestamp("UNSUBSCRIBED_TIMESTAMP"));
|
||||
userSubscription.setAppReleaseId(rs.getInt("AP_APP_RELEASE_ID"));
|
||||
|
||||
userSubscriptions.add(userSubscription);
|
||||
}
|
||||
}
|
||||
return userSubscriptions;
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection to get user subscriptions for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
} catch (SQLException e) {
|
||||
String msg = "SQL Error occurred while getting user subscriptions for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SubscriptionsDTO> getRoleSubscriptionsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId, int offset,
|
||||
int limit) throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Request received in DAO Layer to get role subscriptions related to the given AppReleaseID.");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
List<SubscriptionsDTO> roleSubscriptions = new ArrayList<>();
|
||||
|
||||
String subscriptionStatusTime = unsubscribe ? "ARS.UNSUBSCRIBED_TIMESTAMP" : "ARS.SUBSCRIBED_TIMESTAMP";
|
||||
String sql = "SELECT ARS.ROLE_NAME, ARS.SUBSCRIBED_BY, ARS.SUBSCRIBED_TIMESTAMP, ARS.UNSUBSCRIBED, " +
|
||||
"ARS.UNSUBSCRIBED_BY, ARS.UNSUBSCRIBED_TIMESTAMP, ARS.AP_APP_RELEASE_ID " +
|
||||
"FROM AP_ROLE_SUBSCRIPTION ARS " +
|
||||
"WHERE ARS.AP_APP_RELEASE_ID = ? AND ARS.UNSUBSCRIBED = ? AND ARS.TENANT_ID = ? " +
|
||||
"ORDER BY " + subscriptionStatusTime + " DESC " +
|
||||
"LIMIT ? OFFSET ?";
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setBoolean(2, unsubscribe);
|
||||
ps.setInt(3, tenantId);
|
||||
ps.setInt(4, limit);
|
||||
ps.setInt(5, offset);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
SubscriptionsDTO roleSubscription;
|
||||
while (rs.next()) {
|
||||
roleSubscription = new SubscriptionsDTO();
|
||||
roleSubscription.setName(rs.getString("ROLE_NAME"));
|
||||
roleSubscription.setSubscribedBy(rs.getString("SUBSCRIBED_BY"));
|
||||
roleSubscription.setSubscribedTimestamp(rs.getTimestamp("SUBSCRIBED_TIMESTAMP"));
|
||||
roleSubscription.setUnsubscribed(rs.getBoolean("UNSUBSCRIBED"));
|
||||
roleSubscription.setUnsubscribedBy(rs.getString("UNSUBSCRIBED_BY"));
|
||||
roleSubscription.setUnsubscribedTimestamp(rs.getTimestamp("UNSUBSCRIBED_TIMESTAMP"));
|
||||
roleSubscription.setAppReleaseId(rs.getInt("AP_APP_RELEASE_ID"));
|
||||
|
||||
roleSubscriptions.add(roleSubscription);
|
||||
}
|
||||
}
|
||||
return roleSubscriptions;
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection to get role subscriptions for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
} catch (SQLException e) {
|
||||
String msg = "SQL Error occurred while getting role subscriptions for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceSubscriptionDTO> getDeviceSubscriptionsByAppReleaseID(int appReleaseId, boolean unsubscribe, int tenantId, int offset, int limit)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Request received in DAO Layer to get device subscriptions related to the given AppReleaseID.");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
List<DeviceSubscriptionDTO> deviceSubscriptions = new ArrayList<>();
|
||||
|
||||
String subscriptionStatusTime = unsubscribe ? "DS.UNSUBSCRIBED_TIMESTAMP" : "DS.SUBSCRIBED_TIMESTAMP";
|
||||
String sql = "SELECT DS.DM_DEVICE_ID, " +
|
||||
"DS.SUBSCRIBED_BY, " +
|
||||
"DS.SUBSCRIBED_TIMESTAMP, " +
|
||||
"DS.STATUS, " +
|
||||
"DS.UNSUBSCRIBED, " +
|
||||
"DS.UNSUBSCRIBED_BY, " +
|
||||
"DS.UNSUBSCRIBED_TIMESTAMP, " +
|
||||
"DS.AP_APP_RELEASE_ID " +
|
||||
"FROM AP_DEVICE_SUBSCRIPTION DS " +
|
||||
"WHERE DS.AP_APP_RELEASE_ID = ? " +
|
||||
"AND DS.UNSUBSCRIBED = ? " +
|
||||
"AND DS.TENANT_ID = ? " +
|
||||
"AND DS.ACTION_TRIGGERED_FROM = 'DEVICE' " +
|
||||
"ORDER BY " + subscriptionStatusTime + " DESC " +
|
||||
"LIMIT ? OFFSET ?";
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setBoolean(2, unsubscribe);
|
||||
ps.setInt(3, tenantId);
|
||||
ps.setInt(4, limit);
|
||||
ps.setInt(5, offset);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
DeviceSubscriptionDTO deviceSubscription;
|
||||
while (rs.next()) {
|
||||
deviceSubscription = new DeviceSubscriptionDTO();
|
||||
deviceSubscription.setDeviceId(rs.getInt("DM_DEVICE_ID"));
|
||||
deviceSubscription.setSubscribedBy(rs.getString("SUBSCRIBED_BY"));
|
||||
deviceSubscription.setSubscribedTimestamp(rs.getTimestamp("SUBSCRIBED_TIMESTAMP"));
|
||||
deviceSubscription.setStatus(rs.getString("STATUS"));
|
||||
deviceSubscription.setUnsubscribed(rs.getBoolean("UNSUBSCRIBED"));
|
||||
deviceSubscription.setUnsubscribedBy(rs.getString("UNSUBSCRIBED_BY"));
|
||||
deviceSubscription.setUnsubscribedTimestamp(rs.getTimestamp("UNSUBSCRIBED_TIMESTAMP"));
|
||||
deviceSubscription.setAppReleaseId(rs.getInt("AP_APP_RELEASE_ID"));
|
||||
|
||||
deviceSubscriptions.add(deviceSubscription);
|
||||
}
|
||||
}
|
||||
return deviceSubscriptions;
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection to get device subscriptions for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
} catch (SQLException e) {
|
||||
String msg = "SQL Error occurred while getting device subscriptions for the given UUID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceOperationDTO> getSubscriptionOperationsByAppReleaseIDAndDeviceID(
|
||||
int appReleaseId, int deviceId, int tenantId, int offset, int limit) throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Request received in DAO Layer to get device subscriptions related to the given AppReleaseID and DeviceID.");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
List<DeviceOperationDTO> deviceSubscriptions = new ArrayList<>();
|
||||
String sql = "SELECT " +
|
||||
" ads.DM_DEVICE_ID, " +
|
||||
" aasom.OPERATION_ID, " +
|
||||
" ads.STATUS, " +
|
||||
" ads.ACTION_TRIGGERED_FROM, " +
|
||||
" ads.SUBSCRIBED_TIMESTAMP AS ACTION_TRIGGERED_AT, " +
|
||||
" ads.AP_APP_RELEASE_ID " +
|
||||
"FROM AP_APP_SUB_OP_MAPPING aasom " +
|
||||
"JOIN AP_DEVICE_SUBSCRIPTION ads " +
|
||||
"ON aasom.AP_DEVICE_SUBSCRIPTION_ID = ads.ID " +
|
||||
"WHERE ads.AP_APP_RELEASE_ID = ? " +
|
||||
"AND ads.DM_DEVICE_ID = ? " +
|
||||
"AND ads.TENANT_ID = ? " +
|
||||
"LIMIT ? OFFSET ?";
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, deviceId);
|
||||
ps.setInt(3, tenantId);
|
||||
ps.setInt(4, limit);
|
||||
ps.setInt(5, offset);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
DeviceOperationDTO deviceSubscription;
|
||||
while (rs.next()) {
|
||||
deviceSubscription = new DeviceOperationDTO();
|
||||
deviceSubscription.setDeviceId(rs.getInt("DM_DEVICE_ID"));
|
||||
deviceSubscription.setStatus(rs.getString("STATUS"));
|
||||
deviceSubscription.setOperationId(rs.getInt("OPERATION_ID"));
|
||||
deviceSubscription.setActionTriggeredFrom(rs.getString("ACTION_TRIGGERED_FROM"));
|
||||
deviceSubscription.setActionTriggeredAt(rs.getTimestamp("ACTION_TRIGGERED_AT"));
|
||||
deviceSubscription.setAppReleaseId(rs.getInt("AP_APP_RELEASE_ID"));
|
||||
|
||||
deviceSubscriptions.add(deviceSubscription);
|
||||
}
|
||||
}
|
||||
}
|
||||
return deviceSubscriptions;
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection to get device subscriptions for the given AppReleaseID and DeviceID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
} catch (SQLException e) {
|
||||
String msg = "SQL Error occurred while getting device subscriptions for the given AppReleaseID and DeviceID.";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceSubscriptionDTO> getSubscriptionDetailsByDeviceIds(int appReleaseId, boolean unsubscribe, int tenantId, List<Integer> deviceIds)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting device subscriptions for the application release id " + appReleaseId
|
||||
+ " and device ids " + deviceIds + " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String subscriptionStatusTime = unsubscribe ? "DS.UNSUBSCRIBED_TIMESTAMP" : "DS.SUBSCRIBED_TIMESTAMP";
|
||||
String sql = "SELECT "
|
||||
+ "DS.ID AS ID, "
|
||||
+ "DS.SUBSCRIBED_BY AS SUBSCRIBED_BY, "
|
||||
+ "DS.SUBSCRIBED_TIMESTAMP AS SUBSCRIBED_AT, "
|
||||
+ "DS.UNSUBSCRIBED AS IS_UNSUBSCRIBED, "
|
||||
+ "DS.UNSUBSCRIBED_BY AS UNSUBSCRIBED_BY, "
|
||||
+ "DS.UNSUBSCRIBED_TIMESTAMP AS UNSUBSCRIBED_AT, "
|
||||
+ "DS.ACTION_TRIGGERED_FROM AS ACTION_TRIGGERED_FROM, "
|
||||
+ "DS.STATUS AS STATUS, "
|
||||
+ "DS.DM_DEVICE_ID AS DEVICE_ID "
|
||||
+ "FROM AP_DEVICE_SUBSCRIPTION DS "
|
||||
+ "WHERE DS.AP_APP_RELEASE_ID = ? AND DS.UNSUBSCRIBED = ? AND DS.TENANT_ID = ? AND DS.DM_DEVICE_ID IN (" +
|
||||
deviceIds.stream().map(id -> "?").collect(Collectors.joining(",")) + ") "
|
||||
+ "ORDER BY " + subscriptionStatusTime + " DESC";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setBoolean(2, unsubscribe);
|
||||
ps.setInt(3, tenantId);
|
||||
for (int i = 0; i < deviceIds.size(); i++) {
|
||||
ps.setInt(4 + i, deviceIds.get(i));
|
||||
}
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Successfully retrieved device subscriptions for application release id "
|
||||
+ appReleaseId + " and device ids " + deviceIds);
|
||||
}
|
||||
List<DeviceSubscriptionDTO> subscriptions = new ArrayList<>();
|
||||
while (rs.next()) {
|
||||
DeviceSubscriptionDTO subscription = new DeviceSubscriptionDTO();
|
||||
subscription.setId(rs.getInt("ID"));
|
||||
subscription.setSubscribedBy(rs.getString("SUBSCRIBED_BY"));
|
||||
subscription.setSubscribedTimestamp(rs.getTimestamp("SUBSCRIBED_AT"));
|
||||
subscription.setUnsubscribed(rs.getBoolean("IS_UNSUBSCRIBED"));
|
||||
subscription.setUnsubscribedBy(rs.getString("UNSUBSCRIBED_BY"));
|
||||
subscription.setUnsubscribedTimestamp(rs.getTimestamp("UNSUBSCRIBED_AT"));
|
||||
subscription.setActionTriggeredFrom(rs.getString("ACTION_TRIGGERED_FROM"));
|
||||
subscription.setStatus(rs.getString("STATUS"));
|
||||
subscription.setDeviceId(rs.getInt("DEVICE_ID"));
|
||||
subscriptions.add(subscription);
|
||||
}
|
||||
return subscriptions;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get device subscription data for application ID: " + appReleaseId
|
||||
+ " and device ids: " + deviceIds + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting device subscriptions for "
|
||||
+ "application Id: " + appReleaseId + " and device ids: " + deviceIds + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceSubscriptionDTO> getAllSubscriptionsDetails(int appReleaseId, boolean unsubscribe, int tenantId,
|
||||
int offset, int limit) throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting device subscriptions for the application release id " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
|
||||
String subscriptionStatusTime = unsubscribe ? "DS.UNSUBSCRIBED_TIMESTAMP" : "DS.SUBSCRIBED_TIMESTAMP";
|
||||
String sql = "SELECT "
|
||||
+ "DS.ID AS ID, "
|
||||
+ "DS.SUBSCRIBED_BY AS SUBSCRIBED_BY, "
|
||||
+ "DS.SUBSCRIBED_TIMESTAMP AS SUBSCRIBED_AT, "
|
||||
+ "DS.UNSUBSCRIBED AS IS_UNSUBSCRIBED, "
|
||||
+ "DS.UNSUBSCRIBED_BY AS UNSUBSCRIBED_BY, "
|
||||
+ "DS.UNSUBSCRIBED_TIMESTAMP AS UNSUBSCRIBED_AT, "
|
||||
+ "DS.ACTION_TRIGGERED_FROM AS ACTION_TRIGGERED_FROM, "
|
||||
+ "DS.STATUS AS STATUS,"
|
||||
+ "DS.DM_DEVICE_ID AS DEVICE_ID "
|
||||
+ "FROM AP_DEVICE_SUBSCRIPTION DS "
|
||||
+ "WHERE DS.AP_APP_RELEASE_ID = ? AND DS.UNSUBSCRIBED = ? AND DS.TENANT_ID=? "
|
||||
+ "ORDER BY " + subscriptionStatusTime + " DESC "
|
||||
+ "LIMIT ? OFFSET ?";
|
||||
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setBoolean(2, unsubscribe);
|
||||
ps.setInt(3, tenantId);
|
||||
ps.setInt(4, limit);
|
||||
ps.setInt(5, offset);
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Successfully retrieved device subscriptions for application release id "
|
||||
+ appReleaseId);
|
||||
}
|
||||
List<DeviceSubscriptionDTO> deviceSubscriptions = new ArrayList<>();
|
||||
|
||||
while (rs.next()) {
|
||||
DeviceSubscriptionDTO subscription = new DeviceSubscriptionDTO();
|
||||
subscription.setId(rs.getInt("ID"));
|
||||
subscription.setSubscribedBy(rs.getString("SUBSCRIBED_BY"));
|
||||
subscription.setSubscribedTimestamp(rs.getTimestamp("SUBSCRIBED_AT"));
|
||||
subscription.setUnsubscribed(rs.getBoolean("IS_UNSUBSCRIBED"));
|
||||
subscription.setUnsubscribedBy(rs.getString("UNSUBSCRIBED_BY"));
|
||||
subscription.setUnsubscribedTimestamp(rs.getTimestamp("UNSUBSCRIBED_AT"));
|
||||
subscription.setActionTriggeredFrom(rs.getString("ACTION_TRIGGERED_FROM"));
|
||||
subscription.setStatus(rs.getString("STATUS"));
|
||||
subscription.setDeviceId(rs.getInt("DEVICE_ID"));
|
||||
|
||||
deviceSubscriptions.add(subscription);
|
||||
}
|
||||
return deviceSubscriptions;
|
||||
}
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting device subscription for "
|
||||
+ "application Id: " + appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while while running SQL to get device subscription data for application ID: " + appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAllSubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting all subscriptions count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_DEVICE_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = FALSE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get all subscriptions count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting all subscriptions count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAllUnsubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting all unsubscription count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_DEVICE_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = TRUE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get all unsubscription count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting all unsubscription count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDeviceSubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting device subscriptions count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_DEVICE_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = FALSE " +
|
||||
"AND ACTION_TRIGGERED_FROM = 'DEVICE'";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get device subscriptions count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting device subscriptions count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getDeviceUnsubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting device unsubscriptions count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_DEVICE_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = TRUE " +
|
||||
"AND ACTION_TRIGGERED_FROM = 'DEVICE'";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get device unsubscription count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting device unsubscription count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getGroupSubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting group subscriptions count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_GROUP_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = FALSE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get group subscriptions count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting group subscriptions count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getGroupUnsubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting group unsubscriptions count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_GROUP_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = TRUE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get group unsubscription count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting group unsubscription count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRoleSubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting role subscriptions count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_ROLE_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = FALSE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get role subscriptions count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting role subscriptions count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRoleUnsubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting role unsubscription count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_ROLE_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = TRUE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get role unsubscription count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting role unsubscription count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getUserSubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting user subscriptions count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_USER_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = FALSE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get user subscriptions count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting user subscriptions count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getUserUnsubscriptionCount(int appReleaseId, int tenantId)
|
||||
throws ApplicationManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Getting user unsubscription count for the application appReleaseId " + appReleaseId
|
||||
+ " from the database");
|
||||
}
|
||||
try {
|
||||
Connection conn = this.getDBConnection();
|
||||
String sql = "SELECT COUNT(*) AS count " +
|
||||
"FROM AP_USER_SUBSCRIPTION " +
|
||||
"WHERE AP_APP_RELEASE_ID = ? " +
|
||||
"AND TENANT_ID = ? " +
|
||||
"AND UNSUBSCRIBED = TRUE";
|
||||
|
||||
try (PreparedStatement ps = conn.prepareStatement(sql)) {
|
||||
ps.setInt(1, appReleaseId);
|
||||
ps.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = ps.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
return rs.getInt("count");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while running SQL to get user unsubscription count for application appReleaseId: "
|
||||
+ appReleaseId;
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
} catch (DBConnectionException e) {
|
||||
String msg = "Error occurred while obtaining the DB connection for getting user unsubscription count for appReleaseId: "
|
||||
+ appReleaseId + ".";
|
||||
log.error(msg, e);
|
||||
throw new ApplicationManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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);
|
||||
|
||||
@ -37,6 +37,7 @@ import io.entgra.device.mgt.core.device.mgt.core.config.DeviceConfigurationManag
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.internal.DeviceManagementDataHolder;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.metadata.mgt.dao.MetadataManagementDAOFactory;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
|
||||
import org.wso2.carbon.registry.core.config.RegistryContext;
|
||||
import org.wso2.carbon.registry.core.exceptions.RegistryException;
|
||||
import org.wso2.carbon.registry.core.internal.RegistryDataHolder;
|
||||
@ -96,6 +97,7 @@ public abstract class BaseTestCase {
|
||||
ConnectionManagerUtil.init(dataSource);
|
||||
DeviceManagementDAOFactory.init(dataSource);
|
||||
MetadataManagementDAOFactory.init(dataSource);
|
||||
OperationManagementDAOFactory.init(dataSource);
|
||||
// PolicyManagementDAOFactory.init(dataSource);
|
||||
// OperationManagementDAOFactory.init(dataSource);
|
||||
// GroupManagementDAOFactory.init(dataSource);
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>cea-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>cea-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>cea-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>cea-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>certificate-mgt</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>certificate-mgt</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>certificate-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt-extensions</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -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());
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -58,6 +58,8 @@ public class MDMAppConstants {
|
||||
}
|
||||
public static final String INSTALL_ENTERPRISE_APPLICATION = "INSTALL_ENTERPRISE_APPLICATION";
|
||||
public static final String UNINSTALL_ENTERPRISE_APPLICATION = "UNINSTALL_ENTERPRISE_APPLICATION";
|
||||
public static final String INSTALL_WEB_CLIP_APPLICATION = "INSTALL_WEB_CLIP";
|
||||
public static final String UNINSTALL_WEB_CLIP_APPLICATION = "UNINSTALL_WEB_CLIP";
|
||||
//App type constants related to window device type
|
||||
public static final String MSI = "MSI";
|
||||
public static final String APPX = "APPX";
|
||||
|
||||
@ -0,0 +1,76 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.device.mgt.common.app.mgt.windows;
|
||||
import com.google.gson.Gson;
|
||||
|
||||
import java.util.Properties;
|
||||
|
||||
public class WebClipApplication {
|
||||
|
||||
private String url;
|
||||
private String name;
|
||||
private String icon;
|
||||
private String type;
|
||||
private Properties properties;
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public String getUrl() {
|
||||
return url;
|
||||
}
|
||||
|
||||
public void setUrl(String url) {
|
||||
this.url = url;
|
||||
}
|
||||
|
||||
public String getIcon() {
|
||||
return icon;
|
||||
}
|
||||
|
||||
public void setIcon(String icon) {
|
||||
this.icon = icon;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public Properties getProperties() {
|
||||
return properties;
|
||||
}
|
||||
|
||||
public void setProperties(Properties properties) {
|
||||
this.properties = properties;
|
||||
}
|
||||
|
||||
public String toJSON() {
|
||||
Gson gson = new Gson();
|
||||
return gson.toJson(this);
|
||||
}
|
||||
}
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>device-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,9 +21,12 @@ import io.entgra.device.mgt.core.device.mgt.common.Device;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo.Status;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OwnerWithDeviceDTO;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public interface EnrollmentDAO {
|
||||
|
||||
@ -94,5 +97,33 @@ public interface EnrollmentDAO {
|
||||
*/
|
||||
boolean addDeviceStatus(int enrolmentId, EnrolmentInfo.Status status) throws DeviceManagementDAOException;
|
||||
|
||||
/**
|
||||
* Retrieves owners and the list of device IDs related to an owner.
|
||||
*
|
||||
* @param owner the owner whose device IDs need to be retrieved
|
||||
* @param tenantId the ID of the tenant
|
||||
* @return {@link OwnerWithDeviceDTO} which contains a list of devices related to a user
|
||||
* @throws DeviceManagementDAOException if an error occurs while fetching the data
|
||||
*/
|
||||
OwnerWithDeviceDTO getOwnersWithDevices(String owner, int tenantId) throws DeviceManagementDAOException;
|
||||
|
||||
/**
|
||||
* Retrieves a list of device IDs with owners and device status.
|
||||
*
|
||||
* @param deviceId the deviceId of the device which user need to be retrieved
|
||||
* @param tenantId the ID of the tenant
|
||||
* @return {@link OwnerWithDeviceDTO} which contains a list of devices
|
||||
* @throws DeviceManagementDAOException if an error occurs while fetching the data
|
||||
*/
|
||||
OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int deviceId, int tenantId)
|
||||
throws DeviceManagementDAOException;
|
||||
|
||||
/**
|
||||
* Retrieves owners and the list of device IDs with device status.
|
||||
*
|
||||
* @param tenantId the ID of the tenant
|
||||
* @return {@link OwnerWithDeviceDTO} which contains a list of devices related to a user
|
||||
* @throws DeviceManagementDAOException if an error occurs while fetching the data
|
||||
*/
|
||||
List<DeviceDetailsDTO> getDevicesByTenantId(int tenantId) throws DeviceManagementDAOException;
|
||||
}
|
||||
|
||||
@ -21,9 +21,9 @@ package io.entgra.device.mgt.core.device.mgt.core.dao;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.Device;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.GroupPaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.exceptions.ReportManagementException;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroupRoleWrapper;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.GroupDetailsDTO;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -469,4 +469,17 @@ public interface GroupDAO {
|
||||
List<String> groupNames)
|
||||
throws GroupManagementDAOException;
|
||||
|
||||
/**
|
||||
* Get group details and list of device IDs related to the group.
|
||||
*
|
||||
* @param groupName Group name
|
||||
* @param tenantId Tenant ID
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link GroupDetailsDTO} which containing group details and a list of device IDs
|
||||
* @throws GroupManagementDAOException if an error occurs while retrieving the group details and devices
|
||||
*/
|
||||
GroupDetailsDTO getGroupDetailsWithDevices(String groupName, int tenantId, int offset, int limit)
|
||||
throws GroupManagementDAOException;
|
||||
|
||||
}
|
||||
@ -18,6 +18,9 @@
|
||||
package io.entgra.device.mgt.core.device.mgt.core.dao.impl;
|
||||
|
||||
import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.util.OperationDAOUtil;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.Device;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
|
||||
@ -26,6 +29,8 @@ import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOExceptio
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.EnrollmentDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.util.DeviceManagementDAOUtil;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OwnerWithDeviceDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
@ -33,11 +38,12 @@ import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.sql.Timestamp;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public abstract class AbstractEnrollmentDAOImpl implements EnrollmentDAO {
|
||||
private static final Log log = LogFactory.getLog(AbstractEnrollmentDAOImpl.class);
|
||||
|
||||
@Override
|
||||
public EnrolmentInfo addEnrollment(int deviceId, DeviceIdentifier deviceIdentifier, EnrolmentInfo enrolmentInfo,
|
||||
@ -557,4 +563,117 @@ public abstract class AbstractEnrollmentDAOImpl implements EnrollmentDAO {
|
||||
return enrolmentInfo;
|
||||
}
|
||||
|
||||
@Override
|
||||
public OwnerWithDeviceDTO getOwnersWithDevices(String owner, int tenantId)
|
||||
throws DeviceManagementDAOException {
|
||||
Connection conn = null;
|
||||
OwnerWithDeviceDTO ownerDetails = new OwnerWithDeviceDTO();
|
||||
List<Integer> deviceIds = new ArrayList<>();
|
||||
int deviceCount = 0;
|
||||
|
||||
String sql = "SELECT e.DEVICE_ID, e.OWNER, e.STATUS AS DEVICE_STATUS, d.NAME AS DEVICE_NAME, e.DEVICE_TYPE AS DEVICE_TYPE, e.DEVICE_IDENTIFICATION AS DEVICE_IDENTIFICATION " +
|
||||
"FROM DM_ENROLMENT e " +
|
||||
"JOIN DM_DEVICE d ON e.DEVICE_ID = d.ID " +
|
||||
"WHERE e.OWNER = ? AND e.TENANT_ID = ?";
|
||||
try {
|
||||
conn = this.getConnection();
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
stmt.setString(1, owner);
|
||||
stmt.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
if (ownerDetails.getUserName() == null) {
|
||||
ownerDetails.setUserName(rs.getString("OWNER"));
|
||||
}
|
||||
deviceIds.add(rs.getInt("DEVICE_ID"));
|
||||
deviceCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving owners and device IDs for owner: " + owner;
|
||||
log.error(msg, e);
|
||||
throw new DeviceManagementDAOException(msg, e);
|
||||
}
|
||||
|
||||
ownerDetails.setDeviceIds(deviceIds);
|
||||
ownerDetails.setDeviceStatus("DEVICE_STATUS");
|
||||
ownerDetails.setDeviceNames("DEVICE_NAME");
|
||||
ownerDetails.setDeviceTypes("DEVICE_TYPE");
|
||||
ownerDetails.setDeviceIdentifiers("DEVICE_IDENTIFICATION");
|
||||
ownerDetails.setDeviceCount(deviceCount);
|
||||
return ownerDetails;
|
||||
}
|
||||
|
||||
@Override
|
||||
public OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int deviceId, int tenantId)
|
||||
throws DeviceManagementDAOException {
|
||||
OwnerWithDeviceDTO deviceOwnerWithStatus = new OwnerWithDeviceDTO();
|
||||
Connection conn = null;
|
||||
String sql = "SELECT e.DEVICE_ID, e.OWNER, e.STATUS AS DEVICE_STATUS, d.NAME AS DEVICE_NAME, e.DEVICE_TYPE, e.DEVICE_IDENTIFICATION " +
|
||||
"FROM DM_ENROLMENT e " +
|
||||
"JOIN DM_DEVICE d ON e.DEVICE_ID = d.ID " +
|
||||
"WHERE e.DEVICE_ID = ? AND e.TENANT_ID = ?";
|
||||
try {
|
||||
conn = this.getConnection();
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
stmt.setInt(1, deviceId);
|
||||
stmt.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
if (rs.next()) {
|
||||
deviceOwnerWithStatus.setUserName(rs.getString("OWNER"));
|
||||
deviceOwnerWithStatus.setDeviceStatus(rs.getString("DEVICE_STATUS"));
|
||||
List<Integer> deviceIds = new ArrayList<>();
|
||||
deviceIds.add(rs.getInt("DEVICE_ID"));
|
||||
deviceOwnerWithStatus.setDeviceIds(deviceIds);
|
||||
deviceOwnerWithStatus.setDeviceNames(rs.getString("DEVICE_NAME"));
|
||||
deviceOwnerWithStatus.setDeviceTypes(rs.getString("DEVICE_TYPE"));
|
||||
deviceOwnerWithStatus.setDeviceIdentifiers(rs.getString("DEVICE_IDENTIFICATION"));
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving owner and status for device ID: " + deviceId;
|
||||
log.error(msg, e);
|
||||
throw new DeviceManagementDAOException(msg, e);
|
||||
}
|
||||
return deviceOwnerWithStatus;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceDetailsDTO> getDevicesByTenantId(int tenantId)
|
||||
throws DeviceManagementDAOException {
|
||||
List<DeviceDetailsDTO> devices = new ArrayList<>();
|
||||
String sql = "SELECT DEVICE_ID, OWNER, STATUS, DEVICE_TYPE, DEVICE_IDENTIFICATION " +
|
||||
"FROM DM_ENROLMENT " +
|
||||
"WHERE TENANT_ID = ?";
|
||||
Connection conn = null;
|
||||
|
||||
try {
|
||||
conn = this.getConnection();
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
stmt.setInt(1, tenantId);
|
||||
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
DeviceDetailsDTO device = new DeviceDetailsDTO();
|
||||
device.setDeviceId(rs.getInt("DEVICE_ID"));
|
||||
device.setOwner(rs.getString("OWNER"));
|
||||
device.setStatus(rs.getString("STATUS"));
|
||||
device.setType(rs.getString("DEVICE_TYPE"));
|
||||
device.setDeviceIdentifier(rs.getString("DEVICE_IDENTIFICATION"));
|
||||
devices.add(device);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving devices for tenant ID: " + tenantId;
|
||||
log.error(msg, e);
|
||||
throw new DeviceManagementDAOException(msg, e);
|
||||
}
|
||||
return devices;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -26,6 +26,7 @@ import io.entgra.device.mgt.core.device.mgt.common.Device;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.GroupPaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.DeviceGroup;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.GroupDetailsDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.GroupDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.GroupManagementDAOException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.GroupManagementDAOFactory;
|
||||
@ -164,7 +165,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving groups of groups IDs " + deviceGroupIds.toString()
|
||||
+ " in tenant: " + tenantId;
|
||||
+ " in tenant: " + tenantId;
|
||||
log.error(msg);
|
||||
throw new GroupManagementDAOException(msg, e);
|
||||
}
|
||||
@ -184,7 +185,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
for (int i = 0; i < deviceGroupIdsCount; i++) {
|
||||
sql += (deviceGroupIdsCount - 1 != i) ? "?," : "?";
|
||||
}
|
||||
sql += ")";
|
||||
sql += ")";
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
int paramIndex = 1;
|
||||
stmt.setInt(paramIndex++, tenantId);
|
||||
@ -202,7 +203,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving groups of groups IDs " + deviceGroupIds
|
||||
+ " in tenant: " + tenantId;
|
||||
+ " in tenant: " + tenantId;
|
||||
log.error(msg);
|
||||
throw new GroupManagementDAOException(msg, e);
|
||||
}
|
||||
@ -227,7 +228,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
sql += " AND OWNER LIKE ?";
|
||||
}
|
||||
if (StringUtils.isNotBlank(request.getParentPath())) {
|
||||
if(isWithParentPath){
|
||||
if (isWithParentPath) {
|
||||
sql += " AND PARENT_PATH LIKE ?";
|
||||
}
|
||||
}
|
||||
@ -250,7 +251,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
stmt.setString(paramIndex++, request.getOwner() + "%");
|
||||
}
|
||||
if (StringUtils.isNotBlank(request.getParentPath())) {
|
||||
if(isWithParentPath){
|
||||
if (isWithParentPath) {
|
||||
stmt.setString(paramIndex++, request.getParentPath());
|
||||
}
|
||||
}
|
||||
@ -271,7 +272,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving groups of groups IDs " + deviceGroupIds.toString()
|
||||
+ " in tenant: " + tenantId;
|
||||
+ " in tenant: " + tenantId;
|
||||
log.error(msg);
|
||||
throw new GroupManagementDAOException(msg, e);
|
||||
}
|
||||
@ -484,7 +485,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
Connection conn = GroupManagementDAOFactory.getConnection();
|
||||
String sql = "UPDATE DM_GROUP SET DESCRIPTION = ?, GROUP_NAME = ?, OWNER = ?, STATUS = ?, "
|
||||
+ "PARENT_PATH = ?, PARENT_GROUP_ID = ? WHERE ID = ? AND TENANT_ID = ?";
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)){
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
for (DeviceGroup deviceGroup : deviceGroups) {
|
||||
stmt.setString(1, deviceGroup.getDescription());
|
||||
stmt.setString(2, deviceGroup.getName());
|
||||
@ -609,6 +610,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
throw new GroupManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteGroups(List<Integer> groupIds, int tenantId) throws GroupManagementDAOException {
|
||||
try {
|
||||
@ -1166,7 +1168,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
if (StringUtils.isNotBlank(parentPath)) {
|
||||
sql += " AND g.PARENT_PATH = ? ";
|
||||
}
|
||||
sql += "GROUP BY g.ID";
|
||||
sql += "GROUP BY g.ID";
|
||||
stmt = conn.prepareStatement(sql);
|
||||
int index = 0;
|
||||
while (index++ < rolesCount) {
|
||||
@ -1279,7 +1281,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
return devices;
|
||||
}
|
||||
Connection conn = GroupManagementDAOFactory.getConnection();
|
||||
StringJoiner joiner = new StringJoiner(",","SELECT "
|
||||
StringJoiner joiner = new StringJoiner(",", "SELECT "
|
||||
+ "d1.DEVICE_ID, "
|
||||
+ "d1.DESCRIPTION, "
|
||||
+ "d1.NAME AS DEVICE_NAME, "
|
||||
@ -1437,4 +1439,80 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
|
||||
}
|
||||
return groupUnassignedDeviceList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GroupDetailsDTO getGroupDetailsWithDevices(String groupName, int tenantId, int offset, int limit)
|
||||
throws GroupManagementDAOException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Request received in DAO Layer to get group details and device IDs for group: " + groupName);
|
||||
}
|
||||
GroupDetailsDTO groupDetails = new GroupDetailsDTO();
|
||||
List<Integer> deviceIds = new ArrayList<>();
|
||||
Map<Integer, String> deviceOwners = new HashMap<>();
|
||||
Map<Integer, String> deviceStatuses = new HashMap<>();
|
||||
Map<Integer, String> deviceNames = new HashMap<>();
|
||||
Map<Integer, String> deviceTypes = new HashMap<>();
|
||||
Map<Integer, String> deviceIdentifiers = new HashMap<>();
|
||||
|
||||
String sql =
|
||||
"SELECT " +
|
||||
" g.ID AS GROUP_ID, " +
|
||||
" g.GROUP_NAME, " +
|
||||
" g.OWNER AS GROUP_OWNER, " +
|
||||
" e.OWNER AS DEVICE_OWNER, " +
|
||||
" e.STATUS AS DEVICE_STATUS, " +
|
||||
" e.DEVICE_TYPE AS DEVICE_TYPE, " +
|
||||
" e.DEVICE_IDENTIFICATION AS DEVICE_IDENTIFICATION, " +
|
||||
" dgm.DEVICE_ID, " +
|
||||
" d.NAME AS DEVICE_NAME " +
|
||||
"FROM " +
|
||||
" DM_GROUP g " +
|
||||
" JOIN DM_DEVICE_GROUP_MAP dgm ON g.ID = dgm.GROUP_ID " +
|
||||
" JOIN DM_ENROLMENT e ON dgm.DEVICE_ID = e.DEVICE_ID " +
|
||||
" JOIN DM_DEVICE d ON e.DEVICE_ID = d.ID " +
|
||||
"WHERE " +
|
||||
" g.GROUP_NAME = ? " +
|
||||
" AND g.TENANT_ID = ? " +
|
||||
"LIMIT ? OFFSET ?";
|
||||
|
||||
Connection conn = null;
|
||||
try {
|
||||
conn = GroupManagementDAOFactory.getConnection();
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
stmt.setString(1, groupName);
|
||||
stmt.setInt(2, tenantId);
|
||||
stmt.setInt(3, limit);
|
||||
stmt.setInt(4, offset);
|
||||
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
while (rs.next()) {
|
||||
if (groupDetails.getGroupId() == 0) {
|
||||
groupDetails.setGroupId(rs.getInt("GROUP_ID"));
|
||||
groupDetails.setGroupName(rs.getString("GROUP_NAME"));
|
||||
groupDetails.setGroupOwner(rs.getString("GROUP_OWNER"));
|
||||
}
|
||||
int deviceId = rs.getInt("DEVICE_ID");
|
||||
deviceIds.add(deviceId);
|
||||
deviceOwners.put(deviceId, rs.getString("DEVICE_OWNER"));
|
||||
deviceStatuses.put(deviceId, rs.getString("DEVICE_STATUS"));
|
||||
deviceNames.put(deviceId, rs.getString("DEVICE_NAME"));
|
||||
deviceTypes.put(deviceId, rs.getString("DEVICE_TYPE"));
|
||||
deviceIdentifiers.put(deviceId, rs.getString("DEVICE_IDENTIFICATION"));
|
||||
}
|
||||
}
|
||||
groupDetails.setDeviceIds(deviceIds);
|
||||
groupDetails.setDeviceCount(deviceIds.size());
|
||||
groupDetails.setDeviceOwners(deviceOwners);
|
||||
groupDetails.setDeviceStatuses(deviceStatuses);
|
||||
groupDetails.setDeviceNames(deviceNames);
|
||||
groupDetails.setDeviceTypes(deviceTypes);
|
||||
groupDetails.setDeviceIdentifiers(deviceIdentifiers);
|
||||
return groupDetails;
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving group details and device IDs for group: " + groupName;
|
||||
log.error(msg, e);
|
||||
throw new GroupManagementDAOException(msg, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,67 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.device.mgt.core.dto;
|
||||
|
||||
public class DeviceDetailsDTO {
|
||||
private int deviceId;
|
||||
private String owner;
|
||||
private String status;
|
||||
private String type;
|
||||
private String deviceIdentifier;
|
||||
|
||||
public int getDeviceId() {
|
||||
return deviceId;
|
||||
}
|
||||
|
||||
public void setDeviceId(int deviceId) {
|
||||
this.deviceId = deviceId;
|
||||
}
|
||||
|
||||
public String getOwner() {
|
||||
return owner;
|
||||
}
|
||||
|
||||
public void setOwner(String owner) {
|
||||
this.owner = owner;
|
||||
}
|
||||
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
public String getDeviceIdentifier() {
|
||||
return deviceIdentifier;
|
||||
}
|
||||
|
||||
public void setDeviceIdentifier(String deviceIdentifier) {
|
||||
this.deviceIdentifier = deviceIdentifier;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,133 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.device.mgt.core.dto;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class GroupDetailsDTO {
|
||||
private int groupId;
|
||||
private String groupName;
|
||||
private String groupOwner;
|
||||
private List<Integer> deviceIds;
|
||||
private int deviceCount;
|
||||
private String deviceOwner;
|
||||
private String deviceStatus;
|
||||
private Map<Integer, String> deviceOwners;
|
||||
private Map<Integer, String> deviceStatuses;
|
||||
private Map<Integer, String> deviceNames;
|
||||
private Map<Integer, String> deviceTypes;
|
||||
private Map<Integer, String> deviceIdentifiers;
|
||||
|
||||
public int getGroupId() {
|
||||
return groupId;
|
||||
}
|
||||
|
||||
public void setGroupId(int groupId) {
|
||||
this.groupId = groupId;
|
||||
}
|
||||
|
||||
public String getGroupName() {
|
||||
return groupName;
|
||||
}
|
||||
|
||||
public void setGroupName(String groupName) {
|
||||
this.groupName = groupName;
|
||||
}
|
||||
|
||||
public String getGroupOwner() {
|
||||
return groupOwner;
|
||||
}
|
||||
|
||||
public void setGroupOwner(String groupOwner) {
|
||||
this.groupOwner = groupOwner;
|
||||
}
|
||||
|
||||
public List<Integer> getDeviceIds() {
|
||||
return deviceIds;
|
||||
}
|
||||
|
||||
public void setDeviceIds(List<Integer> deviceIds) {
|
||||
this.deviceIds = deviceIds;
|
||||
}
|
||||
|
||||
public int getDeviceCount() {
|
||||
return deviceCount;
|
||||
}
|
||||
|
||||
public void setDeviceCount(int deviceCount) {
|
||||
this.deviceCount = deviceCount;
|
||||
}
|
||||
|
||||
public String getDeviceOwner() {
|
||||
return deviceOwner;
|
||||
}
|
||||
|
||||
public void setDeviceOwner(String deviceOwner) {
|
||||
this.deviceOwner = deviceOwner;
|
||||
}
|
||||
|
||||
public String getDeviceStatus() {
|
||||
return deviceStatus;
|
||||
}
|
||||
|
||||
public void setDeviceStatus(String deviceStatus) {
|
||||
this.deviceStatus = deviceStatus;
|
||||
}
|
||||
|
||||
public Map<Integer, String> getDeviceOwners() {
|
||||
return deviceOwners;
|
||||
}
|
||||
|
||||
public void setDeviceOwners(Map<Integer, String> deviceOwners) {
|
||||
this.deviceOwners = deviceOwners;
|
||||
}
|
||||
|
||||
public Map<Integer, String> getDeviceStatuses() {
|
||||
return deviceStatuses;
|
||||
}
|
||||
|
||||
public void setDeviceStatuses(Map<Integer, String> deviceStatuses) {
|
||||
this.deviceStatuses = deviceStatuses;
|
||||
}
|
||||
|
||||
public Map<Integer, String> getDeviceNames() {
|
||||
return deviceNames;
|
||||
}
|
||||
|
||||
public void setDeviceNames(Map<Integer, String> deviceNames) {
|
||||
this.deviceNames = deviceNames;
|
||||
}
|
||||
|
||||
public Map<Integer, String> getDeviceTypes() {
|
||||
return deviceTypes;
|
||||
}
|
||||
|
||||
public void setDeviceTypes(Map<Integer, String> deviceTypes) {
|
||||
this.deviceTypes = deviceTypes;
|
||||
}
|
||||
|
||||
public Map<Integer, String> getDeviceIdentifiers() {
|
||||
return deviceIdentifiers;
|
||||
}
|
||||
|
||||
public void setDeviceIdentifiers(Map<Integer, String> deviceIdentifiers) {
|
||||
this.deviceIdentifiers = deviceIdentifiers;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,72 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.device.mgt.core.dto;
|
||||
|
||||
import org.json.JSONObject;
|
||||
import java.util.List;
|
||||
|
||||
public class OperationDTO {
|
||||
private int operationId;
|
||||
private String operationCode;
|
||||
private JSONObject operationDetails;
|
||||
private JSONObject operationProperties;
|
||||
private List<OperationResponseDTO> operationResponses;
|
||||
|
||||
// Getters and Setters
|
||||
|
||||
public int getOperationId() {
|
||||
return operationId;
|
||||
}
|
||||
|
||||
public void setOperationId(int operationId) {
|
||||
this.operationId = operationId;
|
||||
}
|
||||
|
||||
public String getOperationCode() {
|
||||
return operationCode;
|
||||
}
|
||||
|
||||
public void setOperationCode(String operationCode) {
|
||||
this.operationCode = operationCode;
|
||||
}
|
||||
|
||||
public JSONObject getOperationDetails() {
|
||||
return operationDetails;
|
||||
}
|
||||
|
||||
public void setOperationDetails(JSONObject operationDetails) {
|
||||
this.operationDetails = operationDetails;
|
||||
}
|
||||
|
||||
public JSONObject getOperationProperties() {
|
||||
return operationProperties;
|
||||
}
|
||||
|
||||
public void setOperationProperties(JSONObject operationProperties) {
|
||||
this.operationProperties = operationProperties;
|
||||
}
|
||||
|
||||
public List<OperationResponseDTO> getOperationResponses() {
|
||||
return operationResponses;
|
||||
}
|
||||
|
||||
public void setOperationResponses(List<OperationResponseDTO> operationResponses) {
|
||||
this.operationResponses = operationResponses;
|
||||
}
|
||||
}
|
||||
@ -16,17 +16,28 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.application.mgt.common.dto;
|
||||
package io.entgra.device.mgt.core.device.mgt.core.dto;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
|
||||
public class UserSubscriptionDTO {
|
||||
private int id;
|
||||
private String subscribedBy;
|
||||
private Timestamp subscribedTimestamp;
|
||||
private boolean isUnsubscribed;
|
||||
private String unsubscribedBy;
|
||||
private Timestamp unsubscribedTimestamp;
|
||||
private String subscribedFrom;
|
||||
private String userName;
|
||||
public class OperationResponseDTO {
|
||||
private String operationResponse;
|
||||
private Timestamp responseTimeStamp;
|
||||
|
||||
public String getOperationResponse() {
|
||||
return operationResponse;
|
||||
}
|
||||
|
||||
public void setOperationResponse(String operationResponse) {
|
||||
this.operationResponse = operationResponse;
|
||||
}
|
||||
|
||||
public Timestamp getResponseTimeStamp() {
|
||||
return responseTimeStamp;
|
||||
}
|
||||
|
||||
public void setResponseTimeStamp(Timestamp responseTimeStamp) {
|
||||
this.responseTimeStamp = responseTimeStamp;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,88 @@
|
||||
/*
|
||||
* Copyright (c) 2018 - 2024, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
|
||||
*
|
||||
* Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
|
||||
* Version 2.0 (the "License"); you may not use this file except
|
||||
* in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package io.entgra.device.mgt.core.device.mgt.core.dto;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class OwnerWithDeviceDTO {
|
||||
|
||||
private String userName;
|
||||
private List<Integer> deviceIds;
|
||||
private int deviceCount;
|
||||
private String deviceStatus;
|
||||
private String deviceNames;
|
||||
private String deviceTypes;
|
||||
private String deviceIdentifiers;
|
||||
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
|
||||
public void setUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
public List<Integer> getDeviceIds() {
|
||||
return deviceIds;
|
||||
}
|
||||
|
||||
public void setDeviceIds(List<Integer> deviceIds) {
|
||||
this.deviceIds = deviceIds;
|
||||
}
|
||||
|
||||
public int getDeviceCount() {
|
||||
return deviceCount;
|
||||
}
|
||||
|
||||
public void setDeviceCount(int deviceCount) {
|
||||
this.deviceCount = deviceCount;
|
||||
}
|
||||
|
||||
public String getDeviceStatus() {
|
||||
return deviceStatus;
|
||||
}
|
||||
|
||||
public void setDeviceStatus(String deviceStatus) {
|
||||
this.deviceStatus = deviceStatus;
|
||||
}
|
||||
|
||||
public String getDeviceNames() {
|
||||
return deviceNames;
|
||||
}
|
||||
|
||||
public void setDeviceNames(String deviceNames) {
|
||||
this.deviceNames = deviceNames;
|
||||
}
|
||||
|
||||
public String getDeviceTypes() {
|
||||
return deviceTypes;
|
||||
}
|
||||
|
||||
public void setDeviceTypes(String deviceTypes) {
|
||||
this.deviceTypes = deviceTypes;
|
||||
}
|
||||
|
||||
public String getDeviceIdentifiers() {
|
||||
return deviceIdentifiers;
|
||||
}
|
||||
|
||||
public void setDeviceIdentifiers(String deviceIdentifiers) {
|
||||
this.deviceIdentifiers = deviceIdentifiers;
|
||||
}
|
||||
}
|
||||
@ -23,6 +23,8 @@ import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationResponse;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.DeviceActivity;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OperationDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.Operation;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.OperationResponseMeta;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.OperationMapping;
|
||||
@ -124,4 +126,15 @@ public interface OperationDAO {
|
||||
|
||||
int getDeviceActivitiesCount(ActivityPaginationRequest activityPaginationRequest)
|
||||
throws OperationManagementDAOException;
|
||||
|
||||
/**
|
||||
* This method is used to get the details of device subscriptions related to a UUID.
|
||||
*
|
||||
* @param operationId the operationId of the operation to be retrieved.
|
||||
* @param tenantId id of the current tenant.
|
||||
* @return {@link OperationDTO} which contains the details of device operations.
|
||||
* @throws OperationManagementDAOException if connection establishment or SQL execution fails.
|
||||
*/
|
||||
OperationDTO getOperationDetailsById(int operationId, int tenantId)
|
||||
throws OperationManagementDAOException;
|
||||
}
|
||||
|
||||
@ -17,32 +17,36 @@
|
||||
*/
|
||||
package io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.impl;
|
||||
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.ProfileOperation;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.ActivityPaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.DeviceActivity;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.ActivityHolder;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.ActivityStatus;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.DeviceActivity;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationResponse;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.DeviceManagementConstants;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.util.DeviceManagementDAOUtil;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OperationDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OperationResponseDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.Operation;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.OperationResponseMeta;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.ProfileOperation;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.OperationMapping;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationDAO;
|
||||
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 io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOUtil;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.util.OperationDAOUtil;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
import org.json.JSONObject;
|
||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.ObjectOutputStream;
|
||||
import java.sql.Blob;
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
@ -2774,4 +2778,66 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public OperationDTO getOperationDetailsById(int operationId, int tenantId)
|
||||
throws OperationManagementDAOException {
|
||||
OperationDTO operationDetails = new OperationDTO();
|
||||
|
||||
String sql = "SELECT o.ID, " +
|
||||
"o.OPERATION_CODE, " +
|
||||
"o.OPERATION_DETAILS, " +
|
||||
"o.OPERATION_PROPERTIES, " +
|
||||
"r.OPERATION_RESPONSE, " +
|
||||
"r.RECEIVED_TIMESTAMP " +
|
||||
"FROM DM_OPERATION o " +
|
||||
"LEFT JOIN DM_DEVICE_OPERATION_RESPONSE r " +
|
||||
"ON o.ID = r.OPERATION_ID " +
|
||||
"WHERE o.ID = ? " +
|
||||
"AND o.TENANT_ID = ?";
|
||||
|
||||
try {
|
||||
Connection conn = OperationManagementDAOFactory.getConnection();
|
||||
try (PreparedStatement stmt = conn.prepareStatement(sql)) {
|
||||
stmt.setInt(1, operationId);
|
||||
stmt.setInt(2, tenantId);
|
||||
|
||||
try (ResultSet rs = stmt.executeQuery()) {
|
||||
List<OperationResponseDTO> responses = new ArrayList<>();
|
||||
while (rs.next()) {
|
||||
if (operationDetails.getOperationId() == 0) {
|
||||
operationDetails.setOperationId(rs.getInt("ID"));
|
||||
operationDetails.setOperationCode(rs.getString("OPERATION_CODE"));
|
||||
Blob detailsBlob = rs.getBlob("OPERATION_DETAILS");
|
||||
if (detailsBlob != null) {
|
||||
JSONObject operationDetailsJson = OperationDAOUtil.convertBlobToJsonObject(detailsBlob);
|
||||
operationDetails.setOperationDetails(operationDetailsJson);
|
||||
}
|
||||
Blob propertiesBlob = rs.getBlob("OPERATION_PROPERTIES");
|
||||
if (propertiesBlob != null) {
|
||||
JSONObject operationPropertiesJson = OperationDAOUtil.convertBlobToJsonObject(propertiesBlob);
|
||||
operationDetails.setOperationProperties(operationPropertiesJson);
|
||||
}
|
||||
}
|
||||
|
||||
String response = rs.getString("OPERATION_RESPONSE");
|
||||
Timestamp responseTimestamp = rs.getTimestamp("RECEIVED_TIMESTAMP");
|
||||
if (response != null && responseTimestamp != null) {
|
||||
OperationResponseDTO operationResponse = new OperationResponseDTO();
|
||||
operationResponse.setOperationResponse(response);
|
||||
operationResponse.setResponseTimeStamp(responseTimestamp);
|
||||
responses.add(operationResponse);
|
||||
}
|
||||
}
|
||||
operationDetails.setOperationResponses(responses);
|
||||
}
|
||||
}
|
||||
} catch (SQLException e) {
|
||||
String msg = "Error occurred while retrieving operation details for operation ID: " + operationId;
|
||||
log.error(msg, e);
|
||||
throw new OperationManagementDAOException(msg, e);
|
||||
}
|
||||
|
||||
return operationDetails;
|
||||
}
|
||||
}
|
||||
|
||||
@ -33,10 +33,14 @@ import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.Operation;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.PolicyOperation;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.operation.mgt.ProfileOperation;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.ObjectInputStream;
|
||||
import java.sql.Blob;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Timestamp;
|
||||
@ -387,4 +391,53 @@ public class OperationDAOUtil {
|
||||
return operation;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param blob
|
||||
* @return
|
||||
* @throws SQLException
|
||||
*/
|
||||
public static JSONObject convertBlobToJsonObject(Blob blob) throws SQLException {
|
||||
String jsonString;
|
||||
try (InputStream inputStream = blob.getBinaryStream();
|
||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
|
||||
int bytesRead;
|
||||
byte[] buffer = new byte[4096];
|
||||
while ((bytesRead = inputStream.read(buffer)) != -1) {
|
||||
outputStream.write(buffer, 0, bytesRead);
|
||||
}
|
||||
byte[] blobBytes = outputStream.toByteArray();
|
||||
|
||||
// Check if the blob data is a serialized Java object
|
||||
if (blobBytes.length > 2 && (blobBytes[0] & 0xFF) == 0xAC && (blobBytes[1] & 0xFF) == 0xED) {
|
||||
// Deserialize the object
|
||||
try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(blobBytes))) {
|
||||
Object obj = ois.readObject();
|
||||
if (obj instanceof String) {
|
||||
jsonString = (String) obj;
|
||||
} else {
|
||||
jsonString = new JSONObject(obj).toString();
|
||||
}
|
||||
} catch (ClassNotFoundException e) {
|
||||
String msg = "Failed to deserialize object from BLOB";
|
||||
log.error(msg, e);
|
||||
throw new SQLException(msg, e);
|
||||
}
|
||||
} else {
|
||||
// If not serialized, treat it as plain JSON string
|
||||
jsonString = new String(blobBytes, "UTF-8");
|
||||
}
|
||||
} catch (IOException e) {
|
||||
String msg = "Failed to convert BLOB to JSON string";
|
||||
log.error(msg, e);
|
||||
throw new SQLException(msg, e);
|
||||
}
|
||||
// Convert JSON string to JSONObject
|
||||
if (jsonString == null || jsonString.isEmpty()) {
|
||||
String msg = "Converted JSON string is null or empty";
|
||||
log.error(msg);
|
||||
throw new SQLException(msg);
|
||||
}
|
||||
return new JSONObject(jsonString);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -19,6 +19,9 @@
|
||||
package io.entgra.device.mgt.core.device.mgt.core.service;
|
||||
|
||||
import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OperationDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OwnerWithDeviceDTO;
|
||||
import org.apache.commons.collections.map.SingletonMap;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.*;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
|
||||
@ -1074,6 +1077,42 @@ public interface DeviceManagementProviderService {
|
||||
List<Device> getEnrolledDevicesPriorTo(Date before) throws DeviceManagementException;
|
||||
void deleteDeviceDataByTenantDomain(String tenantDomain) throws DeviceManagementException;
|
||||
|
||||
/**
|
||||
* Get owner details and device IDs for a given owner and tenant.
|
||||
*
|
||||
* @param owner the name of the owner.
|
||||
* @return {@link OwnerWithDeviceDTO} which contains a list of devices related to a user.
|
||||
* @throws DeviceManagementException if an error occurs while fetching owner details.
|
||||
*/
|
||||
OwnerWithDeviceDTO getOwnersWithDeviceIds(String owner) throws DeviceManagementDAOException;
|
||||
|
||||
/**
|
||||
* Get owner details and device IDs for a given owner and tenant.
|
||||
*
|
||||
* @param deviceId the deviceId of the device.
|
||||
* @return {@link OwnerWithDeviceDTO} which contains a list of devices related to a user.
|
||||
* @throws DeviceManagementException if an error occurs while fetching owner details.
|
||||
*/
|
||||
OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int deviceId) throws DeviceManagementDAOException;
|
||||
|
||||
/**
|
||||
* Get owner details and device IDs for a given owner and tenant.
|
||||
* @param tenantId the tenant id which devices need to be retried
|
||||
* @return {@link DeviceDetailsDTO} which contains devices details.
|
||||
* @throws DeviceManagementException if an error occurs while fetching owner details.
|
||||
*/
|
||||
List<DeviceDetailsDTO> getDevicesByTenantId(int tenantId) throws DeviceManagementDAOException;
|
||||
|
||||
/**
|
||||
* Get operation details by operation code.
|
||||
*
|
||||
* @param operationId the id of the operation.
|
||||
* @return {@link OperationDTO} which contains operation details.
|
||||
* @throws OperationManagementException if an error occurs while fetching the operation details.
|
||||
*/
|
||||
OperationDTO getOperationDetailsById(int operationId) throws OperationManagementException;
|
||||
|
||||
|
||||
/**
|
||||
* Method to retrieve all the devices that are not in a group with pagination support.
|
||||
*
|
||||
|
||||
@ -22,6 +22,11 @@ import com.google.common.reflect.TypeToken;
|
||||
import com.google.gson.Gson;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.metadata.mgt.DeviceStatusManagementService;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.TenantDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OwnerWithDeviceDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OperationDTO;
|
||||
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 io.entgra.device.mgt.core.device.mgt.extensions.logger.spi.EntgraLogger;
|
||||
import io.entgra.device.mgt.core.notification.logger.DeviceEnrolmentLogContext;
|
||||
import io.entgra.device.mgt.core.notification.logger.impl.EntgraDeviceEnrolmentLoggerImpl;
|
||||
@ -120,6 +125,7 @@ import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceStatusDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceTypeDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.EnrollmentDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.util.DeviceManagementDAOUtil;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceDetailsMgtException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.device.details.mgt.DeviceInformationManager;
|
||||
@ -173,6 +179,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
private final DeviceDAO deviceDAO;
|
||||
private final DeviceTypeDAO deviceTypeDAO;
|
||||
private final EnrollmentDAO enrollmentDAO;
|
||||
private final OperationDAO operationDAO;
|
||||
private final ApplicationDAO applicationDAO;
|
||||
private MetadataDAO metadataDAO;
|
||||
private final DeviceStatusDAO deviceStatusDAO;
|
||||
@ -185,6 +192,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
this.applicationDAO = DeviceManagementDAOFactory.getApplicationDAO();
|
||||
this.deviceTypeDAO = DeviceManagementDAOFactory.getDeviceTypeDAO();
|
||||
this.enrollmentDAO = DeviceManagementDAOFactory.getEnrollmentDAO();
|
||||
this.operationDAO = OperationManagementDAOFactory.getOperationDAO();
|
||||
this.metadataDAO = MetadataManagementDAOFactory.getMetadataDAO();
|
||||
this.deviceStatusDAO = DeviceManagementDAOFactory.getDeviceStatusDAO();
|
||||
this.tenantDao = DeviceManagementDAOFactory.getTenantDAO();
|
||||
@ -5340,6 +5348,107 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public OwnerWithDeviceDTO getOwnersWithDeviceIds(String owner) throws DeviceManagementDAOException {
|
||||
int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
|
||||
OwnerWithDeviceDTO ownerWithDeviceDTO;
|
||||
|
||||
try {
|
||||
DeviceManagementDAOFactory.openConnection();
|
||||
ownerWithDeviceDTO = this.enrollmentDAO.getOwnersWithDevices(owner, tenantId);
|
||||
if (ownerWithDeviceDTO == null) {
|
||||
String msg = "No data found for owner: " + owner;
|
||||
log.error(msg);
|
||||
throw new DeviceManagementDAOException(msg);
|
||||
}
|
||||
List<Integer> deviceIds = ownerWithDeviceDTO.getDeviceIds();
|
||||
if (deviceIds != null) {
|
||||
ownerWithDeviceDTO.setDeviceCount(deviceIds.size());
|
||||
} else {
|
||||
ownerWithDeviceDTO.setDeviceCount(0);
|
||||
}
|
||||
} catch (DeviceManagementDAOException | SQLException e) {
|
||||
String msg = "Error occurred while retrieving device IDs for owner: " + owner;
|
||||
log.error(msg, e);
|
||||
throw new DeviceManagementDAOException(msg, e);
|
||||
} finally {
|
||||
DeviceManagementDAOFactory.closeConnection();
|
||||
}
|
||||
return ownerWithDeviceDTO;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int deviceId) throws DeviceManagementDAOException {
|
||||
int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
|
||||
OwnerWithDeviceDTO deviceOwnerWithStatus;
|
||||
|
||||
try {
|
||||
DeviceManagementDAOFactory.openConnection();
|
||||
deviceOwnerWithStatus = enrollmentDAO.getOwnerWithDeviceByDeviceId(deviceId, tenantId);
|
||||
if (deviceOwnerWithStatus == null) {
|
||||
throw new DeviceManagementDAOException("No data found for device ID: " + deviceId);
|
||||
}
|
||||
List<Integer> deviceIds = deviceOwnerWithStatus.getDeviceIds();
|
||||
if (deviceIds != null) {
|
||||
deviceOwnerWithStatus.setDeviceCount(deviceIds.size());
|
||||
} else {
|
||||
deviceOwnerWithStatus.setDeviceCount(0);
|
||||
}
|
||||
} catch (DeviceManagementDAOException | SQLException e) {
|
||||
String msg = "Error occurred while retrieving owner and status for device ID: " + deviceId;
|
||||
log.error(msg, e);
|
||||
throw new DeviceManagementDAOException(msg, e);
|
||||
} finally {
|
||||
DeviceManagementDAOFactory.closeConnection();
|
||||
}
|
||||
return deviceOwnerWithStatus;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceDetailsDTO> getDevicesByTenantId(int tenantId) throws DeviceManagementDAOException {
|
||||
List<DeviceDetailsDTO> devices;
|
||||
try {
|
||||
DeviceManagementDAOFactory.openConnection();
|
||||
devices = enrollmentDAO.getDevicesByTenantId(tenantId);
|
||||
if (devices == null || devices.isEmpty()) {
|
||||
String msg = "No devices found for tenant ID: " + tenantId;
|
||||
log.error(msg);
|
||||
throw new DeviceManagementDAOException(msg);
|
||||
}
|
||||
} catch (DeviceManagementDAOException | SQLException e) {
|
||||
String msg = "Error occurred while retrieving devices for tenant ID: " + tenantId;
|
||||
log.error(msg, e);
|
||||
throw new DeviceManagementDAOException(msg, e);
|
||||
} finally {
|
||||
DeviceManagementDAOFactory.closeConnection();
|
||||
}
|
||||
return devices;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public OperationDTO getOperationDetailsById(int operationId) throws OperationManagementException {
|
||||
int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
|
||||
OperationDTO operationDetails;
|
||||
try {
|
||||
OperationManagementDAOFactory.openConnection();
|
||||
operationDetails = this.operationDAO.getOperationDetailsById(operationId, tenantId);
|
||||
if (operationDetails == null) {
|
||||
String msg = "No operation details found for operation ID: " + operationId;
|
||||
log.error(msg);
|
||||
throw new OperationManagementException(msg);
|
||||
}
|
||||
} catch (SQLException | OperationManagementDAOException e) {
|
||||
String msg = "Error occurred while retrieving operation details for operation ID: " + operationId;
|
||||
log.error(msg, e);
|
||||
throw new OperationManagementException(msg, e);
|
||||
} finally {
|
||||
OperationManagementDAOFactory.closeConnection();
|
||||
}
|
||||
return operationDetails;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PaginationResult getDevicesNotInGroup(PaginationRequest request, boolean requireDeviceInfo)
|
||||
throws DeviceManagementException {
|
||||
|
||||
@ -30,6 +30,7 @@ import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupAlreadyExistEx
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupNotExistException;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.RoleDoesNotExistException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.GroupDetailsDTO;
|
||||
import org.wso2.carbon.user.api.AuthorizationManager;
|
||||
import org.wso2.carbon.user.api.UserStoreManager;
|
||||
|
||||
@ -371,4 +372,16 @@ public interface GroupManagementProviderService {
|
||||
DeviceTypesOfGroups getDeviceTypesOfGroups(List<String> identifiers) throws GroupManagementException;
|
||||
|
||||
DeviceGroup getUserOwnGroup(int groupId, boolean requireGroupProps, int depth) throws GroupManagementException;
|
||||
|
||||
/**
|
||||
* Get group details and device IDs for a given group name.
|
||||
*
|
||||
* @param groupName the name of the group.
|
||||
* @param offset the offset for the data set
|
||||
* @param limit the limit for the data set
|
||||
* @return {@link GroupDetailsDTO} which containing group details and a list of device IDs
|
||||
* @throws GroupManagementException if an error occurs while fetching group details.
|
||||
*/
|
||||
GroupDetailsDTO getGroupDetailsWithDevices(String groupName, int offset, int limit) throws GroupManagementException;
|
||||
|
||||
}
|
||||
|
||||
@ -26,13 +26,13 @@ import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupAlreadyExistEx
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupNotExistException;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.group.mgt.RoleDoesNotExistException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.GroupDetailsDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.GroupDAO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.GroupManagementDAOException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.GroupManagementDAOFactory;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.permission.mgt.PermissionManagerServiceImpl;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
@ -1629,6 +1629,7 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
|
||||
createGroupWithChildren(nextParentGroup, childrenGroups, requireGroupProps, tenantId, depth, counter);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public DeviceTypesOfGroups getDeviceTypesOfGroups(List<String> identifiers) throws GroupManagementException {
|
||||
DeviceTypesOfGroups deviceTypesOfGroups = new DeviceTypesOfGroups();
|
||||
@ -1685,4 +1686,37 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
|
||||
|
||||
return deviceTypesOfGroups;
|
||||
}
|
||||
|
||||
@Override
|
||||
public GroupDetailsDTO getGroupDetailsWithDevices(String groupName, int offset, int limit)
|
||||
throws GroupManagementException {
|
||||
if (log.isDebugEnabled()) {
|
||||
log.debug("Retrieving group details and device IDs for group: " + groupName);
|
||||
}
|
||||
int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
|
||||
GroupDetailsDTO groupDetailsWithDevices;
|
||||
|
||||
try {
|
||||
GroupManagementDAOFactory.openConnection();
|
||||
groupDetailsWithDevices = this.groupDAO.getGroupDetailsWithDevices(groupName, tenantId, offset, limit);
|
||||
} catch (GroupManagementDAOException | SQLException e) {
|
||||
String msg = "Error occurred while retrieving group details and device IDs for group: " + groupName;
|
||||
log.error(msg, e);
|
||||
throw new GroupManagementException(msg, e);
|
||||
} finally {
|
||||
GroupManagementDAOFactory.closeConnection();
|
||||
}
|
||||
|
||||
if (groupDetailsWithDevices != null) {
|
||||
List<Integer> deviceIds = groupDetailsWithDevices.getDeviceIds();
|
||||
if (deviceIds != null) {
|
||||
groupDetailsWithDevices.setDeviceCount(deviceIds.size());
|
||||
} else {
|
||||
groupDetailsWithDevices.setDeviceCount(0);
|
||||
}
|
||||
}
|
||||
|
||||
return groupDetailsWithDevices;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -37,10 +37,15 @@ import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOFactory;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.status.task.DeviceStatusTaskException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.task.impl.DynamicPartitionedScheduleTask;
|
||||
import org.wso2.carbon.context.CarbonContext;
|
||||
import org.wso2.carbon.context.PrivilegedCarbonContext;
|
||||
import org.wso2.carbon.user.api.UserStoreException;
|
||||
import org.wso2.carbon.user.core.service.RealmService;
|
||||
|
||||
import java.sql.SQLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* This implements the Task service which monitors the device activity periodically & update the device-status if
|
||||
@ -92,33 +97,70 @@ public class DeviceStatusMonitoringTask extends DynamicPartitionedScheduleTask {
|
||||
try {
|
||||
List<EnrolmentInfo> enrolmentInfoTobeUpdated = new ArrayList<>();
|
||||
List<DeviceMonitoringData> allDevicesForMonitoring = getAllDevicesForMonitoring();
|
||||
long timeMillis = System.currentTimeMillis();
|
||||
for (DeviceMonitoringData monitoringData : allDevicesForMonitoring) {
|
||||
long lastUpdatedTime = (timeMillis - monitoringData
|
||||
.getLastUpdatedTime()) / 1000;
|
||||
|
||||
EnrolmentInfo enrolmentInfo = monitoringData.getDevice().getEnrolmentInfo();
|
||||
EnrolmentInfo.Status status = null;
|
||||
if (lastUpdatedTime >= deviceStatusTaskPluginConfig
|
||||
.getIdleTimeToMarkInactive()) {
|
||||
status = EnrolmentInfo.Status.INACTIVE;
|
||||
} else if (lastUpdatedTime >= deviceStatusTaskPluginConfig
|
||||
.getIdleTimeToMarkUnreachable()) {
|
||||
status = EnrolmentInfo.Status.UNREACHABLE;
|
||||
}
|
||||
|
||||
if (status != null) {
|
||||
enrolmentInfo.setStatus(status);
|
||||
enrolmentInfoTobeUpdated.add(enrolmentInfo);
|
||||
DeviceIdentifier deviceIdentifier =
|
||||
new DeviceIdentifier(monitoringData.getDevice()
|
||||
.getDeviceIdentifier(), deviceType);
|
||||
monitoringData.getDevice().setEnrolmentInfo(enrolmentInfo);
|
||||
DeviceCacheManagerImpl.getInstance().addDeviceToCache(deviceIdentifier,
|
||||
monitoringData.getDevice(), monitoringData.getTenantId());
|
||||
Map<Integer, List<DeviceMonitoringData>> tenantDevicesMap = new HashMap<>();
|
||||
List<DeviceMonitoringData> tenantMonitoringData = null;
|
||||
//Delegate the devices in each tenant to a separate list to be updated the statuses.
|
||||
//This improvement has been done since the tenants maintain a separate caches and the task is running
|
||||
//in the super-tenant space. Hence, the device status updates are not reflected in the tenant caches.
|
||||
//Refer to https://roadmap.entgra.net/issues/11386 for more information.
|
||||
for (DeviceMonitoringData deviceMonitoringData : allDevicesForMonitoring) {
|
||||
tenantMonitoringData = tenantDevicesMap.get(deviceMonitoringData.getTenantId());
|
||||
if (tenantMonitoringData == null) {
|
||||
tenantMonitoringData = new ArrayList<>();
|
||||
}
|
||||
tenantMonitoringData.add(deviceMonitoringData);
|
||||
tenantDevicesMap.put(deviceMonitoringData.getTenantId(), tenantMonitoringData);
|
||||
}
|
||||
|
||||
List<DeviceMonitoringData> monitoringDevices = null;
|
||||
long timeMillis = System.currentTimeMillis();
|
||||
//Retrieving the devices belongs for each tenants and updating the status of the devices.
|
||||
for (Map.Entry<Integer, List<DeviceMonitoringData>> entry : tenantDevicesMap.entrySet()) {
|
||||
Integer tenantId = entry.getKey();
|
||||
RealmService realmService = DeviceManagementDataHolder.getInstance().getRealmService();
|
||||
if (realmService != null) {
|
||||
String domain = realmService.getTenantManager().getDomain(tenantId);
|
||||
if (domain != null) {
|
||||
try {
|
||||
PrivilegedCarbonContext.startTenantFlow();
|
||||
PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(domain, true);
|
||||
monitoringDevices = entry.getValue();
|
||||
for (DeviceMonitoringData monitoringData : monitoringDevices) {
|
||||
long lastUpdatedTime = (timeMillis - monitoringData
|
||||
.getLastUpdatedTime()) / 1000;
|
||||
|
||||
EnrolmentInfo enrolmentInfo = monitoringData.getDevice().getEnrolmentInfo();
|
||||
EnrolmentInfo.Status status = null;
|
||||
if (lastUpdatedTime >= deviceStatusTaskPluginConfig
|
||||
.getIdleTimeToMarkInactive()) {
|
||||
status = EnrolmentInfo.Status.INACTIVE;
|
||||
} else if (lastUpdatedTime >= deviceStatusTaskPluginConfig
|
||||
.getIdleTimeToMarkUnreachable()) {
|
||||
status = EnrolmentInfo.Status.UNREACHABLE;
|
||||
}
|
||||
|
||||
if (status != null) {
|
||||
enrolmentInfo.setStatus(status);
|
||||
enrolmentInfoTobeUpdated.add(enrolmentInfo);
|
||||
DeviceIdentifier deviceIdentifier =
|
||||
new DeviceIdentifier(monitoringData.getDevice()
|
||||
.getDeviceIdentifier(), deviceType);
|
||||
monitoringData.getDevice().setEnrolmentInfo(enrolmentInfo);
|
||||
DeviceCacheManagerImpl.getInstance().addDeviceToCache(deviceIdentifier,
|
||||
monitoringData.getDevice(), monitoringData.getTenantId());
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
PrivilegedCarbonContext.endTenantFlow();
|
||||
}
|
||||
} else {
|
||||
log.error("Failed while running the device status update task. Failed while " +
|
||||
"extracting tenant domain of the tenant id : " + tenantId);
|
||||
}
|
||||
} else {
|
||||
log.error("Failed while running the device status update task. RealmService is not initiated");
|
||||
}
|
||||
}
|
||||
if (!enrolmentInfoTobeUpdated.isEmpty()) {
|
||||
try {
|
||||
this.updateDeviceStatus(enrolmentInfoTobeUpdated);
|
||||
@ -127,11 +169,12 @@ public class DeviceStatusMonitoringTask extends DynamicPartitionedScheduleTask {
|
||||
"device-status of devices of type '" + deviceType + "'", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
} catch (DeviceManagementException e) {
|
||||
String msg = "Error occurred while retrieving devices list for monitoring.";
|
||||
log.error(msg, e);
|
||||
} catch (UserStoreException e) {
|
||||
String msg = "Error occurred while retrieving RealmService instance for updating device status.";
|
||||
log.error(msg, e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -30,6 +30,7 @@ import io.entgra.device.mgt.core.device.mgt.common.app.mgt.App;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.app.mgt.windows.EnterpriseApplication;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.app.mgt.windows.HostedAppxApplication;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.app.mgt.windows.HostedMSIApplication;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.app.mgt.windows.WebClipApplication;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.exceptions.UnknownApplicationTypeException;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.ProfileOperation;
|
||||
@ -54,7 +55,6 @@ public class MDMWindowsOperationUtil {
|
||||
public static Operation createInstallAppOperation(App application) throws UnknownApplicationTypeException {
|
||||
|
||||
ProfileOperation operation = new ProfileOperation();
|
||||
operation.setCode(MDMAppConstants.WindowsConstants.INSTALL_ENTERPRISE_APPLICATION);
|
||||
operation.setType(Operation.Type.PROFILE);
|
||||
String appType = windowsAppType(application.getName());
|
||||
String metaData = application.getMetaData();
|
||||
@ -62,6 +62,7 @@ public class MDMWindowsOperationUtil {
|
||||
|
||||
switch (application.getType()) {
|
||||
case ENTERPRISE:
|
||||
operation.setCode(MDMAppConstants.WindowsConstants.INSTALL_ENTERPRISE_APPLICATION);
|
||||
EnterpriseApplication enterpriseApplication = new EnterpriseApplication();
|
||||
if (appType.equalsIgnoreCase(MDMAppConstants.WindowsConstants.APPX)) {
|
||||
HostedAppxApplication hostedAppxApplication = new HostedAppxApplication();
|
||||
@ -111,6 +112,16 @@ public class MDMWindowsOperationUtil {
|
||||
}
|
||||
operation.setPayLoad(enterpriseApplication.toJSON());
|
||||
break;
|
||||
case WEB_CLIP:
|
||||
operation.setCode(MDMAppConstants.WindowsConstants.INSTALL_WEB_CLIP_APPLICATION);
|
||||
WebClipApplication webClipApplication = new WebClipApplication();
|
||||
webClipApplication.setUrl(application.getLocation());
|
||||
webClipApplication.setName(application.getName());
|
||||
webClipApplication.setIcon(application.getIconImage());
|
||||
webClipApplication.setProperties(application.getProperties());
|
||||
webClipApplication.setType(application.getType().toString());
|
||||
operation.setPayLoad(webClipApplication.toJSON());
|
||||
break;
|
||||
default:
|
||||
String msg = "Application type " + application.getType() + " is not supported";
|
||||
log.error(msg);
|
||||
@ -130,7 +141,6 @@ public class MDMWindowsOperationUtil {
|
||||
public static Operation createUninstallAppOperation(App application) throws UnknownApplicationTypeException {
|
||||
|
||||
ProfileOperation operation = new ProfileOperation();
|
||||
operation.setCode(MDMAppConstants.WindowsConstants.UNINSTALL_ENTERPRISE_APPLICATION);
|
||||
operation.setType(Operation.Type.PROFILE);
|
||||
String appType = windowsAppType(application.getName());
|
||||
String metaData = application.getMetaData();
|
||||
@ -138,6 +148,7 @@ public class MDMWindowsOperationUtil {
|
||||
|
||||
switch (application.getType()) {
|
||||
case ENTERPRISE:
|
||||
operation.setCode(MDMAppConstants.WindowsConstants.UNINSTALL_ENTERPRISE_APPLICATION);
|
||||
EnterpriseApplication enterpriseApplication = new EnterpriseApplication();
|
||||
if (appType.equalsIgnoreCase(MDMAppConstants.WindowsConstants.APPX)) {
|
||||
HostedAppxApplication hostedAppxApplication = new HostedAppxApplication();
|
||||
@ -187,6 +198,15 @@ public class MDMWindowsOperationUtil {
|
||||
}
|
||||
operation.setPayLoad(enterpriseApplication.toJSON());
|
||||
break;
|
||||
case WEB_CLIP:
|
||||
operation.setCode(MDMAppConstants.WindowsConstants.UNINSTALL_WEB_CLIP_APPLICATION);
|
||||
WebClipApplication webClipApplication = new WebClipApplication();
|
||||
webClipApplication.setUrl(application.getLocation());
|
||||
webClipApplication.setName(application.getName());
|
||||
webClipApplication.setIcon(application.getIconImage());
|
||||
webClipApplication.setProperties(application.getProperties());
|
||||
webClipApplication.setType(application.getType().toString());
|
||||
operation.setPayLoad(webClipApplication.toJSON());
|
||||
default:
|
||||
String msg = "Application type " + application.getType() + " is not supported";
|
||||
log.error(msg);
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -18,6 +18,7 @@
|
||||
|
||||
package io.entgra.device.mgt.core.device.mgt.extensions.device.type.template;
|
||||
|
||||
import io.entgra.device.mgt.core.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
|
||||
import org.apache.tomcat.jdbc.pool.PoolProperties;
|
||||
import org.mockito.Mockito;
|
||||
import org.testng.annotations.BeforeSuite;
|
||||
@ -131,6 +132,7 @@ public class BaseExtensionsTest {
|
||||
readDataSourceConfig(datasourceLocation + DATASOURCE_EXT));
|
||||
DeviceManagementDAOFactory.init(dataSource);
|
||||
MetadataManagementDAOFactory.init(dataSource);
|
||||
OperationManagementDAOFactory.init(dataSource);
|
||||
}
|
||||
|
||||
protected DataSourceConfig readDataSourceConfig(String configLocation) throws DeviceManagementException {
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<artifactId>device-mgt</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>heartbeat-management</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>identity-extensions</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>identity-extensions</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>logger</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>io.entgra.device.mgt.core.notification.logger</artifactId>
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>operation-template-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>policy-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>policy-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>policy-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>policy-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>subtype-mgt</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.core</groupId>
|
||||
<artifactId>io.entgra.device.mgt.core.parent</artifactId>
|
||||
<version>5.0.42-SNAPSHOT</version>
|
||||
<version>5.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user