Add parent group id column

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java

@@ -196,11 +196,11 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
             Connection conn = GroupManagementDAOFactory.getConnection();
             String sql;
             if (deviceGroup.getStatus() == null || deviceGroup.getStatus().isEmpty()) {
-                sql = "INSERT INTO DM_GROUP(DESCRIPTION, GROUP_NAME, OWNER, TENANT_ID, PARENT_PATH) "
-                        + "VALUES (?, ?, ?, ?, ?)";
-            } else {
-                sql = "INSERT INTO DM_GROUP(DESCRIPTION, GROUP_NAME, OWNER, TENANT_ID, PARENT_PATH, STATUS) "
+                sql = "INSERT INTO DM_GROUP(DESCRIPTION, GROUP_NAME, OWNER, TENANT_ID, PARENT_PATH, PARENT_GROUP_ID) "
                         + "VALUES (?, ?, ?, ?, ?, ?)";
+            } else {
+                sql = "INSERT INTO DM_GROUP(DESCRIPTION, GROUP_NAME, OWNER, TENANT_ID, PARENT_PATH, STATUS, PARENT_GROUP_ID) "
+                        + "VALUES (?, ?, ?, ?, ?, ?, ?)";
                 hasStatus = true;
             }
             stmt = conn.prepareStatement(sql, new String[]{"ID"});
@@ -212,6 +212,7 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
             if (hasStatus) {
                 stmt.setString(6, deviceGroup.getStatus());
             }
+            stmt.setInt(7, deviceGroup.getParentGroupId());
 
             stmt.executeUpdate();
             rs = stmt.getGeneratedKeys();

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/util/GroupManagementDAOUtil.java

@@ -103,6 +103,7 @@ public final class GroupManagementDAOUtil {
         group.setOwner(resultSet.getString("OWNER"));
         group.setStatus(resultSet.getString("STATUS"));
         group.setParentPath(resultSet.getString("PARENT_PATH"));
+        group.setParentGroupId(resultSet.getInt("PARENT_GROUP_ID"));
         return group;
     }