Merged in feature/jobcollector (pull request #30)

Initial Job Collector (changes pending) * movearroundtocleancollector * internalgetfunctions * completecollectorquery * simplify * fixtests * addvendor * noplaceholder
2025-01-21 12:28:46 +00:00
parent b888e3450f
commit 4ccb980593
46 changed files with 951 additions and 655 deletions
@@ -2,6 +2,7 @@ package repository_test

 import (
 	"context"
+	"fmt"
 	"os"
 	"path"
 	"queryorchestration/internal/database"
@@ -10,6 +11,7 @@ import (
 	"testing"

 	"github.com/google/uuid"
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/stretchr/testify/assert"
 )

@@ -23,15 +25,87 @@ func TestCollector(t *testing.T) {

 	queries := repository.New(db.Pool)

-	collectorID := database.MustToDBUUID(uuid.New())
-
-	collectorQueries, err := queries.GetCollectorQueries(ctx, collectorID)
+	contextId, err := queries.CreateQuery(ctx, repository.QuerytypeContextFull)
+	assert.Nil(t, err)
+	jsonId, err := queries.CreateQuery(ctx, repository.QuerytypeJsonExtractor)
+	assert.Nil(t, err)
+	err = queries.AddRequiredQuery(ctx, &repository.AddRequiredQueryParams{
+		Queryid:         jsonId,
+		Requiredqueryid: contextId,
+		Addedversion:    1,
+	})
 	assert.Nil(t, err)
-	assert.Len(t, collectorQueries, 0)
-	assert.ElementsMatch(t, []repository.GetCollectorQueriesRow{}, collectorQueries)

-	jobID := database.MustToDBUUID(uuid.New())
+	jobId := database.MustToDBUUID(uuid.New())
+	minCleanVersion := int32(2)
+	minTextVersion := int32(4)

-	_, err = queries.GetCollectorFromJobID(ctx, jobID)
-	assert.NotNil(t, err)
+	collId, err := queries.CreateCollector(ctx, &repository.CreateCollectorParams{
+		Jobid:           jobId,
+		Mincleanversion: minCleanVersion,
+		Mintextversion:  minTextVersion,
+	})
+	assert.Nil(t, err)
+
+	coll, err := queries.GetCollector(ctx, collId)
+	assert.Nil(t, err)
+	assert.EqualExportedValues(t, repository.Fullactivecollector{
+		ID:              collId,
+		Jobid:           jobId,
+		Mincleanversion: minCleanVersion,
+		Mintextversion:  minTextVersion,
+		Activeversion:   1,
+		Latestversion:   1,
+	}, *coll)
+
+	coll, err = queries.GetCollectorByJobID(ctx, jobId)
+	assert.Nil(t, err)
+	assert.EqualExportedValues(t, repository.Fullactivecollector{
+		ID:              collId,
+		Jobid:           jobId,
+		Mincleanversion: minCleanVersion,
+		Mintextversion:  minTextVersion,
+		Activeversion:   1,
+		Latestversion:   1,
+	}, *coll)
+
+	err = queries.AddCollectorQuery(ctx, &repository.AddCollectorQueryParams{
+		Collectorid:  collId,
+		Queryid:      jsonId,
+		Addedversion: 1,
+		Name:         "example_key",
+	})
+	assert.Nil(t, err)
+
+	coll, err = queries.GetCollector(ctx, collId)
+	assert.Nil(t, err)
+	assert.EqualExportedValues(t, repository.Fullactivecollector{
+		ID:              collId,
+		Jobid:           jobId,
+		Mincleanversion: minCleanVersion,
+		Mintextversion:  minTextVersion,
+		Activeversion:   1,
+		Latestversion:   1,
+		Fields:          []byte(fmt.Sprintf("{\"example_key\": \"%s\"}", database.MustToUUID(jsonId).String())),
+	}, *coll)
+
+	qs, err := queries.ListCollectorQueries(ctx, collId)
+	assert.Nil(t, err)
+	assert.Len(t, qs, 2)
+	assert.ElementsMatch(t, []*repository.Collectorquerydependencytree{
+		{
+			Collectorid:  collId,
+			Queryid:      jsonId,
+			Queryversion: 1,
+			Type:         repository.QuerytypeJsonExtractor,
+			Requiredids:  []pgtype.UUID{contextId},
+		},
+		{
+			Collectorid:  collId,
+			Queryid:      contextId,
+			Queryversion: 1,
+			Type:         repository.QuerytypeContextFull,
+			Requiredids:  []pgtype.UUID{database.MustToDBUUID(uuid.Nil)},
+		},
+	}, qs)
 }