Fix DirectoriesContainingFile query (#604)

eseliger · web-flow · commit 9a4b64d6b012 · 2021-09-03T15:13:42.000+02:00
Rev and repo name were shifted, this probably returned no results at all times.
diff --git a/internal/batches/service/service.go b/internal/batches/service/service.go
@@ -653,7 +653,7 @@ func (svc *Service) FindDirectoriesInRepos(ctx context.Context, fileName string,
 		a.WriteString("query DirectoriesContainingFile {\n")
 
 		for _, repo := range batch {
-			query := fmt.Sprintf(`file:(^|/)%s$ repo:^%s$@%s type:path count:99999`, regexp.QuoteMeta(fileName), repo.Rev(), regexp.QuoteMeta(repo.Name))
+			query := fmt.Sprintf(`file:(^|/)%s$ repo:^%s$@%s type:path count:99999`, regexp.QuoteMeta(fileName), regexp.QuoteMeta(repo.Name), repo.Rev())
 
 			a.WriteString(fmt.Sprintf(searchQueryTmpl, queryIDByRepo[repo], query))
 		}

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ func (svc *Service) FindDirectoriesInRepos(ctx context.Context, fileName string,`
`653`	`653`	`a.WriteString("query DirectoriesContainingFile {\n")`
`654`	`654`
`655`	`655`	`for _, repo := range batch {`
`656`		- query := fmt.Sprintf(`file:(^\|/)%s$ repo:^%s$@%s type:path count:99999`, regexp.QuoteMeta(fileName), repo.Rev(), regexp.QuoteMeta(repo.Name))
	`656`	+ query := fmt.Sprintf(`file:(^\|/)%s$ repo:^%s$@%s type:path count:99999`, regexp.QuoteMeta(fileName), regexp.QuoteMeta(repo.Name), repo.Rev())
`657`	`657`
`658`	`658`	`a.WriteString(fmt.Sprintf(searchQueryTmpl, queryIDByRepo[repo], query))`
`659`	`659`	`}`