Merged in feature/jobcollector (pull request #30)

Initial Job Collector (changes pending)

* movearroundtocleancollector

* internalgetfunctions

* completecollectorquery

* simplify

* fixtests

* addvendor

* noplaceholder

internal/query/document/service.go

@@ -19,28 +19,41 @@ type Document struct {
 	TextVersion  int32     `json:"textVersion" validate:"required,gt=0"`
 }
 
-type Service struct {
-	db *database.Connection
+type Services struct {
+	Collector *collector.Service
 }
 
-func New(db *database.Connection) *Service {
+type Service struct {
+	db  *database.Connection
+	svc *Services
+}
+
+func New(db *database.Connection, svc *Services) *Service {
 	return &Service{
 		db,
+		svc,
 	}
 }
 
 func (s *Service) Sync(ctx context.Context, doc *Document) error {
-	collector, err := collector.NewByJobId(ctx, s.db, doc.JobID)
+	coll, err := s.svc.Collector.GetByJobID(ctx, doc.JobID)
 	if err != nil {
 		return err
 	}
 
-	results, err := s.getResults(ctx, doc.ID, collector)
+	results, err := s.getResults(ctx, doc.ID, coll)
 	if err != nil {
 		return err
 	}
 
-	queue, err := queryqueue.New(ctx, s.db, collector, results, doc.ID, doc.CleanVersion, doc.TextVersion)
+	queue, err := queryqueue.New(ctx, &queryqueue.NewConfig{
+		DB:           s.db,
+		Collector:    coll,
+		Results:      results,
+		DocumentID:   doc.ID,
+		CleanVersion: doc.CleanVersion,
+		TextVersion:  doc.TextVersion,
+	})
 	if err != nil {
 		return err
 	}