controllersupdate

internal/query/get.go

@@ -0,0 +1,49 @@
+package query
+
+import (
+	"context"
+	"queryorchestration/internal/database"
+	"queryorchestration/internal/database/repository"
+	queryprocessor "queryorchestration/internal/queryProcessor"
+
+	"github.com/google/uuid"
+)
+
+type Query struct {
+	ID               uuid.UUID
+	Type             queryprocessor.Type
+	ActiveVersion    int32
+	LatestVersion    int32
+	RequiredQueryIDs []uuid.UUID
+	Config           string
+}
+
+func (s *Service) Get(ctx context.Context, id uuid.UUID) (*Query, error) {
+	query, err := s.db.GetQuery(ctx, database.MustToDBUUID(id))
+	if err != nil {
+		return nil, err
+	}
+
+	return ParseDBGetQuery(&query)
+}
+
+func ParseDBGetQuery(q *repository.GetQueryRow) (*Query, error) {
+	reqQueryIDs := make([]uuid.UUID, len(q.Requiredids))
+	for index, id := range q.Requiredids {
+		reqQueryIDs[index] = database.MustToUUID(id)
+	}
+
+	qType, err := queryprocessor.ParseDBType(q.Type)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Query{
+		ID:               database.MustToUUID(q.ID),
+		ActiveVersion:    q.Activeversion,
+		LatestVersion:    q.Latestversion,
+		Type:             qType,
+		RequiredQueryIDs: reqQueryIDs,
+		Config:           string(q.Config),
+	}, nil
+}

internal/query/list.go

@@ -2,18 +2,26 @@ package query
 
 import (
 	"context"
+	"queryorchestration/internal/database"
+	"queryorchestration/internal/database/repository"
 	queryprocessor "queryorchestration/internal/queryProcessor"
+
+	"github.com/google/uuid"
 )
 
-func (s *Service) List(ctx context.Context, filters ListFilters) (*[]queryprocessor.Query, error) {
+type ListFilters struct {
+	Types []queryprocessor.Type
+}
+
+func (s *Service) List(ctx context.Context, filters ListFilters) (*[]Query, error) {
 	dbQueries, err := s.db.ListQueries(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	queries := make([]queryprocessor.Query, len(dbQueries))
+	queries := make([]Query, len(dbQueries))
 	for index, query := range dbQueries {
-		q, err := queryprocessor.ParseDBListQuery(&query)
+		q, err := ParseDBListQuery(&query)
 		if err != nil {
 			return nil, err
 		}
@@ -23,3 +31,24 @@ func (s *Service) List(ctx context.Context, filters ListFilters) (*[]queryproces
 
 	return &queries, nil
 }
+
+func ParseDBListQuery(q *repository.ListQueriesRow) (*Query, error) {
+	reqQueryIDs := make([]uuid.UUID, len(q.Requiredids))
+	for index, id := range q.Requiredids {
+		reqQueryIDs[index] = database.MustToUUID(id)
+	}
+
+	qType, err := queryprocessor.ParseDBType(q.Type)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Query{
+		ID:               database.MustToUUID(q.ID),
+		ActiveVersion:    q.Activeversion,
+		LatestVersion:    q.Latestversion,
+		Type:             qType,
+		RequiredQueryIDs: reqQueryIDs,
+		Config:           string(q.Config),
+	}, nil
+}

internal/query/service.go

@@ -1,24 +1,9 @@
 package query
 
 import (
-	"context"
-	"queryorchestration/internal/database"
 	"queryorchestration/internal/database/repository"
-	queryprocessor "queryorchestration/internal/queryProcessor"
-
-	"github.com/google/uuid"
 )
 
-type ListFilters struct {
-	Types []queryprocessor.Type
-}
-
-type Test struct {
-	QueryID      uuid.UUID
-	DocumentID   uuid.UUID
-	QueryVersion int32
-}
-
 type Service struct {
 	db *repository.Queries
 }
@@ -26,12 +11,3 @@ type Service struct {
 func New(db *repository.Queries) *Service {
 	return &Service{db}
 }
-
-func (s *Service) Get(ctx context.Context, id uuid.UUID) (*queryprocessor.Query, error) {
-	query, err := s.db.GetQuery(ctx, database.MustToDBUUID(id))
-	if err != nil {
-		return nil, err
-	}
-
-	return queryprocessor.ParseDBGetQuery(&query)
-}

internal/query/test.go

@@ -2,8 +2,16 @@ package query
 
 import (
 	"context"
+
+	"github.com/google/uuid"
 )
 
+type Test struct {
+	QueryID      uuid.UUID
+	DocumentID   uuid.UUID
+	QueryVersion int32
+}
+
 func (s *Service) Test(ctx context.Context, filters Test) (string, error) {
 	// TODO
 	// Sync doc - documentID