feat(khira): add delete ticket option and admin-exclusive 'A' avatar
This commit is contained in:
@@ -174,7 +174,7 @@ func seedDefaultUsers(db *sql.DB) error {
|
||||
roleDisplay string
|
||||
avatar string
|
||||
}{
|
||||
{"admin", "System Administrator", "admin", "team_lead", "Team Lead", "⚡"},
|
||||
{"admin", "System Administrator", "admin", "team_lead", "Team Lead", "A"},
|
||||
{"alice", "Alice Sharma", "alice123", "frontend_dev", "Frontend Dev", "👩💻"},
|
||||
{"bob", "Bob Anderson", "bob123", "backend_dev", "Backend Dev", "👨💻"},
|
||||
{"charlie", "Charlie Diaz", "charlie123", "tester", "Tester", "🕵️♂️"},
|
||||
@@ -195,9 +195,9 @@ func seedDefaultUsers(db *sql.DB) error {
|
||||
slog.Error("failed to seed user", "username", u.username, "err", err)
|
||||
}
|
||||
} else if u.username == "admin" {
|
||||
// Ensure admin password is "admin"
|
||||
// Ensure admin password is "admin" and avatar is "A"
|
||||
hash := hashPassword("admin")
|
||||
_, _ = db.Exec("UPDATE users SET password_hash = $1 WHERE username = 'admin'", hash)
|
||||
_, _ = db.Exec("UPDATE users SET password_hash = $1, avatar = 'A' WHERE username = 'admin'", hash)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -107,6 +107,8 @@ func (s *Server) RegisterRoutes(r chi.Router) {
|
||||
api.Get("/tickets", s.handleListTickets)
|
||||
api.Post("/tickets", s.handleCreateTicket)
|
||||
api.Get("/tickets/{id}", s.handleGetTicket)
|
||||
api.Delete("/tickets/{id}", s.handleDeleteTicket)
|
||||
api.Post("/tickets/{id}/delete", s.handleDeleteTicket)
|
||||
api.Post("/tickets/{id}/remarks", s.handleAddRemark)
|
||||
api.Post("/tickets/{id}/hold", s.handleHoldTicket)
|
||||
api.Post("/tickets/{id}/resume", s.handleResumeTicket)
|
||||
@@ -257,6 +259,11 @@ func (s *Server) handleUpdateProfile(w http.ResponseWriter, r *http.Request) {
|
||||
pass = strings.TrimSpace(req.Password)
|
||||
}
|
||||
|
||||
if strings.TrimSpace(req.Avatar) == "A" && !s.isAdmin(actor) {
|
||||
s.writeJSON(w, http.StatusForbidden, map[string]string{"error": "The 'A' avatar is exclusively reserved for administrators"})
|
||||
return
|
||||
}
|
||||
|
||||
updated, err := s.Store.UpdateUserProfileFull(actor.Username, req.Name, req.Role, req.Avatar, req.AvatarType, req.ProfileImage, pass)
|
||||
if err != nil {
|
||||
s.writeJSON(w, http.StatusBadRequest, map[string]string{"error": err.Error()})
|
||||
@@ -447,6 +454,23 @@ func (s *Server) handleGetTicket(w http.ResponseWriter, r *http.Request) {
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Server) handleDeleteTicket(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 delete tickets"})
|
||||
return
|
||||
}
|
||||
id := chi.URLParam(r, "id")
|
||||
if err := s.Store.DeleteTicket(id, actor); 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("Ticket %s deleted successfully", id),
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Server) handleAddRemark(w http.ResponseWriter, r *http.Request) {
|
||||
actor := s.getActor(r)
|
||||
if actor == nil {
|
||||
|
||||
+45
-1
@@ -245,7 +245,14 @@ func (s *Store) UpdateUserProfileFull(username, name, role, avatar, avatarType,
|
||||
}
|
||||
}
|
||||
if strings.TrimSpace(avatar) != "" {
|
||||
u.Avatar = strings.TrimSpace(avatar)
|
||||
newAv := strings.TrimSpace(avatar)
|
||||
if newAv == "A" {
|
||||
isAdmin := strings.EqualFold(u.Username, "admin") || strings.EqualFold(u.Role, "team_lead") || strings.EqualFold(u.Role, "lead")
|
||||
if !isAdmin {
|
||||
return nil, errors.New("the 'A' avatar is exclusively reserved for administrators")
|
||||
}
|
||||
}
|
||||
u.Avatar = newAv
|
||||
}
|
||||
if strings.TrimSpace(avatarType) != "" {
|
||||
u.AvatarType = strings.TrimSpace(avatarType)
|
||||
@@ -430,6 +437,43 @@ func (s *Store) GetTicket(id string) (*Ticket, error) {
|
||||
return &t, nil
|
||||
}
|
||||
|
||||
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)
|
||||
if err != nil {
|
||||
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"))
|
||||
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")
|
||||
}
|
||||
|
||||
tx, err := s.primaryDB.Begin()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
|
||||
// 1. Unlink any errors referencing this ticket
|
||||
_, _ = tx.Exec("UPDATE errors SET linked_ticket_id = '', status = 'unresolved' WHERE linked_ticket_id = $1", ticketID)
|
||||
|
||||
// 2. Delete notifications referencing this ticket
|
||||
_, _ = tx.Exec("DELETE FROM notifications WHERE ticket_id = $1", ticketID)
|
||||
|
||||
// 3. Delete ticket (cascade deletes ticket_remarks, ticket_attachments, ticket_links)
|
||||
res, err := tx.Exec("DELETE FROM tickets WHERE id = $1", ticketID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to delete ticket: %w", err)
|
||||
}
|
||||
if n, _ := res.RowsAffected(); n == 0 {
|
||||
return errors.New("ticket not found")
|
||||
}
|
||||
|
||||
return tx.Commit()
|
||||
}
|
||||
|
||||
func (s *Store) ListTickets(status, priority, app, assignee, reporter, query, ticketType string) []*Ticket {
|
||||
|
||||
var conds []string
|
||||
|
||||
Reference in New Issue
Block a user