Skip to content

[DQT] Fix visit list filtering in candidate matching #10438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HenriRabalais wants to merge 3 commits into
base: main
Choose a base branch
from
+2 −7
Open

[DQT] Fix visit list filtering in candidate matching #10438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
564f635
[DQT] Fix visit list filtering in candidate matching
HenriRabalais Apr 3, 2026
70c197b
remove addition of session table to avoid non-unique table name
HenriRabalais Apr 3, 2026
7894ad1
passing tests
HenriRabalais Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions modules/dataquery/php/query.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,11 +761,7 @@ class Query implements \LORIS\StudyEntities\AccessibleResource,
throw new \Exception("Unhandled operator: " . $crit['op']);
}

// FIXME: Verify visits, test was done with candidate scope data
$visitlist = null;
if (isset($crit['visits'])) {
$visitlist = $crit['visits'];
}
$visitlist = $crit['visits'] ?? null;

\Profiler::checkpoint("Calling engine get matches");
$matches = $engine->getCandidateMatches($term, $visitlist);
Expand Down
3 changes: 1 addition & 2 deletions src/Data/Query/SQLQueryEngine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public function getCandidateMatches(
$this->addWhereClause("c.Active='Y'");
$prepbindings = [];

$this->buildQueryFromCriteria($term, $prepbindings);
$this->buildQueryFromCriteria($term, $prepbindings, $visitlist);

$query = 'SELECT DISTINCT c.CandID FROM';

Expand Down Expand Up @@ -582,7 +582,6 @@ protected function buildQueryFromCriteria(
);

if ($visitlist != null) {
$this->addTable("LEFT JOIN session s ON (s.CandidateID=c.ID AND s.Active='Y')");
Copy link
Copy Markdown
Collaborator

@driusan driusan Apr 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change.

My understanding from the PR description is that it was causing some kind of problem, but calling addTable with the same string multiple times should only add it once, so calling it a second time shouldn't change the results at all. That's the point of addTable.

If this is unnecessary because buildQueryFromCriteria is doing it, why is it only the addTable and not the rest of the duplicated logic that needs to be removed?

Since the addWhereClause on line 593 remains this code path should be making sure the table is added to the query before referencing it. Unless I'm missing something I think either the whole thing should be removed or none of it should be.

$inset = [];
$i = count($prepbindings);
foreach ($visitlist as $vl) {
Expand Down
Loading