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

Fix sorting on multiple ticket fields (#412)

Browse Source
This commit is contained in:
Jonas Plum
2022-08-21 22:23:27 +02:00
committed by GitHub
parent 2b7be7c212
commit fd8e793361
4 changed files with 130 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
service/ticket.go
View File

@@ -38,27 +38,27 @@ func ticketIDs(ticketResponses []*model.TicketResponse) []driver.DocumentID {
return ids
}
func (s *Service) ListTickets(ctx context.Context, s3 *string, i *int, i2 *int, strings []string, bools []bool, s2 *string) (*model.TicketList, error) {
func (s *Service) ListTickets(ctx context.Context, ticketType *string, offsetP, countP *int, sort []string, descending []bool, queryP *string) (*model.TicketList, error) {
q := ""
if s2 != nil && *s2 != "" {
q = *s2
if queryP != nil && *queryP != "" {
q = *queryP
}
t := ""
if s3 != nil && *s3 != "" {
t = *s3
if ticketType != nil && *ticketType != "" {
t = *ticketType
}
offset := int64(0)
if i != nil {
offset = int64(*i)
if offsetP != nil {
offset = int64(*offsetP)
}
count := int64(25)
if i2 != nil {
count = int64(*i2)
if countP != nil {
count = int64(*countP)
}
return s.database.TicketList(ctx, t, q, strings, bools, offset, count)
return s.database.TicketList(ctx, t, q, sort, descending, offset, count)
}
func (s *Service) CreateTicket(ctx context.Context, form *model.TicketForm) (doc *model.TicketResponse, err error) {