From 70b357b3fe982c484826fb972ee5ced927b7f055 Mon Sep 17 00:00:00 2001
From: Jefferson Casimir <jefferson.casimir@mcin.ca>
Date: Tue, 11 Feb 2025 20:13:24 -0500
Subject: [PATCH] Addressing failing tests

---
 modules/candidate_parameters/ajax/getData.php      | 12 ++++++------
 .../test/electrophysiologyBrowserTest.php          | 14 +++++++-------
 php/libraries/NDB_BVL_Feedback.class.inc           |  4 ++--
 test/unittests/studyentities/CandID_Test.php       |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/candidate_parameters/ajax/getData.php b/modules/candidate_parameters/ajax/getData.php
index 943619cfa45..9f924e5d23f 100644
--- a/modules/candidate_parameters/ajax/getData.php
+++ b/modules/candidate_parameters/ajax/getData.php
@@ -204,7 +204,7 @@ function getProbandInfoFields()
     // Calculate age difference
     $ageDifference = "Could not calculate age";
     $candidateDOB  = $db->pselectOne(
-        "SELECT DoB FROM candidate WHERE ID=:CandidateID",
+        "SELECT DoB FROM candidate WHERE CandID=:CandidateID",
         ['CandidateID' => $candID]
     );
     if (!empty($candidateDOB) && !empty($dob)) {
@@ -370,8 +370,8 @@ function getParticipantStatusFields()
     }
 
     $query = "SELECT participant_status, participant_suboptions, reason_specify
-        FROM parameter_candidate pc
-        JOIN candidate c ON c.ID=pc.CandidateID
+        FROM participant_status ps
+        JOIN candidate c ON c.ID=ps.CandidateID
         WHERE c.CandID=:cid";
     $row   = $db->pselectRow($query, ['cid' => $candID]);
 
@@ -540,7 +540,7 @@ function getDOBFields(): array
     $db     = \NDB_Factory::singleton()->database();
     // Get PSCID
     $candidateData = $db->pselectRow(
-        'SELECT PSCID,DoB FROM candidate where ID =:candid',
+        'SELECT PSCID,DoB FROM candidate where CandID =:candid',
         ['candid' => $candID->__toString()]
     );
     $pscid         = $candidateData['PSCID'] ?? null;
@@ -576,7 +576,7 @@ function getDODFields(): array
     $db     = \NDB_Factory::singleton()->database();
 
     $candidateData = $db->pselectRow(
-        'SELECT PSCID,DoD, DoB FROM candidate where ID =:candid',
+        'SELECT PSCID,DoD, DoB FROM candidate where CandID =:candid',
         ['candid' => $candID]
     );
     if ($candidateData === null) {
@@ -625,7 +625,7 @@ function getDiagnosisEvolutionFields(): array
 
     $pscid = $db->pselectOne(
         "SELECT PSCID FROM candidate
-        WHERE ID=:candID",
+        WHERE CandID=:candID",
         ['candID' => $candID]
     );
 
diff --git a/modules/electrophysiology_browser/test/electrophysiologyBrowserTest.php b/modules/electrophysiology_browser/test/electrophysiologyBrowserTest.php
index cfd1b4fb362..9cdea60323c 100644
--- a/modules/electrophysiology_browser/test/electrophysiologyBrowserTest.php
+++ b/modules/electrophysiology_browser/test/electrophysiologyBrowserTest.php
@@ -67,9 +67,9 @@ function setUp(): void
         $this->DB->insert(
             "candidate",
             [
-                'ID'                    => 1,
-                'CandID'                => '000001',
-                'PSCID'                 => 'DCC0001',
+                'ID'                    => 2,
+                'CandID'                => '000002',
+                'PSCID'                 => 'DCC0002',
                 'RegistrationCenterID'  => 253,
                 'RegistrationProjectID' => 2,
                 'Active'                => 'Y',
@@ -80,7 +80,7 @@ function setUp(): void
             'session',
             [
                 'ID'            => '999997',
-                'CandidateID'   => 1,
+                'CandidateID'   => 2,
                 'Visit_label'   => 'Test0',
                 'CenterID'      => 253,
                 'ProjectID'     => 2,
@@ -164,14 +164,14 @@ function tearDown() : void
             'session',
             [
                 'ID'          => 999997,
-                'CandidateID' => 1
+                'CandidateID' => 2
             ]
         );
         $this->DB->delete(
             "candidate",
             [
-                'CandID' => '000001',
-                'PSCID'  => 'DCC0001',
+                'CandID' => '000002',
+                'PSCID'  => 'DCC0002',
             ]
         );
         $this->DB->delete(
diff --git a/php/libraries/NDB_BVL_Feedback.class.inc b/php/libraries/NDB_BVL_Feedback.class.inc
index 3d9d525dc41..388a6b18cc2 100644
--- a/php/libraries/NDB_BVL_Feedback.class.inc
+++ b/php/libraries/NDB_BVL_Feedback.class.inc
@@ -193,7 +193,7 @@ class NDB_BVL_Feedback
 
             $qparams['SID'] = $this->_feedbackObjectInfo['SessionID'];
         } elseif (!empty($this->_feedbackObjectInfo['CandID'])) {
-            $query          .= " WHERE c.ID = :CaID";
+            $query          .= " WHERE c.CandID = :CaID";
             $qparams['CaID'] = (string) $this->_feedbackObjectInfo['CandID'];
         } else {
             throw new InvalidArgumentException(
@@ -418,7 +418,7 @@ class NDB_BVL_Feedback
         $query   = "SELECT COUNT(*)
             FROM feedback_bvl_thread fbt
             JOIN candidate c ON c.ID=fbt.CandidateID
-            WHERE Active ='Y' AND Public = 'Y' AND Status <> 'closed'";
+            WHERE fbt.Active ='Y' AND Public = 'Y' AND Status <> 'closed'";
         $qparams = [];
         if (!empty($this->_feedbackObjectInfo['CommentID'])) {
             $query           .= " AND CommentID = :ComID";
diff --git a/test/unittests/studyentities/CandID_Test.php b/test/unittests/studyentities/CandID_Test.php
index 02008836c07..550da32a98d 100644
--- a/test/unittests/studyentities/CandID_Test.php
+++ b/test/unittests/studyentities/CandID_Test.php
@@ -44,7 +44,7 @@ public function invalidValues(): array
             [' 11111'],
             ['111111a'],
             ['a111111'],
-            ['1111111']
+            ['11111111111']
         ];
     }