✨ Update README with configuration details, add default test configuration, and implement TelegramMapper tests. Enhance message processing to set timestamps and improve error handling in the processor. Refactor NATS consumer configuration and ensure proper handling of message attributes.

internal/infra/config/config.go

@@ -174,12 +174,11 @@ func LoadConfig() (*Config, error) {
 	if cfg.NATS.ConsumerRules.MaxDeliver == 0 {
 		cfg.NATS.ConsumerRules.MaxDeliver = 5
 	}
+	if cfg.Timeouts.AckWait == 0 {
+		cfg.Timeouts.AckWait = 30 * time.Second
+	}
 	if cfg.NATS.ConsumerRules.AckWait == 0 {
-		if cfg.Timeouts.AckWait != 0 {
-			cfg.NATS.ConsumerRules.AckWait = cfg.Timeouts.AckWait
-		} else {
-			cfg.NATS.ConsumerRules.AckWait = 30 * time.Second
-		}
+		cfg.NATS.ConsumerRules.AckWait = cfg.Timeouts.AckWait
 	}
 	if cfg.NATS.ConsumerRules.MaxAckPending == 0 {
 		cfg.NATS.ConsumerRules.MaxAckPending = 1024
@@ -198,8 +197,8 @@ func (c *Config) Validate() error {
 	if c.NATS.URL == "" {
 		return fmt.Errorf("nats.url is required")
 	}
-	if c.Subscription.Topic == "" && c.NATS.Stream == "" {
-		return fmt.Errorf("subscription.topic or nats.stream is required")
+	if c.NATS.Stream == "" {
+		return fmt.Errorf("nats.stream is required")
 	}
 	if c.Publisher.Topic == "" {
 		return fmt.Errorf("publisher.topic is required")

internal/infra/config/config_test.go

@@ -0,0 +1,37 @@
+package config
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+	"time"
+)
+
+func TestLoadConfig_DefaultAckWait(t *testing.T) {
+	t.Setenv("GO_ENV", "testdefaults")
+
+	wd, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("failed to get working dir: %v", err)
+	}
+	repoRoot := filepath.Clean(filepath.Join(wd, "..", "..", ".."))
+	if err := os.Chdir(repoRoot); err != nil {
+		t.Fatalf("failed to chdir to repo root: %v", err)
+	}
+	t.Cleanup(func() {
+		_ = os.Chdir(wd)
+	})
+
+	cfg, err := LoadConfig()
+	if err != nil {
+		t.Fatalf("failed to load config: %v", err)
+	}
+
+	want := 30 * time.Second
+	if cfg.Timeouts.AckWait != want {
+		t.Fatalf("expected timeouts.ack_wait to default to %v, got %v", want, cfg.Timeouts.AckWait)
+	}
+	if cfg.NATS.ConsumerRules.AckWait != want {
+		t.Fatalf("expected consumer ack_wait to default to %v, got %v", want, cfg.NATS.ConsumerRules.AckWait)
+	}
+}

internal/infra/nats/consumer.go

@@ -6,9 +6,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"time"
+
 	"github.com/nats-io/nats.go"
 	"go.uber.org/zap"
-	"time"
 )
 
 // Consumer handles NATS JetStream message consumption
@@ -69,6 +70,7 @@ func (c *Consumer) ensureConsumer() error {
 	if ackWait == 0 {
 		ackWait = 30 * time.Second
 	}
+	c.cfg.NATS.ConsumerRules.AckWait = ackWait
 
 	consumerConfig := &nats.ConsumerConfig{
 		Durable:       c.consumerName,
@@ -90,6 +92,7 @@ func (c *Consumer) ensureConsumer() error {
 			zap.String("consumer", c.consumerName),
 			zap.String("stream", streamName),
 			zap.String("subject", c.subject),
+			zap.Duration("ack_wait", ackWait),
 		)
 	}
 
@@ -157,6 +160,7 @@ func (c *Consumer) Start(ctx context.Context) error {
 		}
 
 		// Process each message
+		// TODO: consider buffering messages to take advantage of Repository.InsertBatch for higher throughput.
 		for _, msg := range msgs {
 			if err := c.processMessage(ctx, msg); err != nil {
 				isPermanent := app.IsPermanent(err)