Merged in feature/textextract (pull request #108)

Start adding Textract + UUID changes

* base

* startclient

* ts

* short

* tests

internal/query/result/processor/parse.go

@@ -3,7 +3,6 @@ package resultprocessor
 import (
 	"fmt"
 
-	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
 
 	"github.com/google/uuid"
@@ -67,22 +66,21 @@ func ToDBNullQueryType(t Type) (repository.NullQuerytype, error) {
 }
 
 func ParseDBCollectorQuery(q *repository.Collectorquerydependencytree) (*Query, error) {
-	var reqQueryIDs *[]uuid.UUID
-	if len(q.Requiredids) > 0 {
-		ids := database.MustToUUIDArray(q.Requiredids)
-		reqQueryIDs = &ids
-	}
-
 	qType, err := ParseDBType(q.Type)
 	if err != nil {
 		return nil, err
 	}
 
+	var reqIds *[]uuid.UUID
+	if len(q.Requiredids) > 0 {
+		reqIds = &q.Requiredids
+	}
+
 	return &Query{
-		ID:               database.MustToUUID(q.Queryid),
+		ID:               *q.Queryid,
 		Version:          q.Queryversion,
 		Type:             qType,
-		RequiredQueryIDs: reqQueryIDs,
+		RequiredQueryIDs: reqIds,
 	}, nil
 }
 
@@ -96,23 +94,22 @@ func ParseFullQuery(qs *repository.Fullactivequery) (*Query, error) {
 		return nil, err
 	}
 
-	var rids *[]uuid.UUID
-	if len(qs.Requiredids) > 0 {
-		r := database.MustToUUIDArray(qs.Requiredids)
-		rids = &r
-	}
-
 	var cfg *string
 	if qs.Config != nil {
 		c := string(qs.Config)
 		cfg = &c
 	}
 
+	var reqIds *[]uuid.UUID
+	if len(qs.Requiredids) > 0 {
+		reqIds = &qs.Requiredids
+	}
+
 	return &Query{
-		ID:               database.MustToUUID(qs.ID),
+		ID:               qs.ID,
 		Type:             qt,
 		Version:          qs.Activeversion,
-		RequiredQueryIDs: rids,
+		RequiredQueryIDs: reqIds,
 		Config:           cfg,
 	}, nil
 }