From 2f45f99f8b7ecbafb5b9a6ecae5a5774509f039a Mon Sep 17 00:00:00 2001
From: Akhilesh Pandey <akhilesh.pandey@harness.io>
Date: Tue, 5 Nov 2024 16:02:19 +0000
Subject: [PATCH] feat: [CODE-2573]: Allow ID to be sent in userGroupInfo
 object (#2923)

* feat: [CODE-2573]: Scan UserGroup ID to be returned after creation
* feat: [CODE-2573]: Allow ID to be sent in userGroupInfo object
---
 app/store/database/usergroup.go | 2 +-
 types/usergroup.go              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/store/database/usergroup.go b/app/store/database/usergroup.go
index 3dd2ed2fe..a6c5b31d5 100644
--- a/app/store/database/usergroup.go
+++ b/app/store/database/usergroup.go
@@ -198,7 +198,7 @@ func (s *UserGroupStore) Create(
 		return database.ProcessSQLErrorf(ctx, err, "Failed to bind usergroup object")
 	}
 
-	if _, err = db.ExecContext(ctx, query, arg...); err != nil {
+	if err = db.QueryRowContext(ctx, query, arg...).Scan(&userGroup.ID); err != nil {
 		return database.ProcessSQLErrorf(ctx, err, "Failed to insert usergroup")
 	}
 
diff --git a/types/usergroup.go b/types/usergroup.go
index 747be86dc..2fb42ee50 100644
--- a/types/usergroup.go
+++ b/types/usergroup.go
@@ -27,6 +27,7 @@ type UserGroup struct {
 }
 
 type UserGroupInfo struct {
+	ID          int64  `json:"id"`
 	Identifier  string `json:"identifier"`
 	Name        string `json:"name"`
 	Description string `json:"description"`
@@ -34,6 +35,7 @@ type UserGroupInfo struct {
 
 func (u *UserGroup) ToUserGroupInfo() *UserGroupInfo {
 	return &UserGroupInfo{
+		ID:          u.ID,
 		Identifier:  u.Identifier,
 		Name:        u.Name,
 		Description: u.Description,