Merged in bugfix/querytest (pull request #147)

Pass Test Query

* passfullsutie

api/queryAPI/query_test.go

@@ -152,18 +152,27 @@ func TestUpdateQuery(t *testing.T) {
 	assert.Empty(t, rec.Body.String())
 }
 
+type QueryUpdateConfig struct {
+	serviceconfig.BaseConfig
+	queryversionsync.QueryVersionSyncConfig
+}
+
 func TestTestQuery(t *testing.T) {
 	t.Parallel()
-	cfg := &serviceconfig.BaseConfig{}
+	cfg := &QueryUpdateConfig{}
 	net := test.GetNetwork(t)
 	test.CreateDB(t, cfg, net, &test.CreateDatabaseConfig{})
 
 	docsvc := document.New(cfg)
 	col := collector.New(cfg)
 	que := query.New(cfg)
+	queup := queryupdate.New(cfg, &queryupdate.Services{
+		Query: que,
+	})
 	cons := queryapi.NewControllers(&queryapi.Services{
-		Collector: col,
-		Query:     que,
+		Collector:   col,
+		Query:       que,
+		QueryUpdate: queup,
 		QueryTest: querytest.New(cfg, &querytest.Services{
 			Document:  docsvc,
 			Collector: col,
@@ -239,6 +248,12 @@ func TestTestQuery(t *testing.T) {
 		},
 	})
 	require.NoError(t, err)
+	c = `{"path": "mykey"}`
+	err = queup.Update(t.Context(), &resultprocessor.Update{
+		ID:     queryId,
+		Config: &c,
+	})
+	require.NoError(t, err)
 
 	body := queryapi.QueryTestRequest{
 		DocumentId:   docId,
@@ -252,4 +267,17 @@ func TestTestQuery(t *testing.T) {
 	assertBody(t, rec, queryapi.QueryTestResponse{
 		Value: "old_value",
 	})
+
+	body = queryapi.QueryTestRequest{
+		DocumentId:   docId,
+		QueryVersion: 2,
+	}
+	ctx, rec = createContextWithBody(t, body)
+
+	err = cons.TestQuery(ctx, queryId)
+	require.NoError(t, err)
+	assert.Equal(t, http.StatusOK, rec.Code)
+	assertBody(t, rec, queryapi.QueryTestResponse{
+		Value: "example_value",
+	})
 }

api/queryRunner/runner_test.go

@@ -91,10 +91,6 @@ func TestQueryRunner(t *testing.T) {
 			pgxmock.NewRows([]string{"id", "queryId", "type", "value"}).
 				AddRow(&requiredResultId, (*query.RequiredQueryIDs)[0], repository.QuerytypeContextFull, &strVal),
 		)
-	pool.ExpectQuery("name: GetActiveQueryConfig :one").WithArgs(query.ID).WillReturnRows(
-		pgxmock.NewRows([]string{"config"}).
-			AddRow([]byte(qcfg)),
-	)
 	pool.ExpectBegin()
 	resultId := uuid.New()
 	pool.ExpectQuery("name: AddResult :one").WithArgs(query.ID, pgxmock.AnyArg(), textEntryId, query.Version).