Merged in feature/shorttestsanddirtidy (pull request #26)

Add short tests and Tidy internal directories

* complete the tasks

internal/query/result/parse.go

@@ -0,0 +1,14 @@
+package result
+
+import (
+	"queryorchestration/internal/database"
+	"queryorchestration/internal/database/repository"
+)
+
+func Parse(dbQuery *repository.ListResultsByDocumentIDRow) *Result {
+	return &Result{
+		ID:           database.MustToUUID(dbQuery.ID),
+		QueryID:      database.MustToUUID(dbQuery.Queryid),
+		QueryVersion: dbQuery.Queryversion,
+	}
+}

internal/query/result/parse_test.go

@@ -0,0 +1,24 @@
+package result_test
+
+import (
+	"queryorchestration/internal/database/repository"
+	"queryorchestration/internal/query/result"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestParseResultValue(t *testing.T) {
+	dbResult := repository.ListResultsByDocumentIDRow{
+		ID:           pgtype.UUID{},
+		Queryid:      pgtype.UUID{},
+		Queryversion: int32(1),
+	}
+
+	value := result.Parse(&dbResult)
+	assert.Equal(t, dbResult.Queryversion, value.QueryVersion)
+	assert.Equal(t, uuid.Nil, value.ID)
+	assert.Equal(t, uuid.Nil, value.QueryID)
+}

internal/query/result/service.go

@@ -0,0 +1,46 @@
+package result
+
+import (
+	"context"
+	"queryorchestration/internal/database"
+	"queryorchestration/internal/database/repository"
+
+	"github.com/google/uuid"
+)
+
+type Result struct {
+	ID           uuid.UUID
+	QueryID      uuid.UUID
+	QueryVersion int32
+}
+
+type Value interface {
+	GetValue(ctx context.Context) (string, error)
+}
+
+type ResultStore struct {
+	QueryID      uuid.UUID
+	DocumentID   uuid.UUID
+	Value        string
+	CleanVersion int32
+	TextVersion  int32
+	QueryVersion int32
+}
+
+func Store(ctx context.Context, dbQueries *repository.Queries, res *ResultStore) (uuid.UUID, error) {
+	dbId, err := dbQueries.SetResult(ctx, &repository.SetResultParams{
+		Queryid:      database.MustToDBUUID(res.QueryID),
+		Documentid:   database.MustToDBUUID(res.DocumentID),
+		Value:        res.Value,
+		Cleanversion: res.CleanVersion,
+		Textversion:  res.TextVersion,
+		Queryversion: res.QueryVersion,
+	})
+	if err != nil {
+		return uuid.Nil, err
+	}
+
+	id := database.MustToUUID(dbId)
+
+	return id, nil
+}

internal/query/result/store_test.go

@@ -0,0 +1,50 @@
+package result_test
+
+import (
+	"context"
+	"errors"
+	"queryorchestration/internal/database"
+	"queryorchestration/internal/database/repository"
+	"queryorchestration/internal/query/result"
+	"testing"
+
+	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
+	"github.com/pashagolub/pgxmock/v3"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestStore(t *testing.T) {
+	ctx := context.Background()
+	pool, err := pgxmock.NewPool()
+	if err != nil {
+		t.Fatalf("failed to open pgxmock database: %v", err)
+	}
+	queries := repository.New(pool)
+
+	resultStore := result.ResultStore{
+		QueryID:      uuid.New(),
+		DocumentID:   uuid.New(),
+		Value:        "val",
+		CleanVersion: int32(1),
+		TextVersion:  int32(1),
+		QueryVersion: int32(1),
+	}
+
+	pool.ExpectQuery("name: SetResult :one").WithArgs(database.MustToDBUUID(resultStore.QueryID), database.MustToDBUUID(resultStore.DocumentID), resultStore.Value, resultStore.CleanVersion, resultStore.TextVersion, resultStore.QueryVersion).
+		WillReturnRows(
+			pgxmock.NewRows([]string{"id"}).AddRow(pgtype.UUID{}),
+		)
+
+	id, err := result.Store(ctx, queries, &resultStore)
+	assert.Nil(t, err)
+	assert.NotNil(t, id)
+
+	dbErr := "database failing"
+	pool.ExpectQuery("name: SetResult :one").WithArgs(database.MustToDBUUID(resultStore.QueryID), database.MustToDBUUID(resultStore.DocumentID), resultStore.Value, resultStore.CleanVersion, resultStore.TextVersion, resultStore.QueryVersion).
+		WillReturnError(errors.New(dbErr))
+
+	id, err = result.Store(ctx, queries, &resultStore)
+	assert.EqualError(t, err, dbErr)
+	assert.Equal(t, uuid.Nil, id)
+}