Merged in bugfix/cleanup (pull request #10)

Clean Up Testing and Linting

* somescriptcleanup

* mostgolangci

* deplatest

* imageversions

* usingscratch

* movedqueuefrtesting

* finishedunittesting

* linting

* taskfilecontext

api/queue/poll.go

@@ -1,48 +0,0 @@
-package queue
-
-import (
-	"context"
-	"log"
-	"queryorchestration/internal/queue"
-
-	"github.com/aws/aws-sdk-go-v2/service/sqs"
-)
-
-type Controllers struct {
-	Document DocumentController
-}
-
-type Queue struct {
-	Config      *queue.QueueConfig
-	Controllers *Controllers
-}
-
-func PollMessages(ctx context.Context, queue *Queue) {
-	for {
-		result, err := queue.Config.Client.ReceiveMessage(ctx, &sqs.ReceiveMessageInput{
-			QueueUrl:            &queue.Config.URL,
-			MaxNumberOfMessages: 1,
-			WaitTimeSeconds:     2,
-			VisibilityTimeout:   2,
-			MessageAttributeNames: []string{
-				"type",
-			},
-		})
-		if err != nil {
-			log.Printf("Message Fetch Fail: %v", err)
-			continue
-		}
-
-		for _, message := range result.Messages {
-			go func() {
-				toProcess, err := processMessage(ctx, queue, message)
-				if !toProcess {
-					return
-				}
-				if err != nil {
-					log.Printf("Message Process Fail: %v", err)
-				}
-			}()
-		}
-	}
-}

api/queue/process.go

@@ -1,18 +0,0 @@
-package queue
-
-import (
-	"context"
-
-	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
-)
-
-func processMessage(ctx context.Context, queue *Queue, message types.Message) (bool, error) {
-	// Process the message here and return false if not message to process
-	switch *message.MessageAttributes["type"].StringValue {
-	case "DOCTEXT":
-		err := queue.Controllers.Document.Sync(ctx, queue.Config, &message)
-		return true, err
-	}
-
-	return false, nil
-}

api/queue/queryrunner.go

@@ -1,4 +1,4 @@
-package queue
+package controllers
 
 import (
 	"context"
@@ -8,17 +8,18 @@ import (
 
 	"github.com/go-playground/validator/v10"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/sqs/types"
 	"github.com/google/uuid"
 )
 
-type DocumentController struct {
+type QueryRunner struct {
 	validator *validator.Validate
-	document  document.Service
+	document  *document.Service
 }
 
-func NewDocumentController(svc document.Service, validator *validator.Validate) *DocumentController {
-	return &DocumentController{
+func NewQueryRunner(svc *document.Service, validator *validator.Validate) QueryRunner {
+	return QueryRunner{
 		validator: validator,
 		document:  svc,
 	}
@@ -28,7 +29,7 @@ type DocumentQueryEvent struct {
 	ID uuid.UUID `json:"id"`
 }
 
-func (s *DocumentController) Sync(ctx context.Context, config *queue.QueueConfig, msg *types.Message) error {
+func (s QueryRunner) Process(ctx context.Context, config *queue.Config, msg *types.Message) error {
 	var body document.Document
 	err := json.Unmarshal([]byte(*msg.Body), &body)
 	if err != nil {
@@ -49,12 +50,12 @@ func (s *DocumentController) Sync(ctx context.Context, config *queue.QueueConfig
 		ID: body.ID,
 	}
 
-	err = queue.Send(ctx, config, "DOCQUERY", queryEvent)
-	if err != nil {
-		return err
-	}
-
-	err = queue.Delete(ctx, config, msg)
+	err = queue.Send(ctx, config, queryEvent, map[string]types.MessageAttributeValue{
+		"type": {
+			DataType:    aws.String("String"),
+			StringValue: aws.String("DOCQUERY"),
+		},
+	})
 	if err != nil {
 		return err
 	}