Addressing failing tests

jeffersoncasimir · Feb 11, 2025 · 80bc50f · 80bc50f
1 parent e94ec03
commit 80bc50f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/modules/candidate_parameters/php/candidatequeryengine.class.inc b/modules/candidate_parameters/php/candidatequeryengine.class.inc
@@ -197,7 +197,7 @@ class CandidateQueryEngine extends \LORIS\Data\Query\SQLQueryEngine
             return 'c.PSCID';
         case 'Site':
             $this->addTable(
-                "LEFT JOIN session s ON (s.CandidateIDID=c.ID AND s.Active='Y')"
+                "LEFT JOIN session s ON (s.CandidateID=c.ID AND s.Active='Y')"
             );
             $this->addTable('LEFT JOIN psc site ON (s.CenterID=site.CenterID)');
             return 'site.Name';

diff --git a/modules/candidate_parameters/test/candidateQueryEngineTest.php b/modules/candidate_parameters/test/candidateQueryEngineTest.php
@@ -1285,7 +1285,7 @@ function testCohortMatches()
                 ],
                 [
                     'ID'          => 2,
-                    'CandidateID' => 1,
+                    'CandidateID' => 2,
                     'CenterID'    => '2',
                     'ProjectID'   => '2',
                     'CohortID'    => '2',

diff --git a/modules/mri_violations/test/mri_violationsTest.php b/modules/mri_violations/test/mri_violationsTest.php
@@ -68,6 +68,7 @@ public function setUp(): void
         $this->DB->insert(
             "candidate",
             [
+                'ID'                    => 1,
                 'CandID'                => '999888',
                 'RegistrationCenterID'  => '55',
                 'UserID'                => '1',
@@ -78,6 +79,7 @@ public function setUp(): void
         $this->DB->insert(
             "candidate",
             [
+                'ID'                    => 2,
                 'CandID'                => '999777',
                 'RegistrationCenterID'  => '55',
                 'UserID'                => '2',
@@ -89,7 +91,7 @@ public function setUp(): void
             "session",
             [
                 'ID'          => '9888',
-                'CandID'      => '999888',
+                'CandidateID' => 1,
                 'CenterID'    => '55',
                 'ProjectID'   => '7777',
                 'UserID'      => '1',
@@ -102,7 +104,7 @@ public function setUp(): void
             "session",
             [
                 'ID'          => '9777',
-                'CandID'      => '999777',
+                'CandidateID' => 2,
                 'CenterID'    => '55',
                 'ProjectID'   => '7777',
                 'UserID'      => '2',
@@ -176,7 +178,7 @@ public function setUp(): void
             "mri_protocol_violated_scans",
             [
                 'ID'                 => '1001',
-                'CandID'             => '999888',
+                'CandidateID'        => 1,
                 'PatientName'        => '[Test]PatientName_Test1',
                 'time_run'           => '2009-06-29 04:00:44',
                 'minc_location'      => 'assembly/test/test/mri/test/test.mnc',
@@ -190,7 +192,7 @@ public function setUp(): void
             "mri_protocol_violated_scans",
             [
                 'ID'                 => '1002',
-                'CandID'             => '999777',
+                'CandidateID'        => 2,
                 'PatientName'        => '[name]test_Test2',
                 'time_run'           => '2008-06-29 04:00:44',
                 'minc_location'      => 'assembly/test2/test2/mri/test2/test2.mnc',
@@ -250,15 +252,15 @@ public function tearDown(): void
         $this->DB->delete(
             "session",
             [
-                'CandID'   => '999888',
-                'CenterID' => '55',
+                'CandidateID' => 1,
+                'CenterID'    => '55',
             ]
         );
         $this->DB->delete(
             "session",
             [
-                'CandID'   => '999777',
-                'CenterID' => '55',
+                'CandidateID' => 2,
+                'CenterID'    => '55',
             ]
         );
         $this->DB->delete(

diff --git a/php/libraries/Candidate.class.inc b/php/libraries/Candidate.class.inc
@@ -104,7 +104,7 @@ class Candidate implements \LORIS\StudyEntities\AccessibleResource,
             FROM candidate as c
             LEFT JOIN psc as p ON (p.CenterID=c.RegistrationCenterID)
             LEFT JOIN users as u1 ON (u1.UserID = c.RegisteredBy)
-            WHERE c.CandID=:CandidateID AND c.Active = 'Y'";
+            WHERE c.CandID=:Candidate AND c.Active = 'Y'";
 
         $row = $db->pselectRow($query, $CandArray);
 

diff --git a/raisinbread/test/api/LorisApiAuthenticatedTest.php b/raisinbread/test/api/LorisApiAuthenticatedTest.php
@@ -27,7 +27,7 @@ class LorisApiAuthenticatedTest extends LorisIntegrationTest
     protected $base_uri;
     protected $originalJwtKey;
     protected $configIdJwt;
- 
+
     /**
      * Overrides LorisIntegrationTest::setUp() to store the current JWT key
      * and replaces it for an acceptable one.
@@ -80,6 +80,7 @@ public function setUp(): void
         $this->DB->insert(
             "candidate",
             [
+                'ID'                    => 1,
                 'CandID'                => '900000',
                 'PSCID'                 => 'TST0001',
                 'RegistrationCenterID'  => 1,
@@ -94,7 +95,7 @@ public function setUp(): void
             'session',
             [
                 'ID'            => '999999',
-                'CandID'        => '900000',
+                'CandidateID'   => 1,
                 'Visit_label'   => 'V1',
                 'CenterID'      => 1,
                 'ProjectID'     => 1,
@@ -236,8 +237,8 @@ public function tearDown(): void
             ],
         );
         $this->DB->delete("flag", ['ID' => '999999']);
-        $this->DB->delete("session", ['CandID' => '900000']);
-        $this->DB->delete("candidate", ['CandID' => '900000']);
+        $this->DB->delete("session", ['CandidateID' => 1]);
+        $this->DB->delete("candidate", ['ID' => 1]);
         $this->DB->delete("test_names", ['ID' => '999999']);
 
         $set = [

diff --git a/raisinbread/test/api/LorisApiAuthenticated_v0_0_3_Test.php b/raisinbread/test/api/LorisApiAuthenticated_v0_0_3_Test.php
@@ -256,7 +256,7 @@ public function tearDown(): void
         );
 
         $this->DB->delete("session", ['ID' => '999999']);
-        $this->DB->delete("candidate", ['ID' => '999999']);
+        $this->DB->delete("candidate", ['ID' => 1]);
         $this->DB->delete("flag", ['ID' => '999999']);
         $this->DB->delete("test_names", ['ID' => '999999']);