Merged in feature/document (pull request #36)

Document CRUD

* doccreate

* dochashlocandget

* depsandtodo

api/queryRunner/queryrunner.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"context"
 	"encoding/json"
-	"queryorchestration/internal/query/document"
+	documentsync "queryorchestration/internal/document/sync"
 
 	"github.com/go-playground/validator/v10"
 
@@ -11,15 +11,19 @@ import (
 	"github.com/google/uuid"
 )
 
-type QueryRunner struct {
-	validator *validator.Validate
-	document  *document.Service
+type Services struct {
+	DocumentSync *documentsync.Service
 }
 
-func NewQueryRunner(svc *document.Service, validator *validator.Validate) QueryRunner {
+type QueryRunner struct {
+	validator *validator.Validate
+	svc       *Services
+}
+
+func NewQueryRunner(validator *validator.Validate, svc *Services) QueryRunner {
 	return QueryRunner{
 		validator: validator,
-		document:  svc,
+		svc:       svc,
 	}
 }
 
@@ -28,7 +32,7 @@ type DocumentQueryEvent struct {
 }
 
 func (s QueryRunner) Process(ctx context.Context, req *types.Message) error {
-	var body document.Document
+	var body documentsync.Document
 	err := json.Unmarshal([]byte(*req.Body), &body)
 	if err != nil {
 		return err
@@ -39,7 +43,7 @@ func (s QueryRunner) Process(ctx context.Context, req *types.Message) error {
 		return err
 	}
 
-	err = s.document.Sync(ctx, &body)
+	err = s.svc.DocumentSync.Sync(ctx, &body)
 	if err != nil {
 		return err
 	}

api/queryRunner/queryrunner_test.go

@@ -6,9 +6,9 @@ import (
 	controllers "queryorchestration/api/queryRunner"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
+	documentsync "queryorchestration/internal/document/sync"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/query"
-	"queryorchestration/internal/query/document"
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
@@ -32,19 +32,20 @@ func TestQueryRunner(t *testing.T) {
 		Pool:    pool,
 	}
 
-	svc := document.New(db, &document.Services{
+	svc := documentsync.New(db, &documentsync.Services{
 		Collector: collector.New(db, &collector.Services{
 			Query: query.New(db),
 		}),
 	})
 
-	runner := controllers.NewQueryRunner(svc, validator.New())
+	runner := controllers.NewQueryRunner(validator.New(), &controllers.Services{
+		DocumentSync: svc,
+	})
 	assert.NotNil(t, runner)
 
-	doc := document.Document{
+	doc := documentsync.Document{
 		ID:           uuid.New(),
 		JobID:        uuid.New(),
-		Name:         "document_name",
 		CleanVersion: 1,
 		TextVersion:  1,
 	}

api/queryService/job_test.go

@@ -9,7 +9,7 @@ import (
 	"queryorchestration/internal/client"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
-	documentclean "queryorchestration/internal/document_clean"
+	documentclean "queryorchestration/internal/document/clean"
 	"queryorchestration/internal/job"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/query"

api/queryService/jobcollector_test.go

@@ -7,7 +7,7 @@ import (
 	queryservice "queryorchestration/api/queryService"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
-	documentclean "queryorchestration/internal/document_clean"
+	documentclean "queryorchestration/internal/document/clean"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/query"
 	textextraction "queryorchestration/internal/text_extraction"