Merged in feature/checkbox (pull request #145)

Checkbox Primary Edge Cases * hascheckboxlogic * gen * preppinggen * exploringcheckbox * removeunselected * tests * failingtest * failintests * nomockqueryapi * db * name * nocontainer * deleterow * cnc * extradocsandupdatetextracts * moretables * appndedtables * baseversion
2025-05-20 12:47:22 +00:00
parent beb221937b
commit 61d12bf8df
69 changed files with 223611 additions and 78482 deletions
@@ -53,80 +53,78 @@ func TestQueryRunner(t *testing.T) {
 		}),
 	})

-	t.Run("valid", func(t *testing.T) {
-		doc := queryrunner.Body{
-			DocumentID: uuid.New(),
-			QueryID:    uuid.New(),
-		}
+	doc := queryrunner.Body{
+		DocumentID: uuid.New(),
+		QueryID:    uuid.New(),
+	}

-		qcfg := "{\"path\":\"examplekey\"}"
-		reqQuery := uuid.New()
-		query := &resultprocessor.Query{
-			ID:               doc.QueryID,
-			Version:          2,
-			RequiredQueryIDs: &[]uuid.UUID{reqQuery},
-			Config:           &qcfg,
-		}
-		params := &resultset.Set{
-			DocumentID: doc.DocumentID,
-		}
+	qcfg := "{\"path\":\"examplekey\"}"
+	reqQuery := uuid.New()
+	query := &resultprocessor.Query{
+		ID:               doc.QueryID,
+		Version:          2,
+		RequiredQueryIDs: &[]uuid.UUID{reqQuery},
+		Config:           &qcfg,
+	}
+	params := &resultset.Set{
+		DocumentID: doc.DocumentID,
+	}

-		textEntryId := uuid.New()
-		pool.ExpectQuery("name: GetTextEntryByDocId :one").WithArgs(params.DocumentID).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "hash", "cleanId", "extractionVersion"}).
-					AddRow(textEntryId, params.DocumentID, "buket", "/i/am/here", "example", uuid.New(), int64(543)),
-			)
-		pool.ExpectQuery("name: GetQuery :one").WithArgs(query.ID).WillReturnRows(
-			pgxmock.NewRows([]string{"id", "type", "activeVersion", "latestVersion", "config", "requiredIds"}).
-				AddRow(query.ID, repository.QuerytypeJsonExtractor, query.Version, query.Version, []byte(*query.Config), *query.RequiredQueryIDs),
+	textEntryId := uuid.New()
+	pool.ExpectQuery("name: GetTextEntryByDocId :one").WithArgs(params.DocumentID).
+		WillReturnRows(
+			pgxmock.NewRows([]string{"id", "documentId", "bucket", "key", "hash", "cleanId", "extractionVersion"}).
+				AddRow(textEntryId, params.DocumentID, "buket", "/i/am/here", "example", uuid.New(), int64(543)),
 		)
-		pool.ExpectQuery("name: GetQueryWithVersion :one").WithArgs(&query.ID, &query.Version).WillReturnRows(
-			pgxmock.NewRows([]string{"id", "type", "activeVersion", "latestVersion", "config", "requiredIds"}).
-				AddRow(query.ID, repository.QuerytypeJsonExtractor, query.Version, query.Version, []byte(*query.Config), *query.RequiredQueryIDs),
+	pool.ExpectQuery("name: GetQuery :one").WithArgs(query.ID).WillReturnRows(
+		pgxmock.NewRows([]string{"id", "type", "activeVersion", "latestVersion", "config", "requiredIds"}).
+			AddRow(query.ID, repository.QuerytypeJsonExtractor, query.Version, query.Version, []byte(*query.Config), *query.RequiredQueryIDs),
+	)
+	pool.ExpectQuery("name: GetQueryWithVersion :one").WithArgs(&query.ID, &query.Version).WillReturnRows(
+		pgxmock.NewRows([]string{"id", "type", "activeVersion", "latestVersion", "config", "requiredIds"}).
+			AddRow(query.ID, repository.QuerytypeJsonExtractor, query.Version, query.Version, []byte(*query.Config), *query.RequiredQueryIDs),
+	)
+	requiredResultId := uuid.New()
+	strVal := "{\"examplekey\":\"example_value\"}"
+	pool.ExpectQuery("name: ListQueryRequirementValues :many").WithArgs(&query.ID, &query.Version, &params.DocumentID).
+		WillReturnRows(
+			pgxmock.NewRows([]string{"id", "queryId", "type", "value"}).
+				AddRow(&requiredResultId, (*query.RequiredQueryIDs)[0], repository.QuerytypeContextFull, &strVal),
 		)
-		requiredResultId := uuid.New()
-		strVal := "{\"examplekey\":\"example_value\"}"
-		pool.ExpectQuery("name: ListQueryRequirementValues :many").WithArgs(&query.ID, &query.Version, &params.DocumentID).
-			WillReturnRows(
-				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.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).
+		WillReturnRows(
+			pgxmock.NewRows([]string{"id"}).
+				AddRow(resultId),
+		)
+	pool.ExpectQuery("name: ListQueryRequirementValues :many").WithArgs(&query.ID, &query.Version, &params.DocumentID).
+		WillReturnRows(
+			pgxmock.NewRows([]string{"id", "queryId", "type", "value"}).
+				AddRow(&requiredResultId, (*query.RequiredQueryIDs)[0], repository.QuerytypeContextFull, &strVal),
+		)
+	pool.ExpectExec("name: AddResultDependency :exec").WithArgs(resultId, requiredResultId).
+		WillReturnResult(pgxmock.NewResult("", 1))
+	pool.ExpectCommit()
+	pool.ExpectQuery("name: ListQueryDirectDependentsByDocumentID :many").WithArgs(&query.ID, &doc.DocumentID).
+		WillReturnRows(
+			pgxmock.NewRows([]string{"queryId"}).
+				AddRow(&reqQuery),
 		)
-		pool.ExpectBegin()
-		resultId := uuid.New()
-		pool.ExpectQuery("name: AddResult :one").WithArgs(query.ID, pgxmock.AnyArg(), textEntryId, query.Version).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id"}).
-					AddRow(resultId),
-			)
-		pool.ExpectQuery("name: ListQueryRequirementValues :many").WithArgs(&query.ID, &query.Version, &params.DocumentID).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"id", "queryId", "type", "value"}).
-					AddRow(&requiredResultId, (*query.RequiredQueryIDs)[0], repository.QuerytypeContextFull, &strVal),
-			)
-		pool.ExpectExec("name: AddResultDependency :exec").WithArgs(resultId, requiredResultId).
-			WillReturnResult(pgxmock.NewResult("", 1))
-		pool.ExpectCommit()
-		pool.ExpectQuery("name: ListQueryDirectDependentsByDocumentID :many").WithArgs(&query.ID, &doc.DocumentID).
-			WillReturnRows(
-				pgxmock.NewRows([]string{"queryId"}).
-					AddRow(&reqQuery),
-			)

-		mockSQS.EXPECT().
-			SendMessage(
-				mock.Anything,
-				mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
-					return *in.QueueUrl == cfg.QueryURL && *in.MessageBody == fmt.Sprintf("{\"document_id\":\"%s\",\"query_id\":\"%s\"}", params.DocumentID.String(), (*query.RequiredQueryIDs)[0].String())
-				}),
-				mock.Anything,
-			).
-			Return(&sqs.SendMessageOutput{}, nil)
+	mockSQS.EXPECT().
+		SendMessage(
+			mock.Anything,
+			mock.MatchedBy(func(in *sqs.SendMessageInput) bool {
+				return *in.QueueUrl == cfg.QueryURL && *in.MessageBody == fmt.Sprintf("{\"document_id\":\"%s\",\"query_id\":\"%s\"}", params.DocumentID.String(), (*query.RequiredQueryIDs)[0].String())
+			}),
+			mock.Anything,
+		).
+		Return(&sqs.SendMessageOutput{}, nil)

-		assert.True(t, runner.Process(ctx, doc))
-	})
+	assert.True(t, runner.Process(ctx, doc))
 }