CSEC_PUBLIC/catalyst
1
0
Fork 0
mirror of https://github.com/SecurityBrewery/catalyst.git synced 2025-12-06 15:22:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split correlated and related tickets (#542)

Browse Source 
Co-authored-by: Jonas Plum <git@jonasplum.de>
This commit is contained in:
Jonas Plum
2022-10-22 22:28:44 +02:00
committed by GitHub
parent f8a11031fb
commit 73f88e0963
10 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
database/ticket.go
View File

@@ -136,7 +136,7 @@ func toTicketSimpleResponse(key string, ticket *model.Ticket) (*model.TicketSimp
}, nil
}
func toTicketWithTickets(ticketResponse *model.TicketResponse, tickets []*model.TicketSimpleResponse, logs []*model.LogEntry) *model.TicketWithTickets {
func toTicketWithTickets(ticketResponse *model.TicketResponse, tickets, correlatedTickets []*model.TicketSimpleResponse, logs []*model.LogEntry) *model.TicketWithTickets {
return &model.TicketWithTickets{
Artifacts: ticketResponse.Artifacts,
Comments: ticketResponse.Comments,
@@ -155,8 +155,9 @@ func toTicketWithTickets(ticketResponse *model.TicketResponse, tickets []*model.
Type: ticketResponse.Type,
Write: ticketResponse.Write,
Logs: logs,
Tickets: tickets,
Logs: logs,
Tickets: tickets,
CorrelatedTickets: correlatedTickets,
}
}
@@ -405,7 +406,6 @@ func (db *Database) ticketGetQuery(ctx context.Context, ticketID int64, query st
tickets := outTickets
tickets = append(tickets, inTickets...)
tickets = append(tickets, sameArtifactTickets...)
sort.Slice(tickets, func(i, j int) bool {
return tickets[i].ID < tickets[j].ID
})
@@ -420,7 +420,7 @@ func (db *Database) ticketGetQuery(ctx context.Context, ticketID int64, query st
return nil, err
}
return toTicketWithTickets(ticketResponse, tickets, logs), nil
return toTicketWithTickets(ticketResponse, tickets, sameArtifactTickets, logs), nil
}
func (db *Database) TicketUpdate(ctx context.Context, ticketID int64, ticket *model.Ticket) (*model.TicketWithTickets, error) {