Merged in feature/jobsynced (pull request #72)

Job Status Get and DB tidy up

* initalquery

* tests

* shorttests

* testing queries

* job

* solvedthequery

* updatingdb

* fixingtests

* repotests

* shorttests

* docker

* testspassed

internal/database/repository/text_test.go

@@ -9,6 +9,7 @@ import (
 	"queryorchestration/internal/test"
 	"testing"
 
+	"github.com/jackc/pgx/v5/pgtype"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -21,11 +22,11 @@ func TestTextExtraction(t *testing.T) {
 	cfg := &serviceconfig.BaseConfig{}
 	test.SetCfgProvider(t, cfg)
 	cfg.SetBasePath(path.Join(os.Getenv("PWD"), "../../.."))
-	_, cleanup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
+	_, textup := test.CreateDB(t, ctx, &test.CreateDatabaseConfig{
 		Cfg:           cfg,
 		RunMigrations: true,
 	})
-	defer cleanup()
+	defer textup()
 
 	queries := cfg.GetDBQueries()
 
@@ -42,16 +43,9 @@ func TestTextExtraction(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotEmpty(t, id)
 
-	isextract, err := queries.IsDocumentTextExtracted(ctx, id)
-	assert.NoError(t, err)
-	assert.False(t, isextract)
-
-	_, err = queries.GetDocumentTextEntry(ctx, id)
-	assert.Error(t, err)
-
 	bucket := "example_bucket"
 	key := "example_key"
-	err = queries.AddDocumentTextEntry(ctx, &repository.AddDocumentTextEntryParams{
+	err = queries.AddDocumentCleanEntry(ctx, &repository.AddDocumentCleanEntryParams{
 		Documentid: id,
 		Version:    1,
 		Bucket:     bucket,
@@ -59,16 +53,31 @@ func TestTextExtraction(t *testing.T) {
 	})
 	assert.NoError(t, err)
 
+	cleanentry, err := queries.GetDocumentCleanEntry(ctx, id)
+	assert.NoError(t, err)
+
+	isextract, err := queries.IsDocumentTextExtracted(ctx, id)
+	assert.NoError(t, err)
+	assert.False(t, isextract)
+
+	err = queries.AddDocumentTextEntry(ctx, &repository.AddDocumentTextEntryParams{
+		Version:      1,
+		Bucket:       bucket,
+		Key:          key,
+		Cleanentryid: cleanentry.ID,
+	})
+	assert.NoError(t, err)
+
 	isextract, err = queries.IsDocumentTextExtracted(ctx, id)
 	assert.NoError(t, err)
 	assert.True(t, isextract)
 
-	clean, err := queries.GetDocumentTextEntry(ctx, id)
+	text, err := queries.GetDocumentTextEntry(ctx, id)
 	assert.NoError(t, err)
-	assert.EqualExportedValues(t, &repository.GetDocumentTextEntryRow{
-		Documentid: id,
-		Bucket:     bucket,
-		Key:        key,
-		Version:    1,
-	}, clean)
+	assert.Equal(t, id, text.Documentid)
+	assert.Equal(t, bucket, text.Bucket)
+	assert.Equal(t, key, text.Key)
+	assert.Equal(t, int32(1), text.Version)
+	assert.NotEqual(t, pgtype.UUID{}, text.ID)
+	assert.True(t, text.ID.Valid)
 }