Reduce message queue from double-map to a single list.

Author: mitchell-as

cmd/state-svc/internal/messages/message.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/ActiveState/cli/cmd/state-svc/internal/graphqltypes"
 	"github.com/ActiveState/cli/cmd/state-svc/internal/hash"
-	"github.com/ActiveState/cli/cmd/state-svc/internal/messages"
 	"github.com/ActiveState/cli/cmd/state-svc/internal/notifications"
 	"github.com/ActiveState/cli/cmd/state-svc/internal/rtwatcher"
 	genserver "github.com/ActiveState/cli/cmd/state-svc/internal/server/generated"
@@ -27,7 +26,7 @@ import (
 	"github.com/ActiveState/cli/internal/locale"
 	"github.com/ActiveState/cli/internal/logging"
 	configMediator "github.com/ActiveState/cli/internal/mediators/config"
-	msgs "github.com/ActiveState/cli/internal/messages"
+	"github.com/ActiveState/cli/internal/messages"
 	"github.com/ActiveState/cli/internal/poller"
 	"github.com/ActiveState/cli/internal/rtutils/ptr"
 	"github.com/ActiveState/cli/internal/runbits/panics"
@@ -37,10 +36,14 @@ import (
 	"github.com/patrickmn/go-cache"
 )
 
+type messageQueue struct {
+	messages []*graph.Message
+}
+
 type Resolver struct {
 	cfg            *config.Instance
 	notifications  *notifications.Notifications
-	messages       *messages.Queue
+	messages       *messageQueue
 	updatePoller   *poller.Poller
 	authPoller     *poller.Poller
 	projectIDCache *projectcache.ID
@@ -60,7 +63,7 @@ func New(cfg *config.Instance, an *sync.Client, auth *authentication.Auth) (*Res
 		return nil, errs.Wrap(err, "Could not initialize messages")
 	}
 
-	msg := messages.NewQueue()
+	msg := &messageQueue{make([]*graph.Message, 0)}
 	upchecker := updater.NewDefaultChecker(cfg, an)
 	pollUpdate := poller.New(1*time.Hour, func() (interface{}, error) {
 		defer func() {
@@ -91,7 +94,10 @@ func New(cfg *config.Instance, an *sync.Client, auth *authentication.Auth) (*Res
 				var invalidTokenErr *authentication.ErrInvalidToken
 				if errors.As(err, &invalidTokenErr) {
 					logging.Debug("Queuing invalid API token error")
-					msg.Queue(msgs.TopicErrorAuthToken, locale.Tl("err_invalid_token_try_again", "Invalid API token. Please check your API token and try again."))
+					msg.messages = append(msg.messages, &graph.Message{
+						Topic:   messages.TopicErrorAuthToken,
+						Message: locale.Tl("err_invalid_token_try_again", "Invalid API token. Please check your API token and try again."),
+					})
 				} else {
 					logging.Warning("Could not sync authenticated state: %s", err.Error())
 				}
@@ -273,25 +279,10 @@ func (r *Resolver) CheckNotifications(ctx context.Context, command string, flags
 }
 
 func (r *Resolver) CheckMessages(ctx context.Context) ([]*graph.Message, error) {
+	defer func() { panics.LogAndPanic(recover(), debug.Stack()) }()
 	logging.Debug("Check messages resolver")
-	var messages []*graph.Message
-	var err error
-
-	defer func() {
-		var sentMessageIDs []string
-		for _, msg := range messages {
-			sentMessageIDs = append(sentMessageIDs, msg.ID)
-		}
-		if err := r.messages.Dequeue(sentMessageIDs); err != nil {
-			logging.Error("Could not dequeue messages: %s", errs.JoinMessage(err))
-		}
-		panics.LogAndPanic(recover(), debug.Stack())
-	}()
-
-	messages, err = r.messages.Messages()
-	if err != nil {
-		return nil, errs.Wrap(err, "Could not get messages")
-	}
+	messages := r.messages.messages
+	r.messages.messages = r.messages.messages[:0] // clear queue
 	return messages, nil
 }