diff --git a/internal/controllers/tickets/tickets.go b/internal/controllers/tickets/tickets.go index 57d35fb..804bcbb 100644 --- a/internal/controllers/tickets/tickets.go +++ b/internal/controllers/tickets/tickets.go @@ -2,6 +2,7 @@ package tickets import ( "context" + "encoding/json" "errors" "fmt" "gitea.pena/PenaSide/heruvym/internal/model" @@ -13,7 +14,6 @@ import ( "github.com/gofiber/fiber/v2" "go.uber.org/zap" "gopkg.in/telebot.v3" - "encoding/json" ) type Deps struct { @@ -94,7 +94,7 @@ func (t *TicketController) CreateTicket(ctx *fiber.Ctx) error { ctx.Get("Origin"), request.Title, request.Message, - request.System, + request.System, []string{}, ) if err != nil { @@ -460,7 +460,8 @@ func (t *TicketController) allTickets(ctx context.Context, output chan interface //} if err := t.dal.WatchAllTickets(ctx, func(ticket model.Ticket) error { - output <- ticket + msg, _ := json.Marshal(ticket) + output <- msg return nil }); err != nil { output <- errors.New("cannot watch all tickets" + err.Error()) @@ -491,14 +492,16 @@ func (t *TicketController) userTickets(ctx context.Context, userID string, outpu } data = filteredData - output <- GetTicketsResp{data, count} + msg, _ := json.Marshal(GetTicketsResp{data, count}) + output <- msg } if err := t.dal.WatchTickets(ctx, userID, func(ticket model.Ticket) error { if ticket.TopMessage.System { return nil } - output <- ticket + msg, _ := json.Marshal(ticket) + output <- msg return nil }); err != nil { output <- errors.New("cannot watch tickets") @@ -517,7 +520,8 @@ func (t *TicketController) unauthorizedTickets(ctx context.Context, sess string, } if tickets != nil { - output <- GetTicketsResp{tickets, count} + msg, _ := json.Marshal(GetTicketsResp{tickets, count}) + output <- msg } } @@ -556,7 +560,7 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} { if err := t.dal.WatchMessages(ctx, ticketID, func(message model.Message) error { if !message.System { - msg,_:=json.Marshal(message) + msg, _ := json.Marshal(message) output <- msg } @@ -579,7 +583,7 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} { go func() { if err := t.dal.YieldMessages(ctx, ticketID, func(message model.Message) error { - msg,_:=json.Marshal(message) + msg, _ := json.Marshal(message) output <- msg //if err := h.dal.SetShown(ctx, message.ID, sess.User); err != nil { @@ -596,7 +600,7 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} { if err := t.dal.WatchMessages(ctx, ticketID, func(message model.Message) error { - msg,_:=json.Marshal(message) + msg, _ := json.Marshal(message) output <- msg //if err := h.dal.SetShown(ctx, message.ID, sess.Session); err != nil { @@ -641,7 +645,7 @@ func (t *TicketController) Subscribe(ctx context.Context) chan interface{} { if err := t.dal.WatchMessages(ctx, ticketID, func(message model.Message) error { if !message.System { - msg,_:=json.Marshal(message) + msg, _ := json.Marshal(message) output <- msg }