getandlist

internal/queryProcessor/parse.go

@@ -42,7 +42,7 @@ func ToDBQueryType(t Type) (repository.NullQuerytype, error) {
 	return repository.NullQuerytype{Querytype: dbType, Valid: true}, nil
 }
 
-func ParseDBQuery(q *repository.GetCollectorQueriesRow) (*Query, error) {
+func ParseDBCollectorQuery(q *repository.GetCollectorQueriesRow) (*Query, error) {
 	reqQueryIDs := make([]uuid.UUID, len(q.Requiredids))
 	for index, id := range q.Requiredids {
 		reqQueryIDs[index] = database.MustToUUID(id)
@@ -60,3 +60,43 @@ func ParseDBQuery(q *repository.GetCollectorQueriesRow) (*Query, error) {
 		RequiredQueryIDs: reqQueryIDs,
 	}, 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 := ParseDBType(q.Type)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Query{
+		ID:               database.MustToUUID(q.ID),
+		Version:          q.Activeversion,
+		Type:             qType,
+		RequiredQueryIDs: reqQueryIDs,
+		Config:           string(q.Config),
+	}, nil
+}
+
+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 := ParseDBType(q.Type)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Query{
+		ID:               database.MustToUUID(q.ID),
+		Version:          q.Activeversion,
+		Type:             qType,
+		RequiredQueryIDs: reqQueryIDs,
+		Config:           string(q.Config),
+	}, nil
+}

internal/queryProcessor/service.go

@@ -17,13 +17,13 @@ const (
 type Create struct {
 	Type             Type
 	RequiredQueryIDs []uuid.UUID
-	Config           interface{}
+	Config           string
 }
 
 type Update struct {
 	ID               uuid.UUID
 	RequiredQueryIDs []uuid.UUID
-	Config           interface{}
+	Config           string
 }
 
 type Query struct {
@@ -31,7 +31,7 @@ type Query struct {
 	Type             Type
 	Version          int32
 	RequiredQueryIDs []uuid.UUID
-	Config           interface{}
+	Config           string
 }
 
 type Creator interface {