Merged in bugfix/errhandling (pull request #89)

Error handling

* basic

api/queryVersionSyncRunner/runner.go

@@ -3,6 +3,7 @@ package queryversionsyncrunner
 import (
 	"context"
 	"encoding/json"
+	"log/slog"
 
 	queryversionsync "queryorchestration/internal/query/versionsync"
 
@@ -34,22 +35,25 @@ type Body struct {
 	ID uuid.UUID `json:"id" validate:"required,uuid"`
 }
 
-func (s *Runner) Process(ctx context.Context, req *types.Message) error {
+func (s *Runner) Process(ctx context.Context, req *types.Message) bool {
 	var body Body
 	err := json.Unmarshal([]byte(*req.Body), &body)
 	if err != nil {
-		return err
+		slog.Error("parsing body", "messageId", *req.MessageId, "body", *req.Body)
+		return true
 	}
 
 	err = s.validator.Struct(body)
 	if err != nil {
-		return err
+		slog.Error("invalid body", "messageId", *req.MessageId, "error", err)
+		return true
 	}
 
 	err = s.svc.Sync.Sync(ctx, body.ID)
 	if err != nil {
-		return err
+		slog.Error("unable to process", "error", err)
+		return false
 	}
 
-	return nil
+	return true
 }

api/queryVersionSyncRunner/runner_test.go

@@ -49,47 +49,58 @@ func TestQueryRunner(t *testing.T) {
 	})
 	assert.NotNil(t, runner)
 
-	doc := queryversionsyncrunner.Body{
-		ID: uuid.New(),
-	}
-	bodyBytes, err := json.Marshal(doc)
-	assert.NoError(t, err)
-	body := string(bodyBytes)
-	msg := &types.Message{
-		Body: &body,
-	}
+	t.Run("valid", func(t *testing.T) {
+		doc := queryversionsyncrunner.Body{
+			ID: uuid.New(),
+		}
+		bodyBytes, err := json.Marshal(doc)
+		assert.NoError(t, err)
+		body := string(bodyBytes)
+		msg := &types.Message{
+			Body: &body,
+		}
 
-	jobIds := []uuid.UUID{
-		uuid.New(),
-		uuid.New(),
-	}
+		jobIds := []uuid.UUID{
+			uuid.New(),
+			uuid.New(),
+		}
 
-	pool.ExpectQuery("name: ListQueryJobIDs :many").WithArgs(database.MustToDBUUID(doc.ID)).
-		WillReturnRows(
-			pgxmock.NewRows([]string{"jobId"}).
-				AddRow(database.MustToDBUUID(jobIds[0])).
-				AddRow(database.MustToDBUUID(jobIds[1])),
-		)
+		pool.ExpectQuery("name: ListQueryJobIDs :many").WithArgs(database.MustToDBUUID(doc.ID)).
+			WillReturnRows(
+				pgxmock.NewRows([]string{"jobId"}).
+					AddRow(database.MustToDBUUID(jobIds[0])).
+					AddRow(database.MustToDBUUID(jobIds[1])),
+			)
 
-	mockSQS.EXPECT().
-		SendMessage(
-			mock.Anything,
-			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-				return *in.QueueUrl == cfg.JobSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", jobIds[0].String())
-			}),
-			mock.Anything,
-		).
-		Return(&sqs.SendMessageOutput{}, nil)
-	mockSQS.EXPECT().
-		SendMessage(
-			mock.Anything,
-			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-				return *in.QueueUrl == cfg.JobSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", jobIds[1].String())
-			}),
-			mock.Anything,
-		).
-		Return(&sqs.SendMessageOutput{}, nil)
+		mockSQS.EXPECT().
+			SendMessage(
+				mock.Anything,
+				mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
+					return *in.QueueUrl == cfg.JobSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", jobIds[0].String())
+				}),
+				mock.Anything,
+			).
+			Return(&sqs.SendMessageOutput{}, nil)
+		mockSQS.EXPECT().
+			SendMessage(
+				mock.Anything,
+				mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
+					return *in.QueueUrl == cfg.JobSyncURL && *in.MessageBody == fmt.Sprintf("{\"id\":\"%s\"}", jobIds[1].String())
+				}),
+				mock.Anything,
+			).
+			Return(&sqs.SendMessageOutput{}, nil)
 
-	err = runner.Process(ctx, msg)
-	assert.NoError(t, err)
+		assert.True(t, runner.Process(ctx, msg))
+	})
+	t.Run("invalid body", func(t *testing.T) {
+		body := "definitely invalid"
+		msgId := "id"
+		msg := &types.Message{
+			Body:      &body,
+			MessageId: &msgId,
+		}
+
+		assert.True(t, runner.Process(ctx, msg))
+	})
 }