Return conflict when removing a referenced person

Deleting a profile still referenced elsewhere (for example as an
asset owner) surfaced an internal error. PostgreSQL reports ON DELETE
RESTRICT blocks as SQLSTATE 23001, not 23503; map both in profile
delete and propagate ErrProfileInUse through removeUser as CONFLICT.

Signed-off-by: Ludovic Vielle <ludovic@probo.com>
This commit is contained in:
Ludovic Vielle
2026-06-26 14:51:23 +02:00
committed by Bryan Frimin
parent 9e47aba2b6
commit 888fa4d63a
7 changed files with 88 additions and 2 deletions

View File

@@ -180,6 +180,18 @@ func (e ErrLastActiveOwner) Error() string {
return fmt.Sprintf("cannot remove profile %q: last active owner of the organization", e.MembershipID)
}
type ErrProfileInUse struct {
ProfileID gid.GID
}
func NewProfileInUseError(profileID gid.GID) error {
return &ErrProfileInUse{ProfileID: profileID}
}
func (e ErrProfileInUse) Error() string {
return fmt.Sprintf("cannot remove profile %q: referenced by other resources", e.ProfileID)
}
type ErrOrganizationNotFound struct{ OrganizationID gid.GID }
func NewOrganizationNotFoundError(organizationID gid.GID) error {

View File

@@ -354,6 +354,10 @@ func (s *OrganizationService) RemoveUser(
}
if err := profile.Delete(ctx, tx, scope, profileID); err != nil {
if errors.Is(err, coredata.ErrResourceInUse) {
return NewProfileInUseError(profileID)
}
return fmt.Errorf("cannot delete profile: %w", err)
}