Merged in feature/testwithlogs (pull request #65)

Query Version Sync Runner

* testing

* queryversiosyncworking

* update

* tests

* fixtests

internal/database/repository/query.sql.go

@@ -125,21 +125,40 @@ func (q *Queries) GetQueryConfig(ctx context.Context, arg *GetQueryConfigParams)
 }
 
 const getQueryWithVersion = `-- name: GetQueryWithVersion :one
-SELECT DISTINCT q.id, q.type, q.activeVersion, q.latestVersion, coalesce(c.config, null) as config, ARRAY_AGG(DISTINCT r.requiredQueryId)::uuid[] as requiredIds
-    FROM queries AS q
+WITH query as (
+    SELECT id, type, activeVersion, latestVersion FROM queries WHERE id = $1
+),
+config as (
+SELECT c.queryId, c.config
+    FROM query AS q
     LEFT JOIN queryConfigs AS c ON q.id = c.queryId
         and $2 >= c.addedVersion
-        and $2 < COALESCE(c.removedVersion, $2 + 1)
+        and (c.removedVersion is null or $2 < c.removedVersion)
+),
+requiredIds as (
+    SELECT r.queryId,
+        ARRAY_AGG(DISTINCT r.requiredQueryId)
+        FILTER (WHERE r.requiredQueryId != '00000000-0000-0000-0000-000000000000')::uuid[]
+        as requiredIds
+    FROM query AS q
     LEFT JOIN requiredQueries AS r ON q.id = r.queryId
         and $2 >= r.addedVersion
-        and $2 < COALESCE(r.removedVersion, $2 + 1)
-    WHERE q.id = $1
-    GROUP BY q.id, q.type, q.activeversion, q.latestversion, c.config
+        and (r.removedVersion is null or $2 < r.removedVersion)
+    GROUP BY r.queryId
+)
+SELECT DISTINCT q.id, q.type, q.activeVersion, q.latestVersion, c.config,
+    coalesce(
+        r.requiredIds,
+        array[]::uuid[]
+    )::uuid[] as requiredIds
+    FROM query AS q
+    LEFT JOIN config AS c ON q.id = c.queryId
+    LEFT JOIN requiredIds AS r ON q.id = r.queryId
 `
 
 type GetQueryWithVersionParams struct {
-	ID           pgtype.UUID `db:"id"`
-	Addedversion int32       `db:"addedversion"`
+	ID      pgtype.UUID `db:"id"`
+	Version *int32      `db:"version"`
 }
 
 type GetQueryWithVersionRow struct {
@@ -153,18 +172,37 @@ type GetQueryWithVersionRow struct {
 
 // GetQueryWithVersion
 //
-//	SELECT DISTINCT q.id, q.type, q.activeVersion, q.latestVersion, coalesce(c.config, null) as config, ARRAY_AGG(DISTINCT r.requiredQueryId)::uuid[] as requiredIds
-//	    FROM queries AS q
+//	WITH query as (
+//	    SELECT id, type, activeVersion, latestVersion FROM queries WHERE id = $1
+//	),
+//	config as (
+//	SELECT c.queryId, c.config
+//	    FROM query AS q
 //	    LEFT JOIN queryConfigs AS c ON q.id = c.queryId
 //	        and $2 >= c.addedVersion
-//	        and $2 < COALESCE(c.removedVersion, $2 + 1)
+//	        and (c.removedVersion is null or $2 < c.removedVersion)
+//	),
+//	requiredIds as (
+//	    SELECT r.queryId,
+//	        ARRAY_AGG(DISTINCT r.requiredQueryId)
+//	        FILTER (WHERE r.requiredQueryId != '00000000-0000-0000-0000-000000000000')::uuid[]
+//	        as requiredIds
+//	    FROM query AS q
 //	    LEFT JOIN requiredQueries AS r ON q.id = r.queryId
 //	        and $2 >= r.addedVersion
-//	        and $2 < COALESCE(r.removedVersion, $2 + 1)
-//	    WHERE q.id = $1
-//	    GROUP BY q.id, q.type, q.activeversion, q.latestversion, c.config
+//	        and (r.removedVersion is null or $2 < r.removedVersion)
+//	    GROUP BY r.queryId
+//	)
+//	SELECT DISTINCT q.id, q.type, q.activeVersion, q.latestVersion, c.config,
+//	    coalesce(
+//	        r.requiredIds,
+//	        array[]::uuid[]
+//	    )::uuid[] as requiredIds
+//	    FROM query AS q
+//	    LEFT JOIN config AS c ON q.id = c.queryId
+//	    LEFT JOIN requiredIds AS r ON q.id = r.queryId
 func (q *Queries) GetQueryWithVersion(ctx context.Context, arg *GetQueryWithVersionParams) (*GetQueryWithVersionRow, error) {
-	row := q.db.QueryRow(ctx, getQueryWithVersion, arg.ID, arg.Addedversion)
+	row := q.db.QueryRow(ctx, getQueryWithVersion, arg.ID, arg.Version)
 	var i GetQueryWithVersionRow
 	err := row.Scan(
 		&i.ID,
@@ -312,6 +350,33 @@ func (q *Queries) ListQueryDirectDependentsByDocumentID(ctx context.Context, arg
 	return items, nil
 }
 
+const listQueryJobIDs = `-- name: ListQueryJobIDs :many
+SELECT jobId FROM collectorQueryDependencyTree WHERE queryId = $1
+`
+
+// ListQueryJobIDs
+//
+//	SELECT jobId FROM collectorQueryDependencyTree WHERE queryId = $1
+func (q *Queries) ListQueryJobIDs(ctx context.Context, queryid pgtype.UUID) ([]pgtype.UUID, error) {
+	rows, err := q.db.Query(ctx, listQueryJobIDs, queryid)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	items := []pgtype.UUID{}
+	for rows.Next() {
+		var jobid pgtype.UUID
+		if err := rows.Scan(&jobid); err != nil {
+			return nil, err
+		}
+		items = append(items, jobid)
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const removeQueryConfig = `-- name: RemoveQueryConfig :exec
 UPDATE queryConfigs SET removedVersion = $1 WHERE queryId = $2 and removedVersion is null
 `