Chore: Differentiate the ErrOrgNotFound error messages (#64131)
* Better org not found error messages
This commit is contained in:
@@ -64,7 +64,7 @@ func (ss *sqlStore) Get(ctx context.Context, orgID int64) (*org.Org, error) {
|
||||
return err
|
||||
}
|
||||
if !has {
|
||||
return org.ErrOrgNotFound
|
||||
return org.ErrOrgNotFound.Errorf("failed to get organization with ID: %d", orgID)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
@@ -147,7 +147,7 @@ func (ss *sqlStore) Update(ctx context.Context, cmd *org.UpdateOrgCommand) error
|
||||
}
|
||||
|
||||
if affectedRows == 0 {
|
||||
return org.ErrOrgNotFound
|
||||
return org.ErrOrgNotFound.Errorf("failed to update organization with ID: %d", cmd.OrgId)
|
||||
}
|
||||
|
||||
sess.PublishAfterCommit(&events.OrgUpdated{
|
||||
@@ -210,7 +210,7 @@ func (ss *sqlStore) Delete(ctx context.Context, cmd *org.DeleteOrgCommand) error
|
||||
if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.ID); err != nil {
|
||||
return err
|
||||
} else if len(res) != 1 {
|
||||
return org.ErrOrgNotFound
|
||||
return org.ErrOrgNotFound.Errorf("failed to delete organisation with ID: %d", cmd.ID)
|
||||
}
|
||||
|
||||
deletes := []string{
|
||||
@@ -367,7 +367,7 @@ func (ss *sqlStore) AddOrgUser(ctx context.Context, cmd *org.AddOrgUserCommand)
|
||||
if res, err := sess.Query("SELECT 1 from org WHERE id=?", cmd.OrgID); err != nil {
|
||||
return err
|
||||
} else if len(res) != 1 {
|
||||
return org.ErrOrgNotFound
|
||||
return org.ErrOrgNotFound.Errorf("failed to add user to organization with ID: %d", cmd.OrgID)
|
||||
}
|
||||
|
||||
entity := org.OrgUser{
|
||||
@@ -524,7 +524,7 @@ func (ss *sqlStore) GetByID(ctx context.Context, query *org.GetOrgByIDQuery) (*o
|
||||
}
|
||||
|
||||
if !exists {
|
||||
return org.ErrOrgNotFound
|
||||
return org.ErrOrgNotFound.Errorf("failed to get org by ID: %d", query.ID)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
@@ -638,7 +638,7 @@ func (ss *sqlStore) GetByName(ctx context.Context, query *org.GetOrgByNameQuery)
|
||||
}
|
||||
|
||||
if !exists {
|
||||
return org.ErrOrgNotFound
|
||||
return org.ErrOrgNotFound.Errorf("failed to get org by name: %s", query.Name)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user