update handler (#2)

* 🔧 Remove commented-out regex patterns and initialization in config.

* ✨ Add NATS message publisher with configuration 📩🚀

* ✨ Add new PlainTextMarshaler and refactor handler in nats package.

internal/nats/handler.go

@@ -0,0 +1,63 @@
+package nats
+
+import (
+	"caatsm/internal/config"
+	"caatsm/internal/domain"
+	"caatsm/internal/parsers"
+	"caatsm/internal/repository"
+	"caatsm/pkg/utils"
+	"fmt"
+	"sync"
+
+	"github.com/ThreeDotsLabs/watermill"
+	"github.com/ThreeDotsLabs/watermill/message"
+)
+
+type MessageHandler struct {
+	mu         sync.Mutex
+	config     *config.Config
+	hasuraRepo *repository.HasuraRepository
+}
+
+func New(config *config.Config) *MessageHandler {
+	return &MessageHandler{
+		config:     config,
+		hasuraRepo: repository.New(config.Hasura.Endpoint, config.Hasura.Secret),
+	}
+}
+
+func (handler *MessageHandler) HandleMessage(msg *message.Message) error {
+	handler.mu.Lock()
+	defer handler.mu.Unlock()
+	log := utils.GetSugaredLogger()
+	if msg.Payload == nil {
+		log.Error("empty message")
+		return fmt.Errorf("empty message")
+	}
+	payload := string(msg.Payload)
+	var parsed *domain.ParsedMessage
+	if parsed = parsers.Parse(payload); !parsed.Parsed {
+		log.Infof("not parsed: [%s] : {%s} \n", msg.UUID, msg.Payload)
+	} else {
+		log.Infof("parsed [%s]: %v\n", msg.UUID, parsed.ToString())
+	}
+	handler.SaveMessage(parsed, msg.UUID)
+	handler.Publish(parsed)
+	return nil
+}
+
+func (n *MessageHandler) SaveMessage(parsed *domain.ParsedMessage, uuid string) {
+	logger := watermill.NewStdLogger(false, false)
+	if parsed != nil {
+		parsed.Uuid = uuid
+		if err := n.hasuraRepo.CreateNew(parsed); err != nil {
+			logger.Error("error inserting message", err, map[string]interface{}{"message": parsed})
+		}
+	}
+}
+
+func (n *MessageHandler) Publish(parsed *domain.ParsedMessage) {
+	if err := Publish(n.config, parsed); err != nil {
+		utils.GetSugaredLogger().Error("error publishing message", err, map[string]interface{}{"message": parsed})
+	}
+}

internal/nats/pub.go

@@ -0,0 +1,48 @@
+package nats
+
+import (
+	"caatsm/internal/config"
+	"encoding/json"
+
+	"github.com/ThreeDotsLabs/watermill"
+	"github.com/ThreeDotsLabs/watermill-nats/v2/pkg/nats"
+	"github.com/ThreeDotsLabs/watermill/message"
+	nc "github.com/nats-io/nats.go"
+)
+
+func Publish(config *config.Config, parsedMessage interface{}) error {
+	logger := watermill.NewStdLogger(false, false)
+	options := []nc.Option{
+		nc.RetryOnFailedConnect(true),
+		nc.Timeout(config.Timeouts.Server),
+		nc.ReconnectWait(config.Timeouts.ReconnectWait),
+	}
+	jsConfig := nats.JetStreamConfig{Disabled: true}
+
+	publisher, err := nats.NewPublisher(
+		nats.PublisherConfig{
+			URL:         config.Nats.URL,
+			NatsOptions: options,
+			JetStream:   jsConfig,
+		},
+		logger,
+	)
+	if err != nil {
+		panic(err)
+	}
+
+	logger.Info("NATS server connected", map[string]interface{}{"url": config.Nats.URL})
+	logger.Info("Publishing message to NATS topic", map[string]interface{}{"topic": config.Publisher.Topic})
+
+	messageText, err := json.Marshal(parsedMessage)
+	if err != nil {
+		logger.Error("Failed to marshal message", err, map[string]interface{}{"message": parsedMessage})
+	}
+	msg := message.NewMessage(watermill.NewUUID(), []byte(messageText))
+	err = publisher.Publish(config.Publisher.Topic, msg)
+	if err != nil {
+		logger.Error("Failed to publish message to NATS topic", err, map[string]interface{}{"topic": config.Publisher.Topic})
+		return err
+	}
+	return nil
+}

internal/nats/sub.go

@@ -2,15 +2,16 @@ package nats
 
 import (
 	"caatsm/internal/config"
-	"caatsm/internal/handlers"
 	"context"
+	"errors"
 
 	"github.com/ThreeDotsLabs/watermill"
 	"github.com/ThreeDotsLabs/watermill-nats/v2/pkg/nats"
+	"github.com/ThreeDotsLabs/watermill/message"
 	nc "github.com/nats-io/nats.go"
 )
 
-func Subscribe(config *config.Config, marshaler *handlers.PlainTextMarshaler, handler *handlers.MessageHandler) {
+func Subscribe(config *config.Config, marshaler *PlainTextMarshaler) {
 	logger := watermill.NewStdLogger(false, false)
 	options := []nc.Option{
 		nc.RetryOnFailedConnect(true),
@@ -44,8 +45,9 @@ func Subscribe(config *config.Config, marshaler *handlers.PlainTextMarshaler, ha
 		return
 	}
 
+	handlers := New(config)
 	for msg := range messages {
-		if err := handler.HandleMessage(msg); err == nil {
+		if err := handlers.HandleMessage(msg); err == nil {
 			msg.Ack()
 		} else {
 			logger.Error("Failed to handle message", err, map[string]interface{}{"message": msg})
@@ -53,3 +55,17 @@ func Subscribe(config *config.Config, marshaler *handlers.PlainTextMarshaler, ha
 		}
 	}
 }
+
+type PlainTextMarshaler struct{}
+
+func (m *PlainTextMarshaler) Marshal(topic string, msg nc.Msg) ([]byte, error) {
+	return msg.Data, nil
+}
+
+func (m *PlainTextMarshaler) Unmarshal(newMsg *nc.Msg) (*message.Message, error) {
+	if newMsg == nil {
+		return nil, errors.New("empty message")
+	}
+	msg := message.NewMessage(watermill.NewUUID(), newMsg.Data)
+	return msg, nil
+}