Merged in feature/shorttestsanddirtidy (pull request #26)

Add short tests and Tidy internal directories

* complete the tasks

api/queryRunner/queryrunner.go

@@ -3,8 +3,8 @@ package controllers
 import (
 	"context"
 	"encoding/json"
-	"queryorchestration/internal/document"
-	"queryorchestration/internal/queue"
+	"queryorchestration/internal/query/document"
+	"queryorchestration/internal/server/queue"
 
 	"github.com/go-playground/validator/v10"
 

api/queryRunner/queryrunner_test.go

@@ -6,8 +6,8 @@ import (
 	controllers "queryorchestration/api/queryRunner"
 	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
-	"queryorchestration/internal/document"
-	"queryorchestration/internal/queue"
+	"queryorchestration/internal/query/document"
+	"queryorchestration/internal/server/queue"
 	"queryorchestration/internal/test"
 	"testing"
 
@@ -20,6 +20,9 @@ import (
 )
 
 func TestQueryRunner(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping long test in short mode")
+	}
 	ctx := context.Background()
 
 	qCfg, cleanup := test.CreateQueue(t, ctx, &test.CreateQueueConfig{})

api/queryService/controllers.go

@@ -1,8 +1,8 @@
 package queryservice
 
 import (
-	"queryorchestration/internal/collector"
 	"queryorchestration/internal/export"
+	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/query"
 
 	"github.com/go-playground/validator/v10"

api/queryService/parse.go

@@ -3,7 +3,7 @@ package queryservice
 import (
 	"errors"
 	"queryorchestration/internal/query"
-	queryprocessor "queryorchestration/internal/queryProcessor"
+	queryprocessor "queryorchestration/internal/query/processor"
 )
 
 func parseQueries(queries []*query.Query) ([]Query, error) {

api/queryService/parse_test.go

@@ -2,7 +2,7 @@ package queryservice
 
 import (
 	"queryorchestration/internal/query"
-	queryprocessor "queryorchestration/internal/queryProcessor"
+	queryprocessor "queryorchestration/internal/query/processor"
 	"testing"
 
 	"github.com/google/uuid"

api/queryService/query.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"queryorchestration/internal/query"
-	queryprocessor "queryorchestration/internal/queryProcessor"
+	queryprocessor "queryorchestration/internal/query/processor"
 
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"