Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-20 13:49:42 +02:00
Code Releases Activity

Fix silent error drop

Browse source
This commit is contained in:
McMatts 2018-04-05 14:25:36 +01:00
parent f2b1b5af03
commit b65a00dd1c
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
domain/group/mysql/store.go
View file

@ -58,6 +58,8 @@ func (s Scope) Get(ctx domain.RequestContext, refID string) (g group.Group, err
// GetAll returns all user groups for current orgID. // GetAll returns all user groups for current orgID.
func (s Scope) GetAll(ctx domain.RequestContext) (groups []group.Group, err error) { func (s Scope) GetAll(ctx domain.RequestContext) (groups []group.Group, err error) {
groups = []group.Group{}
err = s.Runtime.Db.Select(&groups, err = s.Runtime.Db.Select(&groups,
`SELECT a.id, a.refid, a.orgid, a.role as name, a.purpose, a.created, a.revised, COUNT(b.roleid) AS members `SELECT a.id, a.refid, a.orgid, a.role as name, a.purpose, a.created, a.revised, COUNT(b.roleid) AS members
FROM role a FROM role a
@ -67,9 +69,8 @@ func (s Scope) GetAll(ctx domain.RequestContext) (groups []group.Group, err erro
ORDER BY a.role`, ORDER BY a.role`,
ctx.OrgID) ctx.OrgID)
if err == sql.ErrNoRows || len(groups) == 0 { if err == sql.ErrNoRows {
err = nil err = nil
groups = []group.Group{}
} }
if err != nil { if err != nil {
err = errors.Wrap(err, "select groups") err = errors.Wrap(err, "select groups")
@ -101,6 +102,8 @@ func (s Scope) Delete(ctx domain.RequestContext, refID string) (rows int64, err
// GetGroupMembers returns all user associated with given group. // GetGroupMembers returns all user associated with given group.
func (s Scope) GetGroupMembers(ctx domain.RequestContext, groupID string) (members []group.Member, err error) { func (s Scope) GetGroupMembers(ctx domain.RequestContext, groupID string) (members []group.Member, err error) {
members = []group.Member{}
err = s.Runtime.Db.Select(&members, err = s.Runtime.Db.Select(&members,
`SELECT a.id, a.orgid, a.roleid, a.userid, `SELECT a.id, a.orgid, a.roleid, a.userid,
IFNULL(b.firstname, '') as firstname, IFNULL(b.lastname, '') as lastname IFNULL(b.firstname, '') as firstname, IFNULL(b.lastname, '') as lastname
@ -110,9 +113,8 @@ func (s Scope) GetGroupMembers(ctx domain.RequestContext, groupID string) (membe
ORDER BY b.firstname, b.lastname`, ORDER BY b.firstname, b.lastname`,
ctx.OrgID, groupID) ctx.OrgID, groupID)
if err == sql.ErrNoRows || len(members) == 0 { if err == sql.ErrNoRows {
err = nil err = nil
members = []group.Member{}
} }
if err != nil { if err != nil {
err = errors.Wrap(err, "select members") err = errors.Wrap(err, "select members")
@ -146,6 +148,8 @@ func (s Scope) LeaveGroup(ctx domain.RequestContext, groupID, userID string) (er
// Useful when you need to bulk fetch membership records // Useful when you need to bulk fetch membership records
// for subsequent processing. // for subsequent processing.
func (s Scope) GetMembers(ctx domain.RequestContext) (r []group.Record, err error) { func (s Scope) GetMembers(ctx domain.RequestContext) (r []group.Record, err error) {
r = []group.Record{}
err = s.Runtime.Db.Select(&r, err = s.Runtime.Db.Select(&r,
`SELECT a.id, a.orgid, a.roleid, a.userid, b.role as name, b.purpose `SELECT a.id, a.orgid, a.roleid, a.userid, b.role as name, b.purpose
FROM rolemember a, role b FROM rolemember a, role b
@ -153,9 +157,8 @@ func (s Scope) GetMembers(ctx domain.RequestContext) (r []group.Record, err erro
ORDER BY a.userid`, ORDER BY a.userid`,
ctx.OrgID) ctx.OrgID)
if err == sql.ErrNoRows || len(r) == 0 { if err == sql.ErrNoRows {
err = nil err = nil
r = []group.Record{}
} }
if err != nil { if err != nil {
err = errors.Wrap(err, "select group members") err = errors.Wrap(err, "select group members")