Merged in feature/testquery (pull request #39)

Test Query

* depstextandclean

* startedcleaningresult

* resulttidyup

* roundone

* cleaning

* unsyncedquery

* startedtestsandsimplification

* api

* querytests

* resultprocessortests

* unittests

* cleanup

cmd/queryRunner/main.go

@@ -3,9 +3,11 @@ package main
 import (
 	"context"
 	controllers "queryorchestration/api/queryRunner"
-	documentsync "queryorchestration/internal/document/sync"
+	documentclean "queryorchestration/internal/document/clean"
+	documenttext "queryorchestration/internal/document/text"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/query"
+	"queryorchestration/internal/query/result"
 	"queryorchestration/internal/server"
 	"queryorchestration/internal/server/queue"
 
@@ -16,16 +18,22 @@ func main() {
 	ctx := context.Background()
 
 	queryrunner := func(cfg *server.Config) queue.Controller {
-		que := query.New(cfg.Database)
+		extract := documenttext.New()
+		text := documenttext.New()
+		clean := documentclean.New()
 		coll := collector.New(cfg.Database, &collector.Services{
-			Query: que,
+			Text:  text,
+			Clean: clean,
 		})
-		svc := documentsync.New(cfg.Database, &documentsync.Services{
+		res := result.New(cfg.Database)
+		svc := query.New(cfg.Database, &query.Services{
+			Result:    res,
+			Text:      extract,
 			Collector: coll,
 		})
 
 		return controllers.NewQueryRunner(cfg.Validator, &controllers.Services{
-			DocumentSync: svc,
+			Query: svc,
 		})
 	}
 

cmd/queryService/main.go

@@ -6,13 +6,14 @@ import (
 	queryservice "queryorchestration/api/queryService"
 	"queryorchestration/internal/client"
 	documentclean "queryorchestration/internal/document/clean"
+	documenttext "queryorchestration/internal/document/text"
 	"queryorchestration/internal/export"
 	"queryorchestration/internal/job"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/query"
+	"queryorchestration/internal/query/result"
 	"queryorchestration/internal/server"
 	"queryorchestration/internal/server/api"
-	textextraction "queryorchestration/internal/text_extraction"
 
 	"github.com/labstack/echo/v4"
 	_ "github.com/lib/pq"
@@ -23,13 +24,17 @@ func main() {
 
 	registerHandlers := func(cfg *server.Config, e *echo.Echo) *api.APIConfig {
 		exp := export.New(cfg.Database)
-		que := query.New(cfg.Database)
-		extract := textextraction.New()
+		extract := documenttext.New()
 		clean := documentclean.New()
 		col := collector.New(cfg.Database, &collector.Services{
-			Query:          que,
-			TextExtraction: extract,
-			DocumentClean:  clean,
+			Text:  extract,
+			Clean: clean,
+		})
+		res := result.New(cfg.Database)
+		que := query.New(cfg.Database, &query.Services{
+			Text:      extract,
+			Result:    res,
+			Collector: col,
 		})
 		cli := client.New(cfg.Database)
 		jbb := job.New(cfg.Database, &job.Services{
@@ -38,11 +43,11 @@ func main() {
 		})
 
 		services := &queryservice.Services{
-			Export:       exp,
-			JobCollector: col,
-			Query:        que,
-			Client:       cli,
-			Job:          jbb,
+			Export:    exp,
+			Collector: col,
+			Query:     que,
+			Client:    cli,
+			Job:       jbb,
 		}
 
 		cons := queryservice.NewControllers(cfg.Validator, services)