Merged in bugfix/cleanup (pull request #10)

Clean Up Testing and Linting

* somescriptcleanup

* mostgolangci

* deplatest

* imageversions

* usingscratch

* movedqueuefrtesting

* finishedunittesting

* linting

* taskfilecontext

cmd/queryRunner/main.go

@@ -2,56 +2,24 @@ package main
 
 import (
 	"context"
-	"log"
-	"queryorchestration/api/queue"
-	"queryorchestration/internal/database"
-	"queryorchestration/internal/database/repository"
+	controllers "queryorchestration/api/queue"
 	"queryorchestration/internal/document"
-	"queryorchestration/internal/env"
-	"queryorchestration/internal/otel"
-	queueSVC "queryorchestration/internal/queue"
-
-	"github.com/aws/aws-sdk-go-v2/config"
-	"github.com/aws/aws-sdk-go-v2/service/sqs"
-	"github.com/go-playground/validator/v10"
+	"queryorchestration/internal/queue"
+	"queryorchestration/internal/server"
 )
 
 func main() {
 	ctx := context.Background()
 
-	closeTracer := otel.New(ctx)
-	defer closeTracer()
+	queryrunner := func(cfg *server.Config) queue.Controller {
+		svc := document.New(cfg.Database)
 
-	database.RunMigrations(&database.MigrationConfig{})
-
-	cfg, err := config.LoadDefaultConfig(ctx)
-	if err != nil {
-		log.Panicf("Unable to load SDK config: %v", err)
+		return controllers.NewQueryRunner(svc, cfg.Validator)
 	}
 
-	queueURL := env.GetPanic("QUEUE_URL")
+	server := queue.NewServer(ctx, &queue.ListenerConfig{
+		Controller: queryrunner,
+	})
 
-	sqsClient := sqs.NewFromConfig(cfg)
-
-	dbPool := database.GetDBPool(ctx)
-	dbQueries := repository.New(dbPool)
-	db := &database.Connection{
-		Pool:    dbPool,
-		Queries: dbQueries,
-	}
-	valid := validator.New()
-
-	controllers := queue.Controllers{
-		Document: *queue.NewDocumentController(*document.New(db), valid),
-	}
-
-	config := queue.Queue{
-		Controllers: &controllers,
-		Config: &queueSVC.QueueConfig{
-			URL:    queueURL,
-			Client: sqsClient,
-		},
-	}
-
-	queue.PollMessages(ctx, &config)
+	server.Listen(ctx)
 }

cmd/queryService/main.go

@@ -2,19 +2,14 @@ package main
 
 import (
 	"context"
-	"log"
-	"net"
-	"queryorchestration/api/controllers"
+	controllers "queryorchestration/api/api"
 	serviceinterfaces "queryorchestration/api/serviceInterfaces"
+	"queryorchestration/internal/api"
 	"queryorchestration/internal/collector"
-	"queryorchestration/internal/database"
-	"queryorchestration/internal/database/repository"
 	"queryorchestration/internal/export"
-	"queryorchestration/internal/otel"
 	"queryorchestration/internal/query"
-	"strconv"
+	"queryorchestration/internal/server"
 
-	"github.com/go-playground/validator/v10"
 	_ "github.com/lib/pq"
 	"google.golang.org/grpc"
 )
@@ -22,35 +17,18 @@ import (
 func main() {
 	ctx := context.Background()
 
-	closeTracer := otel.New(ctx)
-	defer closeTracer()
+	controllers := func(cfg *server.Config) *grpc.Server {
+		grpcServer := grpc.NewServer()
+		serviceinterfaces.RegisterQueryServiceServer(grpcServer, controllers.NewQueryController(*query.New(cfg.Database), cfg.Validator))
+		serviceinterfaces.RegisterExportServiceServer(grpcServer, controllers.NewExportController(*export.New(cfg.Database), cfg.Validator))
+		serviceinterfaces.RegisterJobCollectorServiceServer(grpcServer, controllers.NewJobCollectorController(*collector.New(cfg.Database), cfg.Validator))
 
-	database.RunMigrations(&database.MigrationConfig{})
-
-	host := "0.0.0.0"
-	port := 8080
-	address := net.JoinHostPort(host, strconv.Itoa(port))
-
-	lis, err := net.Listen("tcp", address)
-	if err != nil {
-		log.Panicf("failed to listen: %v", err)
+		return grpcServer
 	}
 
-	dbPool := database.GetDBPool(ctx)
-	dbQueries := repository.New(dbPool)
-	db := &database.Connection{
-		Pool:    dbPool,
-		Queries: dbQueries,
-	}
-	valid := validator.New()
+	server := api.New(ctx, &api.Config{
+		GetControllers: controllers,
+	})
 
-	grpcServer := grpc.NewServer()
-	serviceinterfaces.RegisterQueryServiceServer(grpcServer, controllers.NewQueryController(*query.New(db), valid))
-	serviceinterfaces.RegisterExportServiceServer(grpcServer, controllers.NewExportController(*export.New(db), valid))
-	serviceinterfaces.RegisterJobCollectorServiceServer(grpcServer, controllers.NewJobCollectorController(*collector.New(db), valid))
-
-	log.Printf("Listening on port %d", port)
-	if err := grpcServer.Serve(lis); err != nil {
-		log.Panicf("Failed to serve: %v", err)
-	}
+	server.Listen()
 }