Improving the removal of users

ystv · Aug 10, 2024 · 8fcec55 · 8fcec55
1 parent 0e1d156
commit 8fcec55
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/user/db.go b/user/db.go
@@ -376,8 +376,8 @@ func (s *Store) removeRoleUser(ctx context.Context, ru RoleUser) error {
 	return nil
 }
 
-// removeRoleUser removes all links between role.Role and a User
-func (s *Store) removeRoleUsers(ctx context.Context, u User) error {
+// removeUserForRoles removes all links between role.Role and a User
+func (s *Store) removeUserForRoles(ctx context.Context, u User) error {
 	_, err := s.db.NamedExecContext(ctx, `DELETE FROM people.role_members WHERE user_id = :user_id`, u)
 	if err != nil {
 		return fmt.Errorf("failed to remove roleUsers: %w", err)

diff --git a/user/user.go b/user/user.go
@@ -375,8 +375,9 @@ func (s *Store) RemoveRoleUser(ctx context.Context, ru RoleUser) error {
 	return s.removeRoleUser(ctx, ru)
 }
 
-func (s *Store) RemoveRoleUsers(ctx context.Context, u User) error {
-	return s.removeRoleUsers(ctx, u)
+// RemoveUserForRoles removes links between a User and Roles
+func (s *Store) RemoveUserForRoles(ctx context.Context, u User) error {
+	return s.removeUserForRoles(ctx, u)
 }
 
 // GetPermissionsForRole returns all permissions for role

diff --git a/views/user.go b/views/user.go
@@ -628,7 +628,7 @@ func (v *Views) UserDeleteFunc(c echo.Context) error {
 			return fmt.Errorf("failed to get user for deleteUser: %w", err)
 		}
 
-		err = v.user.RemoveRoleUsers(c.Request().Context(), user1)
+		err = v.user.RemoveUserForRoles(c.Request().Context(), user1)
 		if err != nil {
 			return fmt.Errorf("failed to delete roleUsers for deleteUser: %w", err)
 		}