IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Differentiate the ErrOrgNotFound error messages (#64131)

Browse Source 
* Better org not found error messages
This commit is contained in:
Sofia Papagiannaki
2023-03-06 09:57:46 +02:00
committed by GitHub
parent 1aadafe7d8
commit fde96c91c1
6 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/org/model.go
View File

@@ -7,15 +7,16 @@ import (
"github.com/grafana/grafana/pkg/models/roletype"
"github.com/grafana/grafana/pkg/services/user"
"github.com/grafana/grafana/pkg/util/errutil"
)
// Typed errors
var (
ErrOrgNotFound = errors.New("organization not found")
ErrOrgNameTaken = errors.New("organization name is taken")
ErrLastOrgAdmin = errors.New("cannot remove last organization admin")
ErrOrgUserNotFound = errors.New("cannot find the organization user")
ErrOrgUserAlreadyAdded = errors.New("user is already added to organization")
ErrOrgNotFound = errutil.NewBase(errutil.StatusNotFound, "org.notFound", errutil.WithPublicMessage("organization not found"))
)
type Org struct {

12
pkg/services/org/orgimpl/store.go
View File

@@ -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
})