Merged in feature/docclean (pull request #55)

Doc Clean Structure

* outline

* isdocclean

* placeholder for clean log

* versionplustesting

* versionplustesting

* testspassed

cmd/docCleanRunner/main.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"context"
+	"log/slog"
+	"os"
+	doccleanrunner "queryorchestration/api/docCleanRunner"
+	"queryorchestration/internal/document"
+	documentclean "queryorchestration/internal/document/clean"
+	"queryorchestration/internal/server/runner"
+	"queryorchestration/internal/serviceconfig/objectstore"
+	"queryorchestration/internal/serviceconfig/queue/documenttext"
+
+	_ "github.com/lib/pq"
+)
+
+type DocCleanConfig struct {
+	runner.BaseConfig
+	objectstore.ObjectStoreConfig
+	documenttext.DocTextConfig
+}
+
+func main() {
+	ctx := context.Background()
+
+	cfg := &DocCleanConfig{}
+
+	cfg.ControllerFunc = func() runner.Controller {
+		doc := document.New(cfg)
+		clean := documentclean.New(cfg, &documentclean.Services{
+			Document: doc,
+		})
+
+		return doccleanrunner.New(cfg.GetValidator(), &doccleanrunner.Services{
+			Clean: clean,
+		})
+	}
+
+	server, err := runner.New(ctx, cfg)
+	if err != nil {
+		slog.Error(err.Error())
+		os.Exit(1)
+	}
+
+	server.Listen(ctx)
+}

cmd/docInitRunner/main.go

@@ -6,13 +6,11 @@ import (
 	"os"
 	docinitrunner "queryorchestration/api/docInitRunner"
 	"queryorchestration/internal/client"
-	documentclean "queryorchestration/internal/document/clean"
+	"queryorchestration/internal/document"
 	documentinit "queryorchestration/internal/document/init"
-	documenttext "queryorchestration/internal/document/text"
 	"queryorchestration/internal/job"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/server/runner"
-	"queryorchestration/internal/serviceconfig"
 	documentcleanc "queryorchestration/internal/serviceconfig/queue/documentclean"
 
 	_ "github.com/lib/pq"
@@ -28,29 +26,22 @@ func main() {
 
 	cfg := &DocInitConfig{}
 
-	if err := serviceconfig.InitializeConfig(cfg); err != nil {
-		slog.Error("Error initializing config", "err", err)
-		os.Exit(1)
-	}
-
 	cfg.ControllerFunc = func() runner.Controller {
-		text := documenttext.New()
-		clean := documentclean.New()
 		cli := client.New(cfg)
+		doc := document.New(cfg)
 		col := collector.New(cfg, &collector.Services{
-			Clean: clean,
-			Text:  text,
+			Document: doc,
 		})
 		j := job.New(cfg, &job.Services{
 			Collector: col,
 			Client:    cli,
 		})
-		doc := documentinit.New(cfg, &documentinit.Services{
+		docinit := documentinit.New(cfg, &documentinit.Services{
 			Job: j,
 		})
 
 		return docinitrunner.New(cfg.GetValidator(), &docinitrunner.Services{
-			Document: doc,
+			Document: docinit,
 		})
 	}
 

cmd/queryRunner/main.go

@@ -6,13 +6,11 @@ import (
 	"os"
 	controllers "queryorchestration/api/queryRunner"
 	"queryorchestration/internal/document"
-	documentclean "queryorchestration/internal/document/clean"
 	documenttext "queryorchestration/internal/document/text"
 	"queryorchestration/internal/job/collector"
 	"queryorchestration/internal/query"
 	"queryorchestration/internal/query/result"
 	"queryorchestration/internal/server/runner"
-	"queryorchestration/internal/serviceconfig"
 
 	_ "github.com/lib/pq"
 )
@@ -22,24 +20,17 @@ func main() {
 
 	cfg := &runner.BaseConfig{}
 
-	if err := serviceconfig.InitializeConfig(cfg); err != nil {
-		slog.Error("Error initializing config", "err", err)
-		os.Exit(1)
-	}
-
 	cfg.ControllerFunc = func() runner.Controller {
 		text := documenttext.New()
-		clean := documentclean.New()
-		coll := collector.New(cfg, &collector.Services{
-			Text:  text,
-			Clean: clean,
+		doc := document.New(cfg)
+		col := collector.New(cfg, &collector.Services{
+			Document: doc,
 		})
 		res := result.New(cfg)
-		doc := document.New(cfg)
 		svc := query.New(cfg, &query.Services{
 			Result:    res,
 			Text:      text,
-			Collector: coll,
+			Collector: col,
 			Document:  doc,
 		})
 

cmd/queryService/main.go

@@ -8,7 +8,6 @@ import (
 	queryservice "queryorchestration/api/queryService"
 	"queryorchestration/internal/client"
 	"queryorchestration/internal/document"
-	documentclean "queryorchestration/internal/document/clean"
 	documenttext "queryorchestration/internal/document/text"
 	"queryorchestration/internal/export"
 	"queryorchestration/internal/job"
@@ -16,7 +15,6 @@ import (
 	"queryorchestration/internal/query"
 	"queryorchestration/internal/query/result"
 	service "queryorchestration/internal/server/service"
-	"queryorchestration/internal/serviceconfig"
 
 	"github.com/getkin/kin-openapi/openapi3"
 	_ "github.com/lib/pq"
@@ -27,21 +25,14 @@ func main() {
 
 	cfg := &service.BaseConfig{}
 
-	if err := serviceconfig.InitializeConfig(cfg); err != nil {
-		fmt.Printf("Error initializing config: %s", err)
-		os.Exit(1)
-	}
-
 	cfg.RegisterHandlersFunc = func() (*openapi3.T, error) {
 		exp := export.New()
 		extract := documenttext.New()
-		clean := documentclean.New()
 		res := result.New(cfg)
-		col := collector.New(cfg, &collector.Services{
-			Text:  extract,
-			Clean: clean,
-		})
 		doc := document.New(cfg)
+		col := collector.New(cfg, &collector.Services{
+			Document: doc,
+		})
 		que := query.New(cfg, &query.Services{
 			Text:      extract,
 			Result:    res,