From 5bc39dd7dcd569fbe6ae4b318f063eab816b7eb8 Mon Sep 17 00:00:00 2001
From: Saad Sahibjan <saadsahibjan@gmail.com>
Date: Thu, 24 Jun 2021 13:15:12 +0530
Subject: [PATCH] Update device group and request beans classes to have new
 variable

(cherry picked from commit f1892f726d6a36c64cc4d96eaed274ff3363b37a)
---
 .../mgt/common/GroupPaginationRequest.java    | 35 +++++++++++++
 .../mgt/common/group/mgt/DeviceGroup.java     | 50 +++++++++++++++++++
 2 files changed, 85 insertions(+)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/GroupPaginationRequest.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/GroupPaginationRequest.java
index d7a74f199b..9402d2ab37 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/GroupPaginationRequest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/GroupPaginationRequest.java
@@ -14,6 +14,23 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ *
+ * Copyright (c) 2021, Entgra (pvt) Ltd. (https://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 org.wso2.carbon.device.mgt.common;
@@ -28,6 +45,8 @@ public class GroupPaginationRequest {
     private String owner;
     private String groupName;
     private String status;
+    private String parentPath;
+    private int depth;
 
     public GroupPaginationRequest(int start, int rowCount) {
         this.startIndex = start;
@@ -74,6 +93,22 @@ public class GroupPaginationRequest {
         this.groupName = groupName;
     }
 
+    public String getParentPath() {
+        return parentPath;
+    }
+
+    public void setParentPath(String parentPath) {
+        this.parentPath = parentPath;
+    }
+
+    public int getDepth() {
+        return depth;
+    }
+
+    public void setDepth(int depth) {
+        this.depth = depth;
+    }
+
     @Override
     public String toString() {
         return "Group Name '" + this.groupName + "' num of rows: " + this.rowCount + " start index: " + this.startIndex
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java
index 20ed01fb49..a3511033d5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/group/mgt/DeviceGroup.java
@@ -14,6 +14,23 @@
  * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
+ *
+ *
+ * Copyright (c) 2021, Entgra (pvt) Ltd. (https://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 org.wso2.carbon.device.mgt.common.group.mgt;
 
@@ -21,6 +38,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -47,6 +65,15 @@ public class DeviceGroup implements Serializable {
     @ApiModelProperty(name = "status", value = "The status of group that needs updating/retrieval.")
     private String status;
 
+    @ApiModelProperty(name = "parentGroupId", value = "Group ID of parent group")
+    private int parentGroupId;
+
+    @ApiModelProperty(name = "parentPath", value = "Path of parent group")
+    private String parentPath;
+
+    @ApiModelProperty(name = "childrenGroups", value = "Children groups")
+    private List<DeviceGroup> childrenGroups;
+
     public String getStatus() {
         return status;
     }
@@ -103,4 +130,27 @@ public class DeviceGroup implements Serializable {
         this.groupProperties = groupProperties;
     }
 
+    public int getParentGroupId() {
+        return parentGroupId;
+    }
+
+    public void setParentGroupId(int parentGroupId) {
+        this.parentGroupId = parentGroupId;
+    }
+
+    public String getParentPath() {
+        return parentPath;
+    }
+
+    public void setParentPath(String parentPath) {
+        this.parentPath = parentPath;
+    }
+
+    public List<DeviceGroup> getChildrenGroups() {
+        return childrenGroups;
+    }
+
+    public void setChildrenGroups(List<DeviceGroup> childrenGroups) {
+        this.childrenGroups = childrenGroups;
+    }
 }