Merged in feature/testwithlogs (pull request #65)

Query Version Sync Runner

* testing

* queryversiosyncworking

* update

* tests

* fixtests

cmd/queryRunner/main.go

@@ -8,6 +8,7 @@ import (
 	"queryorchestration/internal/query"
 	"queryorchestration/internal/query/result"
 	resultset "queryorchestration/internal/query/result/set"
+	resultsync "queryorchestration/internal/query/result/sync"
 	"queryorchestration/internal/server/runner"
 	queryc "queryorchestration/internal/serviceconfig/queue/query"
 
@@ -29,9 +30,11 @@ func main() {
 		res := result.New(cfg, &result.Services{
 			Query: que,
 		})
+		sync := resultsync.New(cfg)
 		resset := resultset.New(cfg, &resultset.Services{
 			Result: res,
 			Query:  que,
+			Sync:   sync,
 		})
 
 		c := queryrunner.New(cfg.GetValidator(), &queryrunner.Services{

cmd/queryService/main.go

@@ -17,8 +17,10 @@ import (
 	"queryorchestration/internal/query"
 	"queryorchestration/internal/query/result"
 	querytest "queryorchestration/internal/query/test"
+	queryupdate "queryorchestration/internal/query/update"
 	service "queryorchestration/internal/server/service"
 	"queryorchestration/internal/serviceconfig/queue/jobsync"
+	"queryorchestration/internal/serviceconfig/queue/queryversionsync"
 
 	"github.com/getkin/kin-openapi/openapi3"
 	_ "github.com/lib/pq"
@@ -27,6 +29,7 @@ import (
 type QueryServiceConfig struct {
 	service.BaseConfig
 	jobsync.JobSyncConfig
+	queryversionsync.QueryVersionSyncConfig
 }
 
 func main() {
@@ -62,15 +65,19 @@ func main() {
 			Result:    res,
 			Document:  doc,
 		})
+		qupdate := queryupdate.New(cfg, &queryupdate.Services{
+			Query: que,
+		})
 
 		services := &queryservice.Services{
 			Export:          exp,
 			Collector:       col,
 			CollectorUpdate: colupdate,
 			Query:           que,
+			QueryUpdate:     qupdate,
+			QueryTest:       quetest,
 			Client:          cli,
 			Job:             jbb,
-			QueryTest:       quetest,
 		}
 
 		cons := queryservice.NewControllers(cfg.GetValidator(), services)

cmd/querySyncRunner/main.go

@@ -5,9 +5,7 @@ import (
 	"log/slog"
 	"os"
 	querysyncrunner "queryorchestration/api/querySyncRunner"
-	"queryorchestration/internal/query"
-	"queryorchestration/internal/query/result"
-	resultset "queryorchestration/internal/query/result/set"
+	resultsync "queryorchestration/internal/query/result/sync"
 	querysync "queryorchestration/internal/query/sync"
 	"queryorchestration/internal/server/runner"
 	queryc "queryorchestration/internal/serviceconfig/queue/query"
@@ -26,16 +24,9 @@ func main() {
 	cfg := &QuerySyncConfig{}
 
 	cfg.ControllerFunc = func() runner.Controller {
-		que := query.New(cfg)
-		res := result.New(cfg, &result.Services{
-			Query: que,
-		})
-		resset := resultset.New(cfg, &resultset.Services{
-			Query:  que,
-			Result: res,
-		})
+		sync := resultsync.New(cfg)
 		svc := querysync.New(cfg, &querysync.Services{
-			ResultSet: resset,
+			ResultSync: sync,
 		})
 
 		c := querysyncrunner.New(cfg.GetValidator(), &querysyncrunner.Services{

cmd/queryVersionSyncRunner/main.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	queryversionsyncrunner "queryorchestration/api/queryVersionSyncRunner"
+	queryversionsync "queryorchestration/internal/query/versionsync"
+	"queryorchestration/internal/server/runner"
+	"queryorchestration/internal/serviceconfig/queue/jobsync"
+
+	_ "github.com/lib/pq"
+)
+
+type QueryVersionSyncConfig struct {
+	runner.BaseConfig
+	jobsync.JobSyncConfig
+}
+
+func main() {
+	ctx := context.Background()
+
+	cfg := &QueryVersionSyncConfig{}
+
+	cfg.ControllerFunc = func() runner.Controller {
+		svc := queryversionsync.New(cfg)
+
+		c := queryversionsyncrunner.New(cfg.GetValidator(), &queryversionsyncrunner.Services{
+			Sync: svc,
+		})
+
+		return &c
+	}
+
+	server, err := runner.New(ctx, cfg)
+	if err != nil {
+		slog.Error(err.Error())
+		os.Exit(1)
+	}
+
+	server.Listen(ctx)
+}