diff --git a/internal/khira/enterprise.go b/internal/khira/enterprise.go
index e061da5..47eec6e 100644
--- a/internal/khira/enterprise.go
+++ b/internal/khira/enterprise.go
@@ -103,45 +103,158 @@ func (s *Store) StartSLAMonitor() {
}
// GetAnalyticsData calculates comprehensive productivity, SLA, and error metrics
-func (s *Store) GetAnalyticsData() (*AnalyticsData, error) {
+// with strict corporate privacy scoping. Non-admins receive only their own scoped metrics.
+func (s *Store) GetAnalyticsData(targetUser string, isOrgView bool, actor *User) (*AnalyticsData, error) {
+ if actor == nil {
+ return nil, errors.New("unauthorized: authentication required")
+ }
+
+ isAdmin := s.IsAdmin(actor)
+ if !isAdmin {
+ // Strictly enforce corporate privacy: non-admins cannot request org view or other users
+ isOrgView = false
+ targetUser = actor.Username
+ }
+
data := &AnalyticsData{
+ IsAdmin: isAdmin,
ByPriority: make(map[string]int),
}
- // 1. Summary Counts
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE archived = FALSE`).Scan(&data.Summary.TotalTickets)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'open' AND archived = FALSE`).Scan(&data.Summary.OpenTickets)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'in_progress' AND archived = FALSE`).Scan(&data.Summary.InProgressTickets)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'on_hold' AND archived = FALSE`).Scan(&data.Summary.OnHoldTickets)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'completed' AND archived = FALSE`).Scan(&data.Summary.CompletedTickets)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE archived = TRUE`).Scan(&data.Summary.ArchivedTickets)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE sla_breached = TRUE AND archived = FALSE`).Scan(&data.Summary.SLABreachedTickets)
+ if isOrgView {
+ data.Scope = "organization"
+ } else {
+ data.Scope = "personal"
+ data.TargetUser = targetUser
+ _ = s.primaryDB.QueryRow("SELECT name FROM users WHERE LOWER(username) = LOWER($1)", targetUser).Scan(&data.TargetName)
+ if data.TargetName == "" {
+ data.TargetName = targetUser
+ }
+ }
- // Avg resolution time in hours
- var avgSeconds sql.NullFloat64
- _ = s.primaryDB.QueryRow(`
- SELECT AVG(EXTRACT(EPOCH FROM (completed_at - created_at)))
- FROM tickets
- WHERE status = 'completed' AND completed_at IS NOT NULL
- `).Scan(&avgSeconds)
- if avgSeconds.Valid && avgSeconds.Float64 > 0 {
- data.Summary.AvgResolutionHours = float64(int(avgSeconds.Float64/360.0)) / 10.0 // 1 decimal place
+ // For admins, populate the user list so they can easily switch to any team member's audit view
+ if isAdmin {
+ uRows, err := s.primaryDB.Query(`
+ SELECT username, name, role, role_display, avatar
+ FROM users
+ WHERE active = TRUE
+ ORDER BY name ASC
+ `)
+ if err == nil {
+ defer uRows.Close()
+ for uRows.Next() {
+ var opt AnalyticsUserOption
+ if err := uRows.Scan(&opt.Username, &opt.Name, &opt.Role, &opt.RoleDisplay, &opt.Avatar); err == nil {
+ data.AvailableUsers = append(data.AvailableUsers, opt)
+ }
+ }
+ }
+ if data.AvailableUsers == nil {
+ data.AvailableUsers = []AnalyticsUserOption{}
+ }
+ }
+
+ // 1. Summary Counts
+ if isOrgView {
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE archived = FALSE`).Scan(&data.Summary.TotalTickets)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'open' AND archived = FALSE`).Scan(&data.Summary.OpenTickets)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'in_progress' AND archived = FALSE`).Scan(&data.Summary.InProgressTickets)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'on_hold' AND archived = FALSE`).Scan(&data.Summary.OnHoldTickets)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE status = 'completed' AND archived = FALSE`).Scan(&data.Summary.CompletedTickets)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE archived = TRUE`).Scan(&data.Summary.ArchivedTickets)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM tickets WHERE sla_breached = TRUE AND archived = FALSE`).Scan(&data.Summary.SLABreachedTickets)
+
+ var avgSeconds sql.NullFloat64
+ _ = s.primaryDB.QueryRow(`
+ SELECT AVG(EXTRACT(EPOCH FROM (completed_at - created_at)))
+ FROM tickets
+ WHERE status = 'completed' AND completed_at IS NOT NULL
+ `).Scan(&avgSeconds)
+ if avgSeconds.Valid && avgSeconds.Float64 > 0 {
+ data.Summary.AvgResolutionHours = float64(int(avgSeconds.Float64/360.0)) / 10.0 // 1 decimal place
+ }
+ } else {
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets
+ WHERE archived = FALSE AND (LOWER(assigned_to) = LOWER($1) OR LOWER(created_by) = LOWER($1))
+ `, targetUser).Scan(&data.Summary.TotalTickets)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets
+ WHERE status = 'open' AND archived = FALSE AND LOWER(assigned_to) = LOWER($1)
+ `, targetUser).Scan(&data.Summary.OpenTickets)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets
+ WHERE status = 'in_progress' AND archived = FALSE AND LOWER(assigned_to) = LOWER($1)
+ `, targetUser).Scan(&data.Summary.InProgressTickets)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets
+ WHERE status = 'on_hold' AND archived = FALSE AND LOWER(assigned_to) = LOWER($1)
+ `, targetUser).Scan(&data.Summary.OnHoldTickets)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets
+ WHERE status = 'completed' AND archived = FALSE
+ AND (LOWER(assigned_to) = LOWER($1) OR LOWER(completed_by) = LOWER($1) OR LOWER(completed_by) = LOWER($2))
+ `, targetUser, data.TargetName).Scan(&data.Summary.CompletedTickets)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets
+ WHERE archived = TRUE AND (LOWER(assigned_to) = LOWER($1) OR LOWER(created_by) = LOWER($1))
+ `, targetUser).Scan(&data.Summary.ArchivedTickets)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets
+ WHERE sla_breached = TRUE AND archived = FALSE AND LOWER(assigned_to) = LOWER($1)
+ `, targetUser).Scan(&data.Summary.SLABreachedTickets)
+
+ var avgSeconds sql.NullFloat64
+ _ = s.primaryDB.QueryRow(`
+ SELECT AVG(EXTRACT(EPOCH FROM (completed_at - created_at)))
+ FROM tickets
+ WHERE status = 'completed' AND completed_at IS NOT NULL
+ AND (LOWER(assigned_to) = LOWER($1) OR LOWER(completed_by) = LOWER($1) OR LOWER(completed_by) = LOWER($2))
+ `, targetUser, data.TargetName).Scan(&avgSeconds)
+ if avgSeconds.Valid && avgSeconds.Float64 > 0 {
+ data.Summary.AvgResolutionHours = float64(int(avgSeconds.Float64/360.0)) / 10.0
+ }
}
// 2. Priority Breakdown
- pRows, err := s.primaryDB.Query(`
- SELECT LOWER(priority), count(*)
- FROM tickets
- WHERE archived = FALSE
- GROUP BY LOWER(priority)
- `)
- if err == nil {
- defer pRows.Close()
- for pRows.Next() {
- var p string
- var c int
- if err := pRows.Scan(&p, &c); err == nil {
- data.ByPriority[p] = c
+ if isOrgView {
+ pRows, err := s.primaryDB.Query(`
+ SELECT LOWER(priority), count(*)
+ FROM tickets
+ WHERE archived = FALSE
+ GROUP BY LOWER(priority)
+ `)
+ if err == nil {
+ defer pRows.Close()
+ for pRows.Next() {
+ var p string
+ var c int
+ if err := pRows.Scan(&p, &c); err == nil {
+ data.ByPriority[p] = c
+ }
+ }
+ }
+ } else {
+ pRows, err := s.primaryDB.Query(`
+ SELECT LOWER(priority), count(*)
+ FROM tickets
+ WHERE archived = FALSE AND (LOWER(assigned_to) = LOWER($1) OR LOWER(created_by) = LOWER($1))
+ GROUP BY LOWER(priority)
+ `, targetUser)
+ if err == nil {
+ defer pRows.Close()
+ for pRows.Next() {
+ var p string
+ var c int
+ if err := pRows.Scan(&p, &c); err == nil {
+ data.ByPriority[p] = c
+ }
}
}
}
@@ -153,13 +266,25 @@ func (s *Store) GetAnalyticsData() (*AnalyticsData, error) {
weekLabel := end.Format("01/02")
var createdCount, resolvedCount int
- _ = s.primaryDB.QueryRow(`
- SELECT count(*) FROM tickets WHERE created_at >= $1 AND created_at < $2
- `, start, end).Scan(&createdCount)
+ if isOrgView {
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets WHERE created_at >= $1 AND created_at < $2
+ `, start, end).Scan(&createdCount)
- _ = s.primaryDB.QueryRow(`
- SELECT count(*) FROM tickets WHERE completed_at >= $1 AND completed_at < $2
- `, start, end).Scan(&resolvedCount)
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets WHERE completed_at >= $1 AND completed_at < $2
+ `, start, end).Scan(&resolvedCount)
+ } else {
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets WHERE created_at >= $1 AND created_at < $2
+ AND (LOWER(created_by) = LOWER($3) OR LOWER(assigned_to) = LOWER($3))
+ `, start, end, targetUser).Scan(&createdCount)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM tickets WHERE completed_at >= $1 AND completed_at < $2
+ AND (LOWER(assigned_to) = LOWER($3) OR LOWER(completed_by) = LOWER($3) OR LOWER(completed_by) = LOWER($4))
+ `, start, end, targetUser, data.TargetName).Scan(&resolvedCount)
+ }
data.Velocity = append(data.Velocity, VelocityPoint{
Week: weekLabel,
@@ -169,25 +294,50 @@ func (s *Store) GetAnalyticsData() (*AnalyticsData, error) {
}
// 4. Assignee Workload
- uRows, err := s.primaryDB.Query(`
- SELECT u.username, u.name, u.role, u.role_display, u.avatar,
- COUNT(CASE WHEN t.status = 'open' AND t.archived = FALSE THEN 1 END) AS open_cnt,
- COUNT(CASE WHEN t.status = 'in_progress' AND t.archived = FALSE THEN 1 END) AS in_prog_cnt,
- COUNT(CASE WHEN t.status = 'completed' AND t.archived = FALSE THEN 1 END) AS comp_cnt,
- COALESCE(AVG(CASE WHEN t.status = 'completed' AND t.completed_at IS NOT NULL THEN EXTRACT(EPOCH FROM (t.completed_at - t.created_at)) / 3600 END), 0) AS avg_h
- FROM users u
- LEFT JOIN tickets t ON LOWER(t.assigned_to) = LOWER(u.username)
- WHERE u.active = TRUE
- GROUP BY u.username, u.name, u.role, u.role_display, u.avatar
- ORDER BY COUNT(CASE WHEN t.status IN ('open', 'in_progress') AND t.archived = FALSE THEN 1 END) DESC, u.name ASC
- `)
- if err == nil {
- defer uRows.Close()
- for uRows.Next() {
- var w AssigneeWorkload
- if err := uRows.Scan(&w.Username, &w.Name, &w.Role, &w.RoleDisplay, &w.Avatar, &w.Open, &w.InProgress, &w.Completed, &w.AvgHours); err == nil {
- w.AvgHours = float64(int(w.AvgHours*10)) / 10.0
- data.ByAssignee = append(data.ByAssignee, w)
+ if isOrgView {
+ uRows, err := s.primaryDB.Query(`
+ SELECT u.username, u.name, u.role, u.role_display, u.avatar,
+ COUNT(CASE WHEN t.status = 'open' AND t.archived = FALSE THEN 1 END) AS open_cnt,
+ COUNT(CASE WHEN t.status = 'in_progress' AND t.archived = FALSE THEN 1 END) AS in_prog_cnt,
+ COUNT(CASE WHEN t.status = 'completed' AND t.archived = FALSE THEN 1 END) AS comp_cnt,
+ COALESCE(AVG(CASE WHEN t.status = 'completed' AND t.completed_at IS NOT NULL THEN EXTRACT(EPOCH FROM (t.completed_at - t.created_at)) / 3600 END), 0) AS avg_h
+ FROM users u
+ LEFT JOIN tickets t ON LOWER(t.assigned_to) = LOWER(u.username)
+ WHERE u.active = TRUE
+ GROUP BY u.username, u.name, u.role, u.role_display, u.avatar
+ ORDER BY COUNT(CASE WHEN t.status IN ('open', 'in_progress') AND t.archived = FALSE THEN 1 END) DESC, u.name ASC
+ `)
+ if err == nil {
+ defer uRows.Close()
+ for uRows.Next() {
+ var w AssigneeWorkload
+ if err := uRows.Scan(&w.Username, &w.Name, &w.Role, &w.RoleDisplay, &w.Avatar, &w.Open, &w.InProgress, &w.Completed, &w.AvgHours); err == nil {
+ w.AvgHours = float64(int(w.AvgHours*10)) / 10.0
+ data.ByAssignee = append(data.ByAssignee, w)
+ }
+ }
+ }
+ } else {
+ // Personal view: ONLY this target user's workload is visible!
+ uRows, err := s.primaryDB.Query(`
+ SELECT u.username, u.name, u.role, u.role_display, u.avatar,
+ COUNT(CASE WHEN t.status = 'open' AND t.archived = FALSE THEN 1 END) AS open_cnt,
+ COUNT(CASE WHEN t.status = 'in_progress' AND t.archived = FALSE THEN 1 END) AS in_prog_cnt,
+ COUNT(CASE WHEN t.status = 'completed' AND t.archived = FALSE THEN 1 END) AS comp_cnt,
+ COALESCE(AVG(CASE WHEN t.status = 'completed' AND t.completed_at IS NOT NULL THEN EXTRACT(EPOCH FROM (t.completed_at - t.created_at)) / 3600 END), 0) AS avg_h
+ FROM users u
+ LEFT JOIN tickets t ON LOWER(t.assigned_to) = LOWER(u.username)
+ WHERE LOWER(u.username) = LOWER($1)
+ GROUP BY u.username, u.name, u.role, u.role_display, u.avatar
+ `, targetUser)
+ if err == nil {
+ defer uRows.Close()
+ for uRows.Next() {
+ var w AssigneeWorkload
+ if err := uRows.Scan(&w.Username, &w.Name, &w.Role, &w.RoleDisplay, &w.Avatar, &w.Open, &w.InProgress, &w.Completed, &w.AvgHours); err == nil {
+ w.AvgHours = float64(int(w.AvgHours*10)) / 10.0
+ data.ByAssignee = append(data.ByAssignee, w)
+ }
}
}
}
@@ -196,26 +346,70 @@ func (s *Store) GetAnalyticsData() (*AnalyticsData, error) {
}
// 5. Error Summary
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE archived = FALSE`).Scan(&data.ErrorSummary.TotalErrors)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE status = 'unresolved' AND archived = FALSE`).Scan(&data.ErrorSummary.UnresolvedErrors)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE status = 'resolved' AND archived = FALSE`).Scan(&data.ErrorSummary.ResolvedErrors)
- _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE LOWER(severity) = 'critical' AND archived = FALSE`).Scan(&data.ErrorSummary.CriticalErrors)
+ if isOrgView {
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE archived = FALSE`).Scan(&data.ErrorSummary.TotalErrors)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE status = 'unresolved' AND archived = FALSE`).Scan(&data.ErrorSummary.UnresolvedErrors)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE status = 'resolved' AND archived = FALSE`).Scan(&data.ErrorSummary.ResolvedErrors)
+ _ = s.primaryDB.QueryRow(`SELECT count(*) FROM errors WHERE LOWER(severity) = 'critical' AND archived = FALSE`).Scan(&data.ErrorSummary.CriticalErrors)
- // Top Apps by Errors
- appRows, err := s.primaryDB.Query(`
- SELECT app_name, count(*) as c
- FROM errors
- WHERE archived = FALSE AND app_name != ''
- GROUP BY app_name
- ORDER BY c DESC
- LIMIT 5
- `)
- if err == nil {
- defer appRows.Close()
- for appRows.Next() {
- var st AppErrorStat
- if err := appRows.Scan(&st.App, &st.Count); err == nil {
- data.TopAppsByErrors = append(data.TopAppsByErrors, st)
+ appRows, err := s.primaryDB.Query(`
+ SELECT app_name, count(*) as c
+ FROM errors
+ WHERE archived = FALSE AND app_name != ''
+ GROUP BY app_name
+ ORDER BY c DESC
+ LIMIT 5
+ `)
+ if err == nil {
+ defer appRows.Close()
+ for appRows.Next() {
+ var st AppErrorStat
+ if err := appRows.Scan(&st.App, &st.Count); err == nil {
+ data.TopAppsByErrors = append(data.TopAppsByErrors, st)
+ }
+ }
+ }
+ } else {
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM errors e
+ INNER JOIN tickets t ON e.linked_ticket_id = t.id
+ WHERE e.archived = FALSE AND (LOWER(t.assigned_to) = LOWER($1) OR LOWER(t.created_by) = LOWER($1))
+ `, targetUser).Scan(&data.ErrorSummary.TotalErrors)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM errors e
+ INNER JOIN tickets t ON e.linked_ticket_id = t.id
+ WHERE e.status = 'unresolved' AND e.archived = FALSE AND (LOWER(t.assigned_to) = LOWER($1) OR LOWER(t.created_by) = LOWER($1))
+ `, targetUser).Scan(&data.ErrorSummary.UnresolvedErrors)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM errors e
+ INNER JOIN tickets t ON e.linked_ticket_id = t.id
+ WHERE e.status = 'resolved' AND e.archived = FALSE AND (LOWER(t.assigned_to) = LOWER($1) OR LOWER(t.created_by) = LOWER($1))
+ `, targetUser).Scan(&data.ErrorSummary.ResolvedErrors)
+
+ _ = s.primaryDB.QueryRow(`
+ SELECT count(*) FROM errors e
+ INNER JOIN tickets t ON e.linked_ticket_id = t.id
+ WHERE LOWER(e.severity) = 'critical' AND e.archived = FALSE AND (LOWER(t.assigned_to) = LOWER($1) OR LOWER(t.created_by) = LOWER($1))
+ `, targetUser).Scan(&data.ErrorSummary.CriticalErrors)
+
+ appRows, err := s.primaryDB.Query(`
+ SELECT e.app_name, count(*) as c
+ FROM errors e
+ INNER JOIN tickets t ON e.linked_ticket_id = t.id
+ WHERE e.archived = FALSE AND e.app_name != '' AND (LOWER(t.assigned_to) = LOWER($1) OR LOWER(t.created_by) = LOWER($1))
+ GROUP BY e.app_name
+ ORDER BY c DESC
+ LIMIT 5
+ `, targetUser)
+ if err == nil {
+ defer appRows.Close()
+ for appRows.Next() {
+ var st AppErrorStat
+ if err := appRows.Scan(&st.App, &st.Count); err == nil {
+ data.TopAppsByErrors = append(data.TopAppsByErrors, st)
+ }
}
}
}
@@ -224,19 +418,41 @@ func (s *Store) GetAnalyticsData() (*AnalyticsData, error) {
}
// 6. Recent Activity
- actRows, err := s.primaryDB.Query(`
- SELECT r.id, r.ticket_id, COALESCE(t.title, ''), r.type, r.author_username, r.author_name, r.author_role, r.text, r.created_at
- FROM ticket_remarks r
- LEFT JOIN tickets t ON r.ticket_id = t.id
- ORDER BY r.created_at DESC
- LIMIT 15
- `)
- if err == nil {
- defer actRows.Close()
- for actRows.Next() {
- var act ActivityItem
- if err := actRows.Scan(&act.ID, &act.TicketID, &act.Title, &act.Type, &act.Author, &act.Name, &act.Role, &act.Text, &act.CreatedAt); err == nil {
- data.RecentActivity = append(data.RecentActivity, act)
+ if isOrgView {
+ actRows, err := s.primaryDB.Query(`
+ SELECT r.id, r.ticket_id, COALESCE(t.title, ''), r.type, r.author_username, r.author_name, r.author_role, r.text, r.created_at
+ FROM ticket_remarks r
+ LEFT JOIN tickets t ON r.ticket_id = t.id
+ ORDER BY r.created_at DESC
+ LIMIT 15
+ `)
+ if err == nil {
+ defer actRows.Close()
+ for actRows.Next() {
+ var act ActivityItem
+ if err := actRows.Scan(&act.ID, &act.TicketID, &act.Title, &act.Type, &act.Author, &act.Name, &act.Role, &act.Text, &act.CreatedAt); err == nil {
+ data.RecentActivity = append(data.RecentActivity, act)
+ }
+ }
+ }
+ } else {
+ actRows, err := s.primaryDB.Query(`
+ SELECT r.id, r.ticket_id, COALESCE(t.title, ''), r.type, r.author_username, r.author_name, r.author_role, r.text, r.created_at
+ FROM ticket_remarks r
+ LEFT JOIN tickets t ON r.ticket_id = t.id
+ WHERE LOWER(r.author_username) = LOWER($1)
+ OR LOWER(t.assigned_to) = LOWER($1)
+ OR LOWER(t.created_by) = LOWER($1)
+ ORDER BY r.created_at DESC
+ LIMIT 15
+ `, targetUser)
+ if err == nil {
+ defer actRows.Close()
+ for actRows.Next() {
+ var act ActivityItem
+ if err := actRows.Scan(&act.ID, &act.TicketID, &act.Title, &act.Type, &act.Author, &act.Name, &act.Role, &act.Text, &act.CreatedAt); err == nil {
+ data.RecentActivity = append(data.RecentActivity, act)
+ }
}
}
}
diff --git a/internal/khira/handlers_enterprise.go b/internal/khira/handlers_enterprise.go
index 475854c..bd21238 100644
--- a/internal/khira/handlers_enterprise.go
+++ b/internal/khira/handlers_enterprise.go
@@ -14,7 +14,37 @@ import (
// Analytics
func (s *Server) handleAnalytics(w http.ResponseWriter, r *http.Request) {
- data, err := s.Store.GetAnalyticsData()
+ actor := s.getActor(r)
+ if actor == nil {
+ s.writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "Please sign in to view analytics"})
+ return
+ }
+
+ isAdmin := s.isAdmin(actor)
+ targetUser := ""
+ isOrgView := false
+
+ if isAdmin {
+ userParam := strings.TrimSpace(r.URL.Query().Get("user"))
+ scopeParam := strings.TrimSpace(r.URL.Query().Get("scope"))
+ if userParam != "" {
+ targetUser = userParam
+ isOrgView = false
+ } else if strings.EqualFold(scopeParam, "personal") {
+ targetUser = actor.Username
+ isOrgView = false
+ } else {
+ isOrgView = true
+ }
+ } else {
+ // CORPORATE PRIVACY ENFORCEMENT:
+ // Non-admins can NEVER view organization-wide analytics or any other user's dashboard!
+ // Strictly force targetUser to actor.Username regardless of input params.
+ targetUser = actor.Username
+ isOrgView = false
+ }
+
+ data, err := s.Store.GetAnalyticsData(targetUser, isOrgView, actor)
if err != nil {
s.writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
return
diff --git a/internal/khira/models.go b/internal/khira/models.go
index 2856af7..3142e37 100644
--- a/internal/khira/models.go
+++ b/internal/khira/models.go
@@ -235,7 +235,20 @@ type TicketRelation struct {
CreatedAt time.Time `json:"created_at"`
}
+type AnalyticsUserOption struct {
+ Username string `json:"username"`
+ Name string `json:"name"`
+ Role string `json:"role"`
+ RoleDisplay string `json:"role_display"`
+ Avatar string `json:"avatar"`
+}
+
type AnalyticsData struct {
+ Scope string `json:"scope"` // "organization" or "personal"
+ TargetUser string `json:"target_user"` // username of target or ""
+ TargetName string `json:"target_name"` // full name of target
+ IsAdmin bool `json:"is_admin"` // whether requester is admin
+ AvailableUsers []AnalyticsUserOption `json:"available_users,omitempty"` // populated for admins
Summary struct {
TotalTickets int `json:"total_tickets"`
OpenTickets int `json:"open_tickets"`
diff --git a/internal/khira/store.go b/internal/khira/store.go
index 5e76359..8229cce 100644
--- a/internal/khira/store.go
+++ b/internal/khira/store.go
@@ -200,9 +200,9 @@ func (s *Store) GetUser(username string) (*User, error) {
username = strings.ToLower(strings.TrimSpace(username))
var u User
err := s.primaryDB.QueryRow(`
- SELECT id, username, name, password_hash, role, role_display, avatar, avatar_type, profile_image, created_at, updated_at
+ SELECT id, username, name, password_hash, role, role_display, avatar, avatar_type, profile_image, active, created_at, updated_at
FROM users WHERE username = $1
- `, username).Scan(&u.ID, &u.Username, &u.Name, &u.PasswordHash, &u.Role, &u.RoleDisplay, &u.Avatar, &u.AvatarType, &u.ProfileImage, &u.CreatedAt, &u.UpdatedAt)
+ `, username).Scan(&u.ID, &u.Username, &u.Name, &u.PasswordHash, &u.Role, &u.RoleDisplay, &u.Avatar, &u.AvatarType, &u.ProfileImage, &u.Active, &u.CreatedAt, &u.UpdatedAt)
if err != nil {
return nil, errors.New("user not found")
}
@@ -212,8 +212,8 @@ func (s *Store) GetUser(username string) (*User, error) {
func (s *Store) ListUsers() []*User {
rows, err := s.primaryDB.Query(`
- SELECT id, username, name, role, role_display, avatar, avatar_type, profile_image, created_at, updated_at
- FROM users ORDER BY name ASC
+ SELECT id, username, name, role, role_display, avatar, avatar_type, profile_image, active, created_at, updated_at
+ FROM users WHERE active = TRUE ORDER BY name ASC
`)
if err != nil {
return []*User{}
@@ -223,7 +223,7 @@ func (s *Store) ListUsers() []*User {
var list []*User
for rows.Next() {
var u User
- if err := rows.Scan(&u.ID, &u.Username, &u.Name, &u.Role, &u.RoleDisplay, &u.Avatar, &u.AvatarType, &u.ProfileImage, &u.CreatedAt, &u.UpdatedAt); err == nil {
+ if err := rows.Scan(&u.ID, &u.Username, &u.Name, &u.Role, &u.RoleDisplay, &u.Avatar, &u.AvatarType, &u.ProfileImage, &u.Active, &u.CreatedAt, &u.UpdatedAt); err == nil {
list = append(list, &u)
}
}
@@ -504,6 +504,16 @@ func (s *Store) GetTicket(id string) (*Ticket, error) {
return &t, nil
}
+func (s *Store) IsAdmin(actor *User) bool {
+ if actor == nil {
+ return false
+ }
+ return strings.EqualFold(actor.Username, "admin") ||
+ actor.Role == string(RoleLead) ||
+ strings.EqualFold(actor.Role, "team_lead") ||
+ strings.EqualFold(actor.Role, "lead")
+}
+
func (s *Store) DeleteTicket(ticketID string, actor *User) error {
var createdBy, assignedTo string
err := s.primaryDB.QueryRow("SELECT created_by, assigned_to FROM tickets WHERE id = $1", ticketID).Scan(&createdBy, &assignedTo)
@@ -511,8 +521,16 @@ func (s *Store) DeleteTicket(ticketID string, actor *User) error {
return errors.New("ticket not found")
}
- isAdmin := actor != nil && (strings.EqualFold(actor.Username, "admin") || actor.Role == string(RoleLead) || strings.EqualFold(actor.Role, "team_lead") || strings.EqualFold(actor.Role, "lead"))
+ isAdmin := s.IsAdmin(actor)
isCreator := actor != nil && strings.EqualFold(actor.Username, createdBy)
+ isAssignee := actor != nil && strings.EqualFold(actor.Username, assignedTo)
+
+ // Corporate Privacy & Permission Rule:
+ // No one can delete the ticket assigned to him/her; only the person who assigned/created it can delete that (or admin).
+ if isAssignee && !isCreator {
+ return errors.New("permission denied: you cannot delete a ticket assigned to you. Only the person who created/assigned this ticket can delete it")
+ }
+
if !isAdmin && !isCreator {
return errors.New("permission denied: only administrators or the person who assigned/created this ticket can delete it")
}
@@ -950,15 +968,25 @@ func (s *Store) CompleteTicket(ticketID string, actor *User, remarks string) (*T
}
func (s *Store) ArchiveTicket(ticketID string, actor *User) (*Ticket, error) {
- var status string
- err := s.primaryDB.QueryRow("SELECT status FROM tickets WHERE id = $1", ticketID).Scan(&status)
+ var status, createdBy, assignedTo, completedBy string
+ err := s.primaryDB.QueryRow("SELECT status, created_by, assigned_to, completed_by FROM tickets WHERE id = $1", ticketID).Scan(&status, &createdBy, &assignedTo, &completedBy)
if err != nil {
return nil, errors.New("ticket not found")
}
st := strings.ToLower(status)
if st != "completed" && st != "closed" {
- return nil, errors.New("only completed tickets can be sent to the archive")
+ return nil, errors.New("only completed or resolved tickets can be moved to the archive")
+ }
+
+ isAdmin := s.IsAdmin(actor)
+ isCreator := actor != nil && strings.EqualFold(actor.Username, createdBy)
+ isResolver := actor != nil && (strings.EqualFold(actor.Username, completedBy) || strings.EqualFold(actor.Name, completedBy))
+
+ // Corporate Privacy & Permission Rule:
+ // Only the person who resolved the ticket (or the assigner/admin) can move it to archive.
+ if !isAdmin && !isCreator && !isResolver {
+ return nil, errors.New("permission denied: only the person who resolved this ticket (or the assigner/admin) can move it to archive")
}
now := time.Now()
@@ -985,6 +1013,20 @@ func (s *Store) ArchiveTicket(ticketID string, actor *User) (*Ticket, error) {
}
func (s *Store) UnarchiveTicket(ticketID string, actor *User) (*Ticket, error) {
+ var status, createdBy, assignedTo, completedBy string
+ err := s.primaryDB.QueryRow("SELECT status, created_by, assigned_to, completed_by FROM tickets WHERE id = $1", ticketID).Scan(&status, &createdBy, &assignedTo, &completedBy)
+ if err != nil {
+ return nil, errors.New("ticket not found")
+ }
+
+ isAdmin := s.IsAdmin(actor)
+ isCreator := actor != nil && strings.EqualFold(actor.Username, createdBy)
+ isResolver := actor != nil && (strings.EqualFold(actor.Username, completedBy) || strings.EqualFold(actor.Name, completedBy))
+
+ if !isAdmin && !isCreator && !isResolver {
+ return nil, errors.New("permission denied: only the person who resolved this ticket (or the assigner/admin) can restore it from archive")
+ }
+
now := time.Now()
res, err := s.primaryDB.Exec("UPDATE tickets SET archived = FALSE, updated_at = $1 WHERE id = $2", now, ticketID)
if err != nil {
diff --git a/web/khira/app.js b/web/khira/app.js
index 60d9f61..b0452db 100644
--- a/web/khira/app.js
+++ b/web/khira/app.js
@@ -38,7 +38,10 @@ const ICONS = {
sun: `
@${esc(u.username)} · ${esc(u.role_display || 'Engineering')}
+No workload records found.
';return} el.innerHTML=`| Team Member | Role | Open | In Progress | Completed | Avg Resolution |
|---|---|---|---|---|---|
${avHtml(u,28)}${esc(u.name)} |
@@ -773,11 +889,26 @@ function sheet(id){
+kv('Reported by',who(t.reporter||{name:t.created_by_name,username:t.created_by,role:t.created_by_role},t.created_by_name),'html');
}
- const isAdm=isAdmin(S.u);
- const isCreator=S.u?.username&&(S.u.username.toLowerCase()===(t.created_by||t.reporter?.username||'').toLowerCase());
- const canDel=isAdm||isCreator;
- const isDone=s==='completed'||s==='closed';
- const archBtn=isDone?(t.archived?``:``):'';
+ const myUser = (S.u?.username || '').toLowerCase();
+ const myName = (S.u?.name || '').toLowerCase();
+ const creatorUser = (t.created_by || t.reporter?.username || '').toLowerCase();
+ const assigneeUser = (t.assigned_to || t.assignee?.username || '').toLowerCase();
+ const resolverUser = (t.completed_by || '').toLowerCase();
+
+ const isAdm = isAdmin(S.u);
+ const isCreator = myUser && (myUser === creatorUser);
+ const isAssignee = myUser && (myUser === assigneeUser);
+ const isResolver = myUser && (myUser === resolverUser || myName === resolverUser);
+
+ // Corporate Privacy & Permission Rules:
+ // 1. "noone can delete the ticket assigned to him/her, only the person who has assigned can delete that"
+ // If the ticket is assigned to me, and I did NOT assign/create it, I CANNOT delete it!
+ const canDel = (isCreator || (isAdm && !isAssignee)) && (!isAssignee || isCreator);
+
+ // 2. "only the person when has resolved the ticket can move it to archive"
+ const isDone = s === 'completed' || s === 'closed';
+ const canArchive = isDone && (isResolver || isCreator || isAdm);
+ const archBtn = canArchive ? (t.archived ? `` : ``) : '';
const tagsList=(t.tags||[]).map(tg=>`${esc(tg)} `).join('');
diff --git a/web/khira/index.html b/web/khira/index.html
index d0d8e0d..063eadf 100644
--- a/web/khira/index.html
+++ b/web/khira/index.html
@@ -9,7 +9,7 @@
-
+
@@ -125,28 +125,36 @@