Merged in feature/testwithlogs (pull request #65)

Query Version Sync Runner

* testing

* queryversiosyncworking

* update

* tests

* fixtests

api/queryVersionSyncRunner/runner.go

@@ -0,0 +1,54 @@
+package queryversionsyncrunner
+
+import (
+	"context"
+	"encoding/json"
+	queryversionsync "queryorchestration/internal/query/versionsync"
+
+	"github.com/go-playground/validator/v10"
+	"github.com/google/uuid"
+
+	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
+)
+
+const Name = "queryVersionSyncRunner"
+
+type Services struct {
+	Sync *queryversionsync.Service
+}
+
+type Runner struct {
+	validator *validator.Validate
+	svc       *Services
+}
+
+func New(validator *validator.Validate, svc *Services) Runner {
+	return Runner{
+		validator: validator,
+		svc:       svc,
+	}
+}
+
+type Body struct {
+	ID uuid.UUID `json:"id" validate:"required,uuid"`
+}
+
+func (s *Runner) Process(ctx context.Context, req *types.Message) error {
+	var body Body
+	err := json.Unmarshal([]byte(*req.Body), &body)
+	if err != nil {
+		return err
+	}
+
+	err = s.validator.Struct(body)
+	if err != nil {
+		return err
+	}
+
+	err = s.svc.Sync.Sync(ctx, body.ID)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

api/queryVersionSyncRunner/runner_test.go

@@ -0,0 +1,95 @@
+package queryversionsyncrunner_test
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	queryversionsyncrunner "queryorchestration/api/queryVersionSyncRunner"
+	"queryorchestration/internal/database"
+	"queryorchestration/internal/database/repository"
+	queryversionsync "queryorchestration/internal/query/versionsync"
+	"queryorchestration/internal/server/runner"
+	"queryorchestration/internal/serviceconfig/queue/jobsync"
+	queuemock "queryorchestration/mocks/queue"
+	"testing"
+
+	"github.com/aws/aws-sdk-go-v2/service/sqs"
+	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
+	"github.com/go-playground/validator/v10"
+	"github.com/google/uuid"
+	"github.com/pashagolub/pgxmock/v3"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+)
+
+type QuerySyncConfig struct {
+	runner.BaseConfig
+	jobsync.JobSyncConfig
+}
+
+func TestQueryRunner(t *testing.T) {
+	ctx := context.Background()
+
+	pool, err := pgxmock.NewPool()
+	if err != nil {
+		t.Fatalf("failed to open pgxmock database: %v", err)
+	}
+
+	cfg := &QuerySyncConfig{}
+	cfg.DBPool = pool
+	cfg.DBQueries = repository.New(pool)
+	mockSQS := queuemock.NewMockSQSClient(t)
+	cfg.QueueClient = mockSQS
+	cfg.JobSyncURL = "/i/am/here"
+
+	svc := queryversionsync.New(cfg)
+
+	runner := queryversionsyncrunner.New(validator.New(), &queryversionsyncrunner.Services{
+		Sync: svc,
+	})
+	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,
+	}
+
+	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])),
+		)
+
+	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)
+}