a bit more testing

internal/document/service.go

@@ -5,7 +5,8 @@ import (
 	"gotemplate/internal/collector"
 	"gotemplate/internal/database"
 	"gotemplate/internal/database/repository"
-	"gotemplate/internal/query"
+	"gotemplate/internal/queryQueue"
+	"gotemplate/internal/result"
 
 	"github.com/google/uuid"
 )
@@ -39,7 +40,7 @@ func (s *Service) Sync(ctx context.Context, doc *Document) error {
 		return err
 	}
 
-	queue, err := query.NewQueue(ctx, s.db, collector, results, doc.ID, doc.CleanVersion, doc.TextVersion)
+	queue, err := queryQueue.New(ctx, s.db, collector, results, doc.ID, doc.CleanVersion, doc.TextVersion)
 	if err != nil {
 		return err
 	}
@@ -52,7 +53,7 @@ func (s *Service) Sync(ctx context.Context, doc *Document) error {
 	return nil
 }
 
-func (s *Service) getResults(ctx context.Context, id uuid.UUID, coll *collector.Collector) (*[]query.Result, error) {
+func (s *Service) getResults(ctx context.Context, id uuid.UUID, coll *collector.Collector) (*[]result.Result, error) {
 	docID := database.MustToDBUUID(id)
 
 	results, err := s.db.ListResultsByDocumentID(ctx, repository.ListResultsByDocumentIDParams{
@@ -64,18 +65,10 @@ func (s *Service) getResults(ctx context.Context, id uuid.UUID, coll *collector.
 		return nil, err
 	}
 
-	cleanResults := make([]query.Result, len(results))
+	cleanResults := make([]result.Result, len(results))
 	for index, dbResult := range results {
-		cleanResults[index] = *s.parseResult(&dbResult)
+		cleanResults[index] = *result.Parse(&dbResult)
 	}
 
 	return &cleanResults, nil
 }
-
-func (s *Service) parseResult(dbQuery *repository.ListResultsByDocumentIDRow) *query.Result {
-	return &query.Result{
-		ID:           database.MustToUUID(dbQuery.ID),
-		QueryID:      database.MustToUUID(dbQuery.Queryid),
-		QueryVersion: dbQuery.Queryversion,
-	}
-}