Merge pull request #6906 from devtron-labs/update-user-audit-for-api-token

prakash100198 · web-flow · commit 17c5b9916f1a · 2026-01-02T14:43:41.000+05:30
misc: Use `Update` instead of `Save` for upserting `userAudit` entries to p…
diff --git a/pkg/auth/user/UserService.go b/pkg/auth/user/UserService.go
@@ -1664,7 +1664,10 @@ func (impl *UserServiceImpl) saveUserAudit(r *http.Request, userId int32) {
 		CreatedOn: time.Now(),
 		UpdatedOn: time.Now(),
 	}
-	impl.userAuditService.Save(userAudit)
+	// Using Update instead of Save to upsert (update if exists, insert if not)
+	// This prevents the user_audit table from filling up with duplicate entries
+	// for API token users
+	impl.userAuditService.Update(userAudit)
 }
 
 func (impl *UserServiceImpl) GetRoleFiltersByUserRoleGroups(userRoleGroups []userBean.UserRoleGroup) ([]userBean.RoleFilter, error) {

Original file line number	Diff line number	Diff line change
`@@ -1664,7 +1664,10 @@ func (impl UserServiceImpl) saveUserAudit(r http.Request, userId int32) {`
`1664`	`1664`	`CreatedOn: time.Now(),`
`1665`	`1665`	`UpdatedOn: time.Now(),`
`1666`	`1666`	`}`
`1667`		`- impl.userAuditService.Save(userAudit)`
	`1667`	`+ // Using Update instead of Save to upsert (update if exists, insert if not)`
	`1668`	`+ // This prevents the user_audit table from filling up with duplicate entries`
	`1669`	`+ // for API token users`
	`1670`	`+ impl.userAuditService.Update(userAudit)`
`1668`	`1671`	`}`
`1669`	`1672`
`1670`	`1673`	`func (impl *UserServiceImpl) GetRoleFiltersByUserRoleGroups(userRoleGroups []userBean.UserRoleGroup) ([]userBean.RoleFilter, error) {`