[conflict_resolver] Rename TableName to TestName

aces · May 16, 2024 · 654a847 · 654a847
1 parent e6204b3
commit 654a847
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 15 deletions.
diff --git a/SQL/New_patches/2024-05-16-conflict-resolver-use-testname.sql b/SQL/New_patches/2024-05-16-conflict-resolver-use-testname.sql
@@ -0,0 +1,5 @@
+ALTER TABLE conflicts_resolved
+	CHANGE `TableName` `TestName` varchar(255) NOT NULL;
+
+ALTER TABLE conflicts_unresolved
+	CHANGE `TableName` `TestName` varchar(255) NOT NULL;
diff --git a/modules/conflict_resolver/php/endpoints/unresolved.class.inc b/modules/conflict_resolver/php/endpoints/unresolved.class.inc
@@ -203,7 +203,7 @@ class Unresolved extends Endpoint implements ETagCalculator
         $conflict = $db->pselectRow(
             '
              SELECT
-               TableName,
+               TestName,
                FieldName,
                CommentId1 as CID1,
                CommentId2 as CID2,
@@ -217,7 +217,7 @@ class Unresolved extends Endpoint implements ETagCalculator
                ConflictID = :v_conflictid
              UNION DISTINCT
              SELECT
-               TableName,
+               TestName,
                FieldName,
                CommentId1 as CID1,
                CommentId2 as CID2,
@@ -247,14 +247,14 @@ class Unresolved extends Endpoint implements ETagCalculator
 
         $instrument = \NDB_BVL_Instrument::factory(
             $loris,
-            $conflict['TableName'],
+            $conflict['TestName'],
             $conflict['CID1'],
             '',
             true
         );
         if ($instrument->_hasAccess($user) == false) {
             return new \LORIS\Http\Response\JSON\Forbidden(
-                'Permission denied for ' . $conflict['TableName']
+                'Permission denied for ' . $conflict['TestName']
             );
         }
         $instrument->_saveValues(
@@ -263,7 +263,7 @@ class Unresolved extends Endpoint implements ETagCalculator
 
         $ddeinstrument = \NDB_BVL_Instrument::factory(
             $loris,
-            $conflict['TableName'],
+            $conflict['TestName'],
             $conflict['CID2'],
             '',
             true
@@ -292,7 +292,7 @@ class Unresolved extends Endpoint implements ETagCalculator
                UserID,
                User1,
                User2,
-               TableName,
+               TestName,
                ExtraKeyColumn,
                ExtraKey1,
                ExtraKey2,
@@ -308,7 +308,7 @@ class Unresolved extends Endpoint implements ETagCalculator
                :v_username,
                f1.UserID,
                f2.UserID,
-               cu.TableName,
+               cu.TestName,
                cu.ExtraKeyColumn,
                cu.ExtraKey1,
                cu.ExtraKey2,
@@ -330,7 +330,7 @@ class Unresolved extends Endpoint implements ETagCalculator
                :v_username,
                cr.User1,
                cr.User2,
-               cr.TableName,
+               cr.TestName,
                cr.ExtraKeyColumn,
                cr.ExtraKey1,
                cr.ExtraKey2,

diff --git a/modules/conflict_resolver/php/provisioners/resolvedprovisioner.class.inc b/modules/conflict_resolver/php/provisioners/resolvedprovisioner.class.inc
@@ -33,7 +33,7 @@ class ResolvedProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisioner
             '
              SELECT
               conflicts_resolved.ResolvedID as resolvedid,
-              conflicts_resolved.TableName as instrument,
+              conflicts_resolved.TestName as instrument,
               session.CandID as candid,
               candidate.PSCID as pscid,
               session.Visit_label as visitlabel,

diff --git a/modules/conflict_resolver/php/provisioners/unresolvedprovisioner.class.inc b/modules/conflict_resolver/php/provisioners/unresolvedprovisioner.class.inc
@@ -33,7 +33,7 @@ class UnresolvedProvisioner extends \LORIS\Data\Provisioners\DBObjectProvisioner
             '
              SELECT
               conflicts_unresolved.ConflictID as conflictid,
-              conflicts_unresolved.TableName as instrument,
+              conflicts_unresolved.TestName as instrument,
               session.CandID as candid,
               candidate.PSCID as pscid,
               session.Visit_label as visitlabel,

diff --git a/modules/conflict_resolver/test/conflict_resolverTest.php b/modules/conflict_resolver/test/conflict_resolverTest.php
@@ -72,7 +72,7 @@ function tearDown(): void
             $this->DB->insert(
                 "conflicts_unresolved",
                 [
-                    'TableName'  => 'radiology_review',
+                    'TestName'   => 'radiology_review',
                     'FieldName'  => 'Scan_done',
                     'CommentId1' => '475906DCC4222142111524502652',
                     'Value1'     => 'yes',

diff --git a/php/libraries/ConflictDetector.class.inc b/php/libraries/ConflictDetector.class.inc
@@ -92,6 +92,7 @@ class ConflictDetector
     {
         $db = \NDB_Factory::singleton()->database();
         foreach ($diffResult as $diffLine) {
+            print_r($diffLine);
             $db->replace('conflicts_unresolved', $diffLine);
         }
 
@@ -110,7 +111,7 @@ class ConflictDetector
     function clearConflictsForField(array $diffLine): void
     {
         $deleteWhere = [
-            'TableName'      => $diffLine['TableName'],
+            'testName'       => $diffLine['TestName'],
             'ExtraKeyColumn' => $diffLine['ExtraKeyColumn'],
             'ExtraKey1'      => $diffLine['ExtraKey1'],
             'ExtraKey2'      => $diffLine['ExtraKey2'],

diff --git a/php/libraries/NDB_BVL_Instrument.class.inc b/php/libraries/NDB_BVL_Instrument.class.inc
@@ -2077,7 +2077,7 @@ abstract class NDB_BVL_Instrument extends NDB_Page
             if (!in_array($key, $this->_doubleDataEntryDiffIgnoreColumns)) {
                 if ($otherData[$key] != $value) {
                     $diff[] = [
-                        'TableName'      => $this->table,
+                        'TestName'       => $this->testName,
                         'ExtraKeyColumn' => null,
                         'ExtraKey1'      => ' ',
                         'ExtraKey2'      => ' ',

diff --git a/test/unittests/NDB_BVL_Instrument_Test.php b/test/unittests/NDB_BVL_Instrument_Test.php
@@ -1624,7 +1624,7 @@ function testDiff()
             $this->_instrument->diff($otherInstrument),
             [
                 [
-                    'TableName'      => 'medical_history',
+                    'TestName'       => 'medical_history',
                     'ExtraKeyColumn' => null,
                     'ExtraKey1'      => ' ',
                     'ExtraKey2'      => ' ',
@@ -1652,7 +1652,7 @@ function testClearInstrument()
         $conflicts_data = [
             [
                 'ConflictID'     => '123',
-                'TableName'      => '',
+                'TestName'       => '',
                 'ExtraKeyColumn' => null,
                 'ExtraKey1'      => '',
                 'ExtraKey2'      => '',