New user role: view analytics

domain/user/endpoint.go

@@ -162,6 +162,7 @@ func (h *Handler) Add(w http.ResponseWriter, r *http.Request) {
 		a.Editor = true
 		a.Admin = false
 		a.Active = true
+		a.Analytics = false
 
 		err = h.Store.Account.Add(ctx, a)
 		if err != nil {
@@ -481,6 +482,7 @@ func (h *Handler) Update(w http.ResponseWriter, r *http.Request) {
 	a.Admin = u.Admin
 	a.Active = u.Active
 	a.Users = u.ViewUsers
+	a.Analytics = u.Analytics
 
 	err = h.Store.Account.UpdateAccount(ctx, a)
 	if err != nil {
@@ -799,6 +801,7 @@ func (h *Handler) BulkImport(w http.ResponseWriter, r *http.Request) {
 			a.Editor = true
 			a.Admin = false
 			a.Active = true
+			a.Analytics = false
 
 			err = h.Store.Account.Add(ctx, a)
 			if err != nil {

domain/user/mysql/store.go

@@ -114,7 +114,7 @@ func (s Scope) GetActiveUsersForOrganization(ctx domain.RequestContext) (u []use
 
 	err = s.Runtime.Db.Select(&u,
 		`SELECT u.id, u.refid, u.firstname, u.lastname, u.email, u.initials, u.password, u.salt, u.reset, u.lastversion, u.created, u.revised,
-		u.global, a.active, a.editor, a.admin, a.users as viewusers
+		u.global, a.active, a.editor, a.admin, a.users as viewusers, a.analytics
 		FROM user u, account a
 		WHERE u.refid=a.userid AND a.orgid=? AND a.active=1
 		ORDER BY u.firstname,u.lastname`,
@@ -143,7 +143,7 @@ func (s Scope) GetUsersForOrganization(ctx domain.RequestContext, filter string)
 
 	err = s.Runtime.Db.Select(&u,
 		`SELECT u.id, u.refid, u.firstname, u.lastname, u.email, u.initials, u.password, u.salt, u.reset, u.lastversion, u.created, u.revised,
-		u.global, a.active, a.editor, a.admin, a.users as viewusers
+		u.global, a.active, a.editor, a.admin, a.users as viewusers, a.analytics
 		FROM user u, account a
 		WHERE u.refid=a.userid AND a.orgid=? `+likeQuery+
 			`ORDER BY u.firstname, u.lastname LIMIT 100`, ctx.OrgID)
@@ -165,7 +165,7 @@ func (s Scope) GetSpaceUsers(ctx domain.RequestContext, spaceID string) (u []use
 
 	err = s.Runtime.Db.Select(&u, `
 		SELECT u.id, u.refid, u.firstname, u.lastname, u.email, u.initials, u.password, u.salt, u.reset, u.created, u.lastversion, u.revised, u.global,
-		a.active, a.users AS viewusers, a.editor, a.admin
+		a.active, a.users AS viewusers, a.editor, a.admin, a.analytics
 		FROM user u, account a
 		WHERE a.orgid=? AND u.refid = a.userid AND a.active=1 AND u.refid IN (
 			SELECT whoid from permission WHERE orgid=? AND who='user' AND scope='object' AND location='space' AND refid=? UNION ALL
@@ -194,7 +194,7 @@ func (s Scope) GetUsersForSpaces(ctx domain.RequestContext, spaces []string) (u
 
 	query, args, err := sqlx.In(`
 		SELECT u.id, u.refid, u.firstname, u.lastname, u.email, u.initials, u.password, u.salt, u.reset, u.lastversion, u.created, u.revised, u.global,
-		a.active, a.users AS viewusers, a.editor, a.admin
+		a.active, a.users AS viewusers, a.editor, a.admin, a.analytics
 		FROM user u, account a
 		WHERE a.orgid=? AND u.refid = a.userid AND a.active=1 AND u.refid IN (
 			SELECT whoid from permission WHERE orgid=? AND who='user' AND scope='object' AND location='space' AND refid IN(?) UNION ALL
@@ -295,7 +295,7 @@ func (s Scope) MatchUsers(ctx domain.RequestContext, text string, maxMatches int
 
 	err = s.Runtime.Db.Select(&u,
 		`SELECT u.id, u.refid, u.firstname, u.lastname, u.email, u.initials, u.password, u.salt, u.reset, u.lastversion, u.created, u.revised,
-		u.global, a.active, a.editor, a.admin, a.users as viewusers
+		u.global, a.active, a.editor, a.admin, a.users as viewusers, a.analytics
 		FROM user u, account a
 		WHERE a.orgid=? AND u.refid=a.userid AND a.active=1 `+likeQuery+
 			`ORDER BY u.firstname,u.lastname LIMIT `+strconv.Itoa(maxMatches),

domain/user/user.go

@@ -40,6 +40,7 @@ func AttachUserAccounts(ctx domain.RequestContext, s domain.Store, orgID string,
 	u.Admin = false
 	u.Active = false
 	u.ViewUsers = false
+	u.Analytics = false
 
 	for _, account := range u.Accounts {
 		if account.OrgID == orgID {
@@ -47,6 +48,7 @@ func AttachUserAccounts(ctx domain.RequestContext, s domain.Store, orgID string,
 			u.Editor = account.Editor
 			u.Active = account.Active
 			u.ViewUsers = account.Users
+			u.Analytics = account.Analytics
 			break
 		}
 	}