diff --git a/internal/khira/db.go b/internal/khira/db.go index 11bb60c..26dc96b 100644 --- a/internal/khira/db.go +++ b/internal/khira/db.go @@ -56,6 +56,7 @@ CREATE TABLE IF NOT EXISTS tickets ( completed_by VARCHAR(64) NOT NULL DEFAULT '', completed_at TIMESTAMPTZ, linked_error_id VARCHAR(32) NOT NULL DEFAULT '', + archived BOOLEAN NOT NULL DEFAULT FALSE, created_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW() ); @@ -111,6 +112,7 @@ CREATE TABLE IF NOT EXISTS errors ( linked_ticket_id VARCHAR(32) NOT NULL DEFAULT '', created_by VARCHAR(64) NOT NULL DEFAULT '', request_payload TEXT NOT NULL DEFAULT '', + archived BOOLEAN NOT NULL DEFAULT FALSE, created_at TIMESTAMPTZ NOT NULL DEFAULT NOW() ); @@ -265,7 +267,7 @@ func SyncDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { SELECT id, ticket_type, title, general_category, department, app_name, version, feature_name, api_key, issue_type, priority, status, description, assistance_required, additional_info, created_by, created_by_name, created_by_role, assigned_to, assigned_to_name, assigned_to_role, hold_reason, held_by, held_at, completion_remarks, completed_by, - completed_at, linked_error_id, created_at, updated_at + completed_at, linked_error_id, archived, created_at, updated_at FROM tickets `) if err != nil { @@ -277,8 +279,8 @@ func SyncDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { INSERT INTO tickets (id, ticket_type, title, general_category, department, app_name, version, feature_name, api_key, issue_type, priority, status, description, assistance_required, additional_info, created_by, created_by_name, created_by_role, assigned_to, assigned_to_name, assigned_to_role, hold_reason, held_by, held_at, completion_remarks, completed_by, - completed_at, linked_error_id, created_at, updated_at) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30) + completed_at, linked_error_id, archived, created_at, updated_at) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31) `) if err != nil { return nil, err @@ -291,7 +293,7 @@ func SyncDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { &t.ID, &t.TicketType, &t.Title, &t.GeneralCategory, &t.Department, &t.AppName, &t.Version, &t.FeatureName, &t.APIKey, &t.IssueType, &t.Priority, &t.Status, &t.Description, &t.AssistanceRequired, &t.AdditionalInfo, &t.CreatedBy, &t.CreatedByName, &t.CreatedByRole, &t.AssignedTo, &t.AssignedToName, &t.AssignedToRole, &t.HoldReason, &t.HeldBy, &t.HeldAt, &t.CompletionRemarks, &t.CompletedBy, - &t.CompletedAt, &t.LinkedErrorID, &t.CreatedAt, &t.UpdatedAt, + &t.CompletedAt, &t.LinkedErrorID, &t.Archived, &t.CreatedAt, &t.UpdatedAt, ); err != nil { return nil, err } @@ -299,7 +301,7 @@ func SyncDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { t.ID, t.TicketType, t.Title, t.GeneralCategory, t.Department, t.AppName, t.Version, t.FeatureName, t.APIKey, t.IssueType, t.Priority, t.Status, t.Description, t.AssistanceRequired, t.AdditionalInfo, t.CreatedBy, t.CreatedByName, t.CreatedByRole, t.AssignedTo, t.AssignedToName, t.AssignedToRole, t.HoldReason, t.HeldBy, t.HeldAt, t.CompletionRemarks, t.CompletedBy, - t.CompletedAt, t.LinkedErrorID, t.CreatedAt, t.UpdatedAt, + t.CompletedAt, t.LinkedErrorID, t.Archived, t.CreatedAt, t.UpdatedAt, ); err != nil { return nil, err } @@ -386,7 +388,7 @@ func SyncDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { errRows, err := primaryDB.Query(` SELECT id, fingerprint, app_name, version, environment, service, endpoint, exception_type, message, stack_trace, severity, status, occurrences, first_seen, last_seen, resolved_at, resolved_by, - resolution_notes, linked_ticket_id, created_by, request_payload, created_at + resolution_notes, linked_ticket_id, created_by, request_payload, archived, created_at FROM errors `) if err != nil { @@ -397,8 +399,8 @@ func SyncDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { errStmt, err := tx.Prepare(` INSERT INTO errors (id, fingerprint, app_name, version, environment, service, endpoint, exception_type, message, stack_trace, severity, status, occurrences, first_seen, last_seen, resolved_at, resolved_by, - resolution_notes, linked_ticket_id, created_by, request_payload, created_at) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22) + resolution_notes, linked_ticket_id, created_by, request_payload, archived, created_at) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23) `) if err != nil { return nil, err @@ -410,14 +412,14 @@ func SyncDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { if err := errRows.Scan( &e.ID, &e.Fingerprint, &e.AppName, &e.Version, &e.Environment, &e.Service, &e.Endpoint, &e.ExceptionType, &e.Message, &e.StackTrace, &e.Severity, &e.Status, &e.Occurrences, &e.FirstSeen, &e.LastSeen, &e.ResolvedAt, &e.ResolvedBy, - &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, &e.FirstSeen, + &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, &e.Archived, &e.CreatedAt, ); err != nil { return nil, err } if _, err := errStmt.Exec( e.ID, e.Fingerprint, e.AppName, e.Version, e.Environment, e.Service, e.Endpoint, e.ExceptionType, e.Message, e.StackTrace, e.Severity, e.Status, e.Occurrences, e.FirstSeen, e.LastSeen, e.ResolvedAt, e.ResolvedBy, - e.ResolutionNotes, e.LinkedTicketID, e.CreatedBy, e.RequestPayload, e.FirstSeen, + e.ResolutionNotes, e.LinkedTicketID, e.CreatedBy, e.RequestPayload, e.Archived, e.CreatedAt, ); err != nil { return nil, err } @@ -534,7 +536,7 @@ func RollbackDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { SELECT id, ticket_type, title, general_category, department, app_name, version, feature_name, api_key, issue_type, priority, status, description, assistance_required, additional_info, created_by, created_by_name, created_by_role, assigned_to, assigned_to_name, assigned_to_role, hold_reason, held_by, held_at, completion_remarks, completed_by, - completed_at, linked_error_id, created_at, updated_at + completed_at, linked_error_id, archived, created_at, updated_at FROM tickets `) if err != nil { @@ -546,8 +548,8 @@ func RollbackDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { INSERT INTO tickets (id, ticket_type, title, general_category, department, app_name, version, feature_name, api_key, issue_type, priority, status, description, assistance_required, additional_info, created_by, created_by_name, created_by_role, assigned_to, assigned_to_name, assigned_to_role, hold_reason, held_by, held_at, completion_remarks, completed_by, - completed_at, linked_error_id, created_at, updated_at) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30) + completed_at, linked_error_id, archived, created_at, updated_at) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23,$24,$25,$26,$27,$28,$29,$30,$31) `) if err != nil { return nil, err @@ -560,7 +562,7 @@ func RollbackDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { &t.ID, &t.TicketType, &t.Title, &t.GeneralCategory, &t.Department, &t.AppName, &t.Version, &t.FeatureName, &t.APIKey, &t.IssueType, &t.Priority, &t.Status, &t.Description, &t.AssistanceRequired, &t.AdditionalInfo, &t.CreatedBy, &t.CreatedByName, &t.CreatedByRole, &t.AssignedTo, &t.AssignedToName, &t.AssignedToRole, &t.HoldReason, &t.HeldBy, &t.HeldAt, &t.CompletionRemarks, &t.CompletedBy, - &t.CompletedAt, &t.LinkedErrorID, &t.CreatedAt, &t.UpdatedAt, + &t.CompletedAt, &t.LinkedErrorID, &t.Archived, &t.CreatedAt, &t.UpdatedAt, ); err != nil { return nil, err } @@ -568,7 +570,7 @@ func RollbackDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { t.ID, t.TicketType, t.Title, t.GeneralCategory, t.Department, t.AppName, t.Version, t.FeatureName, t.APIKey, t.IssueType, t.Priority, t.Status, t.Description, t.AssistanceRequired, t.AdditionalInfo, t.CreatedBy, t.CreatedByName, t.CreatedByRole, t.AssignedTo, t.AssignedToName, t.AssignedToRole, t.HoldReason, t.HeldBy, t.HeldAt, t.CompletionRemarks, t.CompletedBy, - t.CompletedAt, t.LinkedErrorID, t.CreatedAt, t.UpdatedAt, + t.CompletedAt, t.LinkedErrorID, t.Archived, t.CreatedAt, t.UpdatedAt, ); err != nil { return nil, err } @@ -655,7 +657,7 @@ func RollbackDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { errRows, err := backupDB.Query(` SELECT id, fingerprint, app_name, version, environment, service, endpoint, exception_type, message, stack_trace, severity, status, occurrences, first_seen, last_seen, resolved_at, resolved_by, - resolution_notes, linked_ticket_id, created_by, request_payload, created_at + resolution_notes, linked_ticket_id, created_by, request_payload, archived, created_at FROM errors `) if err != nil { @@ -666,8 +668,8 @@ func RollbackDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { errStmt, err := tx.Prepare(` INSERT INTO errors (id, fingerprint, app_name, version, environment, service, endpoint, exception_type, message, stack_trace, severity, status, occurrences, first_seen, last_seen, resolved_at, resolved_by, - resolution_notes, linked_ticket_id, created_by, request_payload, created_at) - VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22) + resolution_notes, linked_ticket_id, created_by, request_payload, archived, created_at) + VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21,$22,$23) `) if err != nil { return nil, err @@ -679,14 +681,14 @@ func RollbackDatabases(primaryDB, backupDB *sql.DB) (map[string]any, error) { if err := errRows.Scan( &e.ID, &e.Fingerprint, &e.AppName, &e.Version, &e.Environment, &e.Service, &e.Endpoint, &e.ExceptionType, &e.Message, &e.StackTrace, &e.Severity, &e.Status, &e.Occurrences, &e.FirstSeen, &e.LastSeen, &e.ResolvedAt, &e.ResolvedBy, - &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, &e.FirstSeen, + &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, &e.Archived, &e.CreatedAt, ); err != nil { return nil, err } if _, err := errStmt.Exec( e.ID, e.Fingerprint, e.AppName, e.Version, e.Environment, e.Service, e.Endpoint, e.ExceptionType, e.Message, e.StackTrace, e.Severity, e.Status, e.Occurrences, e.FirstSeen, e.LastSeen, e.ResolvedAt, e.ResolvedBy, - e.ResolutionNotes, e.LinkedTicketID, e.CreatedBy, e.RequestPayload, e.FirstSeen, + e.ResolutionNotes, e.LinkedTicketID, e.CreatedBy, e.RequestPayload, e.Archived, e.CreatedAt, ); err != nil { return nil, err } diff --git a/internal/khira/handlers.go b/internal/khira/handlers.go index 57587ef..45fe457 100644 --- a/internal/khira/handlers.go +++ b/internal/khira/handlers.go @@ -96,6 +96,7 @@ func (s *Server) RegisterRoutes(r chi.Router) { api.Post("/auth/register", s.handleRegister) api.Post("/auth/login", s.handleLogin) api.Post("/auth/logout", s.handleLogout) + api.Post("/auth/forgot-password", s.handleForgotPassword) api.Get("/auth/me", s.handleMe) api.Put("/auth/profile", s.handleUpdateProfile) api.Post("/auth/profile", s.handleUpdateProfile) @@ -113,6 +114,8 @@ func (s *Server) RegisterRoutes(r chi.Router) { api.Post("/tickets/{id}/hold", s.handleHoldTicket) api.Post("/tickets/{id}/resume", s.handleResumeTicket) api.Post("/tickets/{id}/complete", s.handleCompleteTicket) + api.Post("/tickets/{id}/archive", s.handleArchiveTicket) + api.Post("/tickets/{id}/unarchive", s.handleUnarchiveTicket) api.Post("/tickets/{id}/priority", s.handleChangePriority) api.Post("/tickets/{id}/reassign", s.handleReassignTicket) api.Post("/tickets/{id}/attachments", s.handleAddAttachment) @@ -134,6 +137,8 @@ func (s *Server) RegisterRoutes(r chi.Router) { api.Put("/errors/{id}/status", s.handleUpdateErrorStatus) api.Post("/errors/{id}/status", s.handleUpdateErrorStatus) api.Post("/errors/{id}/escalate", s.handleEscalateError) + api.Post("/errors/{id}/archive", s.handleArchiveError) + api.Post("/errors/{id}/unarchive", s.handleUnarchiveError) // Admin Database Sync & Rollback api.Post("/admin/db/sync", s.handleDBSync) @@ -218,6 +223,33 @@ func (s *Server) handleLogout(w http.ResponseWriter, r *http.Request) { s.writeJSON(w, http.StatusOK, map[string]string{"status": "ok"}) } +func (s *Server) handleForgotPassword(w http.ResponseWriter, r *http.Request) { + var req struct { + Username string `json:"username"` + } + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { + s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": "Invalid request body"}) + return + } + username := strings.TrimSpace(req.Username) + if username == "" { + s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": "Username is required"}) + return + } + + ticket, err := s.Store.RequestPasswordReset(username) + if err != nil { + s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()}) + return + } + + s.writeJSON(w, http.StatusOK, map[string]any{ + "status": "ok", + "message": fmt.Sprintf("Password reset ticket %s raised for administrator.", ticket.ID), + "ticket_id": ticket.ID, + }) +} + func (s *Server) handleMe(w http.ResponseWriter, r *http.Request) { actor := s.getActor(r) if actor == nil { @@ -595,6 +627,44 @@ func (s *Server) handleCompleteTicket(w http.ResponseWriter, r *http.Request) { }) } +func (s *Server) handleArchiveTicket(w http.ResponseWriter, r *http.Request) { + actor := s.getActor(r) + if actor == nil { + s.writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "Please sign in to archive tickets"}) + return + } + id := chi.URLParam(r, "id") + t, err := s.Store.ArchiveTicket(id, actor) + if err != nil { + s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()}) + return + } + s.writeJSON(w, http.StatusOK, map[string]any{ + "status": "ok", + "message": "Ticket archived successfully", + "ticket": t, + }) +} + +func (s *Server) handleUnarchiveTicket(w http.ResponseWriter, r *http.Request) { + actor := s.getActor(r) + if actor == nil { + s.writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "Please sign in to unarchive tickets"}) + return + } + id := chi.URLParam(r, "id") + t, err := s.Store.UnarchiveTicket(id, actor) + if err != nil { + s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()}) + return + } + s.writeJSON(w, http.StatusOK, map[string]any{ + "status": "ok", + "message": "Ticket restored from archive", + "ticket": t, + }) +} + func (s *Server) handleChangePriority(w http.ResponseWriter, r *http.Request) { actor := s.getActor(r) if actor == nil { @@ -1095,6 +1165,44 @@ func (s *Server) handleEscalateError(w http.ResponseWriter, r *http.Request) { }) } +func (s *Server) handleArchiveError(w http.ResponseWriter, r *http.Request) { + actor := s.getActor(r) + if actor == nil { + s.writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "Please sign in to archive errors"}) + return + } + id := chi.URLParam(r, "id") + errItem, err := s.Store.ArchiveError(id, actor) + if err != nil { + s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()}) + return + } + s.writeJSON(w, http.StatusOK, map[string]any{ + "status": "ok", + "message": "Error archived successfully", + "error": errItem, + }) +} + +func (s *Server) handleUnarchiveError(w http.ResponseWriter, r *http.Request) { + actor := s.getActor(r) + if actor == nil { + s.writeJSON(w, http.StatusUnauthorized, map[string]string{"error": "Please sign in to unarchive errors"}) + return + } + id := chi.URLParam(r, "id") + errItem, err := s.Store.UnarchiveError(id, actor) + if err != nil { + s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()}) + return + } + s.writeJSON(w, http.StatusOK, map[string]any{ + "status": "ok", + "message": "Error restored from archive", + "error": errItem, + }) +} + func (s *Server) isAdmin(actor *User) bool { if actor == nil { return false diff --git a/internal/khira/models.go b/internal/khira/models.go index 03cf321..a2ebc3c 100644 --- a/internal/khira/models.go +++ b/internal/khira/models.go @@ -137,6 +137,7 @@ type Ticket struct { Attachments []Attachment `json:"attachments,omitempty"` Links []string `json:"links,omitempty"` LinkedErrorID string `json:"linked_error_id,omitempty"` + Archived bool `json:"archived"` Remarks []Remark `json:"remarks"` CreatedAt time.Time `json:"created_at"` UpdatedAt time.Time `json:"updated_at"` @@ -182,6 +183,8 @@ type AppError struct { LinkedTicketID string `json:"linked_ticket_id,omitempty"` CreatedBy string `json:"created_by"` RequestPayload string `json:"request_payload,omitempty"` + Archived bool `json:"archived"` + CreatedAt time.Time `json:"created_at"` Tags []string `json:"tags,omitempty"` } diff --git a/internal/khira/store.go b/internal/khira/store.go index db05527..825f0dc 100644 --- a/internal/khira/store.go +++ b/internal/khira/store.go @@ -375,13 +375,13 @@ func (s *Store) GetTicket(id string) (*Ticket, error) { SELECT id, ticket_type, title, general_category, department, app_name, version, feature_name, api_key, issue_type, priority, status, description, assistance_required, additional_info, created_by, created_by_name, created_by_role, assigned_to, assigned_to_name, assigned_to_role, hold_reason, held_by, held_at, completion_remarks, completed_by, - completed_at, linked_error_id, created_at, updated_at + completed_at, linked_error_id, archived, created_at, updated_at FROM tickets WHERE id = $1 `, id).Scan( &t.ID, &t.TicketType, &t.Title, &t.GeneralCategory, &t.Department, &t.AppName, &t.Version, &t.FeatureName, &t.APIKey, &t.IssueType, &t.Priority, &t.Status, &t.Description, &t.AssistanceRequired, &t.AdditionalInfo, &t.CreatedBy, &t.CreatedByName, &t.CreatedByRole, &t.AssignedTo, &t.AssignedToName, &t.AssignedToRole, &t.HoldReason, &t.HeldBy, &t.HeldAt, &t.CompletionRemarks, &t.CompletedBy, - &t.CompletedAt, &t.LinkedErrorID, &t.CreatedAt, &t.UpdatedAt, + &t.CompletedAt, &t.LinkedErrorID, &t.Archived, &t.CreatedAt, &t.UpdatedAt, ) if err != nil { return nil, errors.New("ticket not found") @@ -449,9 +449,9 @@ func (s *Store) DeleteTicket(ticketID string, actor *User) error { } isAdmin := actor != nil && (strings.EqualFold(actor.Username, "admin") || actor.Role == string(RoleLead) || strings.EqualFold(actor.Role, "team_lead") || strings.EqualFold(actor.Role, "lead")) - isOwner := actor != nil && (strings.EqualFold(actor.Username, createdBy) || strings.EqualFold(actor.Username, assignedTo)) - if !isAdmin && !isOwner { - return errors.New("permission denied: only administrators or the ticket creator can delete this ticket") + isCreator := actor != nil && strings.EqualFold(actor.Username, createdBy) + if !isAdmin && !isCreator { + return errors.New("permission denied: only administrators or the person who assigned/created this ticket can delete it") } tx, err := s.primaryDB.Begin() @@ -530,7 +530,7 @@ func (s *Store) ListTickets(status, priority, app, assignee, reporter, query, ti SELECT id, ticket_type, title, general_category, department, app_name, version, feature_name, api_key, issue_type, priority, status, description, assistance_required, additional_info, created_by, created_by_name, created_by_role, assigned_to, assigned_to_name, assigned_to_role, hold_reason, held_by, held_at, completion_remarks, completed_by, - completed_at, linked_error_id, created_at, updated_at + completed_at, linked_error_id, archived, created_at, updated_at FROM tickets %s ORDER BY created_at DESC @@ -549,7 +549,7 @@ func (s *Store) ListTickets(status, priority, app, assignee, reporter, query, ti &t.ID, &t.TicketType, &t.Title, &t.GeneralCategory, &t.Department, &t.AppName, &t.Version, &t.FeatureName, &t.APIKey, &t.IssueType, &t.Priority, &t.Status, &t.Description, &t.AssistanceRequired, &t.AdditionalInfo, &t.CreatedBy, &t.CreatedByName, &t.CreatedByRole, &t.AssignedTo, &t.AssignedToName, &t.AssignedToRole, &t.HoldReason, &t.HeldBy, &t.HeldAt, &t.CompletionRemarks, &t.CompletedBy, - &t.CompletedAt, &t.LinkedErrorID, &t.CreatedAt, &t.UpdatedAt, + &t.CompletedAt, &t.LinkedErrorID, &t.Archived, &t.CreatedAt, &t.UpdatedAt, ); err == nil { t.Remarks = []Remark{} t.Attachments = []Attachment{} @@ -719,6 +719,68 @@ func (s *Store) CompleteTicket(ticketID string, actor *User, remarks string) (*T return s.GetTicket(ticketID) } +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) + 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") + } + + now := time.Now() + _, err = s.primaryDB.Exec("UPDATE tickets SET archived = TRUE, updated_at = $1 WHERE id = $2", now, ticketID) + if err != nil { + return nil, err + } + + remID := uuid.New().String() + actorName := "System" + actorRole := "admin" + actorUsername := "system" + if actor != nil { + actorName = actor.Name + actorRole = actor.RoleDisplay + actorUsername = actor.Username + } + _, _ = s.primaryDB.Exec(` + INSERT INTO ticket_remarks (id, ticket_id, author_username, author_name, author_role, type, text, created_at) + VALUES ($1, $2, $3, $4, $5, 'archive', $6, $7) + `, remID, ticketID, actorUsername, actorName, actorRole, "Moved ticket to archive.", now) + + return s.GetTicket(ticketID) +} + +func (s *Store) UnarchiveTicket(ticketID string, actor *User) (*Ticket, error) { + now := time.Now() + res, err := s.primaryDB.Exec("UPDATE tickets SET archived = FALSE, updated_at = $1 WHERE id = $2", now, ticketID) + if err != nil { + return nil, err + } + if n, _ := res.RowsAffected(); n == 0 { + return nil, errors.New("ticket not found") + } + + remID := uuid.New().String() + actorName := "System" + actorRole := "admin" + actorUsername := "system" + if actor != nil { + actorName = actor.Name + actorRole = actor.RoleDisplay + actorUsername = actor.Username + } + _, _ = s.primaryDB.Exec(` + INSERT INTO ticket_remarks (id, ticket_id, author_username, author_name, author_role, type, text, created_at) + VALUES ($1, $2, $3, $4, $5, 'unarchive', $6, $7) + `, remID, ticketID, actorUsername, actorName, actorRole, "Restored ticket from archive.", now) + + return s.GetTicket(ticketID) +} + func (s *Store) ChangePriority(ticketID string, actor *User, priority, note string) (*Ticket, error) { priority = strings.ToLower(strings.TrimSpace(priority)) @@ -931,12 +993,12 @@ func (s *Store) GetError(id string) (*AppError, error) { err := s.primaryDB.QueryRow(` SELECT id, fingerprint, app_name, version, environment, service, endpoint, exception_type, message, stack_trace, severity, status, occurrences, first_seen, last_seen, resolved_at, resolved_by, - resolution_notes, linked_ticket_id, created_by, request_payload + resolution_notes, linked_ticket_id, created_by, request_payload, archived FROM errors WHERE id = $1 `, id).Scan( &e.ID, &e.Fingerprint, &e.AppName, &e.Version, &e.Environment, &e.Service, &e.Endpoint, &e.ExceptionType, &e.Message, &e.StackTrace, &e.Severity, &e.Status, &e.Occurrences, &e.FirstSeen, &e.LastSeen, &e.ResolvedAt, &e.ResolvedBy, - &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, + &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, &e.Archived, ) if err != nil { return nil, errors.New("error not found") @@ -980,7 +1042,7 @@ func (s *Store) ListErrors(status, severity, app, query string) []*AppError { querySQL := fmt.Sprintf(` SELECT id, fingerprint, app_name, version, environment, service, endpoint, exception_type, message, stack_trace, severity, status, occurrences, first_seen, last_seen, resolved_at, resolved_by, - resolution_notes, linked_ticket_id, created_by, request_payload + resolution_notes, linked_ticket_id, created_by, request_payload, archived FROM errors %s ORDER BY last_seen DESC LIMIT 100 @@ -998,7 +1060,7 @@ func (s *Store) ListErrors(status, severity, app, query string) []*AppError { if err := rows.Scan( &e.ID, &e.Fingerprint, &e.AppName, &e.Version, &e.Environment, &e.Service, &e.Endpoint, &e.ExceptionType, &e.Message, &e.StackTrace, &e.Severity, &e.Status, &e.Occurrences, &e.FirstSeen, &e.LastSeen, &e.ResolvedAt, &e.ResolvedBy, - &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, + &e.ResolutionNotes, &e.LinkedTicketID, &e.CreatedBy, &e.RequestPayload, &e.Archived, ); err == nil { list = append(list, &e) } @@ -1080,6 +1142,87 @@ func (s *Store) UpdateErrorStatus(id string, status ErrorStatus, notes string, a return s.GetError(id) } +func (s *Store) ArchiveError(errorID string, actor *User) (*AppError, error) { + var status string + err := s.primaryDB.QueryRow("SELECT status FROM errors WHERE id = $1", errorID).Scan(&status) + if err != nil { + return nil, errors.New("error not found") + } + + if strings.ToLower(status) != string(ErrorStatusResolved) { + return nil, errors.New("only resolved errors can be sent to the archive") + } + + _, err = s.primaryDB.Exec("UPDATE errors SET archived = TRUE WHERE id = $1", errorID) + if err != nil { + return nil, err + } + return s.GetError(errorID) +} + +func (s *Store) UnarchiveError(errorID string, actor *User) (*AppError, error) { + res, err := s.primaryDB.Exec("UPDATE errors SET archived = FALSE WHERE id = $1", errorID) + if err != nil { + return nil, err + } + if n, _ := res.RowsAffected(); n == 0 { + return nil, errors.New("error not found") + } + return s.GetError(errorID) +} + +func (s *Store) RequestPasswordReset(username string) (*Ticket, error) { + user, err := s.GetUser(username) + if err != nil || user == nil { + return nil, errors.New("user not found") + } + + tID, err := s.nextSeq("ticket_seq", "KHR") + if err != nil { + return nil, fmt.Errorf("failed to generate ticket ID: %w", err) + } + + now := time.Now() + title := fmt.Sprintf("[Password Reset Request] Account: @%s", user.Username) + desc := fmt.Sprintf("User @%s (%s, Role: %s) has requested a password reset. Please verify their identity and reset their credentials.", user.Username, user.Name, user.RoleDisplay) + + tx, err := s.primaryDB.Begin() + if err != nil { + return nil, err + } + defer tx.Rollback() + + _, err = tx.Exec(` + INSERT INTO tickets ( + id, ticket_type, title, general_category, department, app_name, version, feature_name, api_key, issue_type, + priority, status, description, assistance_required, additional_info, created_by, created_by_name, created_by_role, + assigned_to, assigned_to_name, assigned_to_role, linked_error_id, created_at, updated_at + ) VALUES ($1,'general',$2,'Access & Permissions','Administration','','','','','credential_reset', + 'P1','open',$3,'Administrator password reset','', + $4,$5,$6,'admin','Admin','admin','',$7,$7) + `, tID, title, desc, user.Username, user.Name, user.Role, now) + if err != nil { + return nil, fmt.Errorf("failed to create password reset ticket: %w", err) + } + + remID := uuid.New().String() + _, err = tx.Exec(` + INSERT INTO ticket_remarks (id, ticket_id, author_username, author_name, author_role, type, text, created_at) + VALUES ($1, $2, $3, $4, $5, 'created', $6, $7) + `, remID, tID, user.Username, user.Name, user.RoleDisplay, "Automatically generated high-priority password reset ticket for administrator.", now) + if err != nil { + return nil, err + } + + if err := tx.Commit(); err != nil { + return nil, err + } + + s.addNotification("admin", tID, "Password Reset Request", fmt.Sprintf("Password reset requested by @%s (%s)", user.Username, user.Name), "assignment") + + return s.GetTicket(tID) +} + func (s *Store) EscalateErrorToTicket(errorID, title, assignedTo, priority, notes string, actor *User) (*Ticket, *AppError, error) { errItem, err := s.GetError(errorID) if err != nil { diff --git a/web/khira/app.js b/web/khira/app.js index 97727c5..1e645f2 100644 --- a/web/khira/app.js +++ b/web/khira/app.js @@ -4,7 +4,7 @@ const $=s=>document.querySelector(s),$$=s=>[...document.querySelectorAll(s)]; const esc=s=>s==null?'':String(s).replace(/[&<>"']/g,c=>({'&':'&','<':'<','>':'>','"':'"',"'":'''}[c])); const ms=n=>`${n}`; const ls=k=>{try{return localStorage.getItem(k)}catch(e){return null}}; -const S={u:null,t:[],us:[],e:[],ts:{},es:{},n:[],sec:'tickets',scope:'assigned',st:'',pr:'',ty:'',view:'board',q:'',ef:'',tid:null}; +const S={u:null,t:[],us:[],e:[],ts:{},es:{},n:[],sec:'tickets',scope:'assigned',st:'',pr:'',ty:'',fa:'',view:'board',q:'',ef:'',tid:null}; const APPS=['Creator Suite Web','FastAPI Backend','Creator Suite Web Unified Dashboard','Batch Inpaint Service','Nexus Gateway','Other App']; const ISS=['API Failure / 500 / 400 Error','UI Layout / Rendering Bug','Schema Sync / Mismatch','Performance / Latency','Auth / Permission','Other']; const CATS=['DevOps & Infrastructure','Database & Storage','Access & Permissions','Design & UX','Internal Workflow & Tooling','Hardware & IT Support','Security & Compliance','General Task']; @@ -184,19 +184,52 @@ function fT(){ if(S.scope==='reported'&&(t.reporter?.username||t.created_by)!==me)return false; if(S.ty&&(t.ticket_type||'application')!==S.ty)return false; if(S.pr&&pri(t)!==S.pr)return false; - if(S.st&&st(t)!==S.st)return false; + if(S.fa&&(t.assignee?.username||t.assigned_to)!==S.fa)return false; + if(S.st==='archived'){ + if(!t.archived)return false; + }else{ + if(t.archived)return false; + if(S.st&&st(t)!==S.st)return false; + } return!S.q||[t.id,t.title,t.general_category,t.department,t.app,t.feature,t.api_key,t.assignee?.name,t.assigned_to_name].join(' ').toLowerCase().includes(S.q); }); } const sub=t=>t.ticket_type==='general'?(t.general_category||t.department||'General'):(t.app||t.app_name||'—'); +function dateGroup(iso){ + if(!iso)return'Older'; + const d=new Date(iso); + if(isNaN(d))return'Older'; + const now=new Date(); + const today=new Date(now.getFullYear(),now.getMonth(),now.getDate()); + const tDate=new Date(d.getFullYear(),d.getMonth(),d.getDate()); + const diffDays=Math.floor((today-tDate)/(24*3600*1000)); + if(diffDays===0)return'Today'; + if(diffDays===1)return'Yesterday'; + if(diffDays<7)return'This Week'; + if(d.getFullYear()===now.getFullYear()&&d.getMonth()===now.getMonth())return'Earlier this Month'; + return'Older'; +} + function renderT(anim){ const s=S.ts,f=fT(); put('#stats',tile(s.my_assigned,'Assigned to me','sa')+tile(s.my_created,'Filed by me','sr')+tile(s.on_hold,'On hold','sh')+tile(s.completed,'Completed','sc')); put('#tabs',[['assigned','Assigned to me',s.my_assigned],['reported','Created by me',s.my_created],['all','All tickets',s.total]].map(([k,l,n])=>``).join('')); - put('#stChips',chipRow([['','All'],...Object.entries(STAT)],S.st,'data-st')); + + const archCount=S.t.filter(t=>t.archived).length; + const tChips=[['','All'],...Object.entries(STAT),['archived',`Archived (${archCount})`]]; + put('#stChips',chipRow(tChips,S.st,'data-st')); $('#sum').textContent=`You have ${s.my_assigned||0} active tasks and ${s.my_held||0} on hold.`; $('#fp').value=S.pr;$('#ft').value=S.ty; + + const faEl=$('#fa'); + if(faEl){ + const curVal=S.fa||''; + const opts=[['','All assignees'],...S.us.map(u=>[u.username,`${u.name} (${u.role_display||u.role})`])]; + faEl.innerHTML=opts.map(([v,l])=>``).join(''); + faEl.value=curVal; + } + $$('#vsw button').forEach(b=>b.classList.toggle('on',b.dataset.v===S.view)); $('#board').hidden=S.view!=='board';$('#list').hidden=S.view!=='list'; $('#board').classList.toggle('anim',!!anim);$('#list').classList.toggle('anim',!!anim); @@ -210,10 +243,27 @@ function renderT(anim){ }).join('')||'
${esc(t.id)} · ${esc(sub(t))} · ${esc(t.assignee?.name||t.assigned_to_name||'Unassigned')}
No tickets match these filters.
${esc(t.id)} · ${esc(sub(t))} · ${esc(t.assignee?.name||t.assigned_to_name||'Unassigned')}
No tickets match these filters.
${esc(e.message)}
${esc(e.id)} · ${esc(e.app||e.app_name||'—')} · ${esc(e.endpoint||'—')}
${esc(e.message)}
${esc(e.id)} · ${esc(e.app||e.app_name||'—')} · ${esc(e.endpoint||'—')}
No errors tracked.
${esc(t.assistance||t.assistance_required||'—')}
${esc(t.context||t.additional_info||'No logs provided')}${esc(r.text||r.body)}
${esc(r.text||r.body)}
${l}
${esc(v)}${esc(e.message)}
${blk('Endpoint',e.endpoint)}${blk('Stack trace',e.stack_trace)}${blk('Payload',e.payload||e.request_payload)}${e.escalated_ticket_id||e.linked_ticket_id?`Escalated as ${esc(e.escalated_ticket_id||e.linked_ticket_id)}
`:''}${e.resolution_notes?`Resolution: ${esc(e.resolution_notes)}
`:''}`, ok:k==='resolved'?'Close':'Escalate to ticket', - alt:k==='unresolved'?['Resolve',()=>resolveD(id)]:null, + alt:k==='unresolved'?['Resolve',()=>resolveD(id)]:(k==='resolved'?[(isArch?'Restore':'Archive'),async()=>{ + const actName=isArch?'unarchive':'archive'; + const r=await api(`/khira/api/errors/${encodeURIComponent(id)}/${actName}`,'POST'); + if(r._f||r.error){toast(r.error||'Failed','err');return false} + toast(isArch?'Error restored from archive':'Error moved to archive'); + $('#dlg').close(); + await refresh(); + }]:null), init:f=>{ f.querySelector('#btnLogMoreForApp')?.addEventListener('click',()=>{ $('#dlg').close(); @@ -670,6 +746,22 @@ document.addEventListener('click',async e=>{ if(x=c('#btnLogAppErr'))return reportErr({continue_app:true}); if(x=c('#btnSyncBackup'))return adminSyncDB(); if(x=c('#btnRollbackBackup'))return adminRollbackDB(); + if(x=c('#btnForgot')){ + const curU=($('#lu')?.value||'').trim(); + dlg({ + title:'Forgot Password', + sub:'Submit your username to automatically raise a ticket for the administrator to reset your credentials.', + body:fld('u','Username',{v:curU,req:1}), + ok:'Submit Request', + go:async v=>{ + const r=await api('/khira/api/auth/forgot-password','POST',{username:v.u}); + if(r._f||r.error){toast(r.error||'Failed to raise ticket','err');return false} + toast(r.message||'Password reset ticket raised for admin'); + return true; + } + }); + return; + } if(x=c('#atabs [data-a]')){const up=x.dataset.a==='up';$$('#atabs button').forEach(b=>b.classList.toggle('on',b===x));$('#fIn').hidden=up;$('#fUp').hidden=!up;return} if(x=c('[data-d]')){$('#lu').value=x.dataset.d;$('#lp').value=x.dataset.d==='admin'?'admin':(x.dataset.d+'123');return $('#fIn').requestSubmit()} if(x=c('[data-do]')){ @@ -677,6 +769,8 @@ document.addEventListener('click',async e=>{ if(d==='del')return deleteTicketD(S.tid); if(d==='hold')return holdD();if(d==='done')return doneD(); if(d==='resume')return act('resume',undefined,'Ticket resumed'); + if(d==='archive')return act('archive',{},'Ticket archived'); + if(d==='unarchive')return act('unarchive',{},'Ticket restored from archive'); if(d==='readall'){await api('/khira/api/notifications/read','POST');await refresh();toast('All marked read');$('#pop').hidden=true} return; } @@ -693,6 +787,7 @@ document.addEventListener('change',e=>{ if(a==='prio')act('priority',{priority:T.value},'Priority updated'); if(T.id==='fp'){S.pr=T.value;render(true)} if(T.id==='ft'){S.ty=T.value;render(true)} + if(T.id==='fa'){S.fa=T.value;render(true)} }); document.addEventListener('input',e=>{ e.target.closest('.fld')?.classList.remove('bad'); diff --git a/web/khira/index.html b/web/khira/index.html index 89e03fc..b5e7e3d 100644 --- a/web/khira/index.html +++ b/web/khira/index.html @@ -9,7 +9,7 @@ - + @@ -24,6 +24,7 @@