MM-44101: GraphQL: Add sidebar categories at the top level (#20178)
Also, add a negate parameter to the team members to get all sidebarcategories except the default team. ```release-note NONE ```
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
3c625743e5
Коммит
acae0031d1
@@ -59,7 +59,7 @@ func (me SqlSessionStore) Save(session *model.Session) (*model.Session, error) {
|
||||
return nil, errors.Wrapf(err, "failed to save Session with id=%s", session.Id)
|
||||
}
|
||||
|
||||
teamMembers, err := me.Team().GetTeamsForUser(context.Background(), session.UserId, true)
|
||||
teamMembers, err := me.Team().GetTeamsForUser(context.Background(), session.UserId, "", true)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", session.UserId)
|
||||
}
|
||||
@@ -87,7 +87,7 @@ func (me SqlSessionStore) Get(ctx context.Context, sessionIdOrToken string) (*mo
|
||||
|
||||
tempMembers, err := me.Team().GetTeamsForUser(
|
||||
WithMaster(context.Background()),
|
||||
session.UserId, true)
|
||||
session.UserId, "", true)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", session.UserId)
|
||||
}
|
||||
@@ -107,7 +107,7 @@ func (me SqlSessionStore) GetSessions(userId string) ([]*model.Session, error) {
|
||||
return nil, errors.Wrapf(err, "failed to find Sessions with userId=%s", userId)
|
||||
}
|
||||
|
||||
teamMembers, err := me.Team().GetTeamsForUser(context.Background(), userId, true)
|
||||
teamMembers, err := me.Team().GetTeamsForUser(context.Background(), userId, "", true)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "failed to find TeamMembers for Session with userId=%s", userId)
|
||||
}
|
||||
|
||||
@@ -1080,11 +1080,15 @@ func (s SqlTeamStore) GetMembersByIds(teamId string, userIds []string, restricti
|
||||
return dbMembers.ToModel(), nil
|
||||
}
|
||||
|
||||
// GetTeamsForUser returns a list of teams that the user is a member of. Expects userId to be passed as a parameter.
|
||||
func (s SqlTeamStore) GetTeamsForUser(ctx context.Context, userId string, includeDeleted bool) ([]*model.TeamMember, error) {
|
||||
// GetTeamsForUser returns a list of teams that the user is a member of. Expects userId to be passed as a parameter. It can also negative the teamID passed.
|
||||
func (s SqlTeamStore) GetTeamsForUser(ctx context.Context, userId, excludeTeamID string, includeDeleted bool) ([]*model.TeamMember, error) {
|
||||
query := s.getTeamMembersWithSchemeSelectQuery().
|
||||
Where(sq.Eq{"TeamMembers.UserId": userId})
|
||||
|
||||
if excludeTeamID != "" {
|
||||
query = query.Where(sq.NotEq{"TeamMembers.TeamId": excludeTeamID})
|
||||
}
|
||||
|
||||
if !includeDeleted {
|
||||
query = query.Where(sq.Eq{"TeamMembers.DeleteAt": 0})
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user