mirror of
https://github.com/fleetdm/fleet
synced 2026-05-23 17:08:53 +00:00
Ensure author name and packs are set in NewQuery response (#774)
This commit is contained in:
parent
1c2d243cc8
commit
23c86f6c12
5 changed files with 16 additions and 4 deletions
|
|
@ -56,6 +56,15 @@ func (v Viewer) Username() string {
|
|||
return "none"
|
||||
}
|
||||
|
||||
// FullName is a helper that enables quick access to the full name of the
|
||||
// current user.
|
||||
func (v Viewer) FullName() string {
|
||||
if v.User != nil {
|
||||
return v.User.Name
|
||||
}
|
||||
return "none"
|
||||
}
|
||||
|
||||
// SessionID returns the current user's session ID
|
||||
func (v Viewer) SessionID() uint {
|
||||
if v.Session != nil {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ func (d *Datastore) NewQuery(query *kolide.Query) (*kolide.Query, error) {
|
|||
}
|
||||
|
||||
newQuery.ID = d.nextID(newQuery)
|
||||
newQuery.Packs = []kolide.Pack{}
|
||||
d.queries[newQuery.ID] = &newQuery
|
||||
|
||||
return &newQuery, nil
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ func (d *Datastore) NewQuery(query *kolide.Query) (*kolide.Query, error) {
|
|||
|
||||
id, _ := result.LastInsertId()
|
||||
query.ID = uint(id)
|
||||
query.Packs = []kolide.Pack{}
|
||||
return query, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,12 +32,14 @@ func (svc service) NewQuery(ctx context.Context, p kolide.QueryPayload) (*kolide
|
|||
vc, ok := viewer.FromContext(ctx)
|
||||
if ok {
|
||||
query.AuthorID = vc.UserID()
|
||||
query.AuthorName = vc.FullName()
|
||||
}
|
||||
|
||||
query, err := svc.ds.NewQuery(query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return query, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ func TestGetQuery(t *testing.T) {
|
|||
|
||||
queryVerify, err := svc.GetQuery(ctx, query.ID)
|
||||
assert.Nil(t, err)
|
||||
|
||||
assert.Equal(t, query.ID, queryVerify.ID)
|
||||
}
|
||||
|
||||
|
|
@ -77,12 +76,13 @@ func TestNewQuery(t *testing.T) {
|
|||
|
||||
name := "foo"
|
||||
query := "select * from time;"
|
||||
_, err = svc.NewQuery(ctx, kolide.QueryPayload{
|
||||
q, err := svc.NewQuery(ctx, kolide.QueryPayload{
|
||||
Name: &name,
|
||||
Query: &query,
|
||||
})
|
||||
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, "Test Name admin1", q.AuthorName)
|
||||
assert.Equal(t, []kolide.Pack{}, q.Packs)
|
||||
|
||||
queries, err := ds.ListQueries(kolide.ListOptions{})
|
||||
assert.Nil(t, err)
|
||||
|
|
@ -141,5 +141,4 @@ func TestDeleteQuery(t *testing.T) {
|
|||
queries, err := ds.ListQueries(kolide.ListOptions{})
|
||||
assert.Nil(t, err)
|
||||
assert.Len(t, queries, 0)
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue