composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°4305 - n-n links to same class - Be more robust on original search given to ormLinkSet

Browse Source
This commit is contained in:
Eric Espie
2021-09-21 15:46:13 +02:00
parent 7ac5c1bbbb
commit d8316734e2
3 changed files with 258 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/ormlinkset.class.inc.php
View File

@@ -811,8 +811,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
// N°2334 add pointed class (SELECT L,R) to have all fields (lnk + remote) in display
// the pointed class is always present in the search, as generated by \AttributeLinkedSet::GetDefaultValue
$sTargetClass = $oLinkingAttDef->GetTargetClass();
$oRemoteClassSearch = new DBObjectSearch($sTargetClass);
$oRemoteClassSearch->RenameAlias($sTargetClass, self::REMOTE_ALIAS);
$oRemoteClassSearch = new DBObjectSearch($sTargetClass, self::REMOTE_ALIAS);
if (!$bShowObsolete && MetaModel::IsObsoletable($sTargetClass))
{
@@ -835,9 +834,13 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
$oRemoteClassSearch->AddConditionExpression($oNotArchived);
}
$oLinkSearch->AddCondition_PointingTo($oRemoteClassSearch, $sExtKeyToRemote);
if ($sTargetClass != $this->sClass) {
$oLinkSearch->RenameAlias($sTargetClass, self::REMOTE_ALIAS);
$aReAliasingMap = [];
$oLinkSearch->AddCondition_PointingTo($oRemoteClassSearch, $sExtKeyToRemote, TREE_OPERATOR_EQUALS, $aReAliasingMap);
if (array_key_exists(self::REMOTE_ALIAS, $aReAliasingMap)) {
// If 'Remote' alias has been renamed, change it back.
if ($aReAliasingMap[self::REMOTE_ALIAS][0] != self::REMOTE_ALIAS) {
$oLinkSearch->RenameAlias($aReAliasingMap[self::REMOTE_ALIAS][0], self::REMOTE_ALIAS);
}
}
$oLinkSearch->SetSelectedClasses([self::LINK_ALIAS, self::REMOTE_ALIAS]);
}

70
test/core/DBSearchAddConditionPointingTo.php Normal file
View File

@@ -0,0 +1,70 @@
<?php
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
namespace Combodo\iTop\Test\UnitTest\Core;
use Combodo\iTop\Test\UnitTest\ItopTestCase;
use DBSearch;
class DBSearchAddConditionPointingToTest extends ItopTestCase
{
protected function setUp()
{
parent::setUp();
require_once(APPROOT.'application/startup.inc.php');
}
/**
* @dataProvider AddCondition_PointingToReAliasingMapProvider
*
* @param string $sMainReq
* @param string $sJoinedReq
* @param string $sExtKeyToRemote
* @param array $aExpectedReAliasingMap
*
* @throws \CoreException
* @throws \CoreWarning
* @throws \OQLException
*/
public function testAddCondition_PointingToReAliasingMap(string $sMainReq, string $sJoinedReq, string $sExtKeyToRemote, array $aExpectedReAliasingMap)
{
$oMainSearch = DBSearch::FromOQL($sMainReq);
$oJoinedSearch = DBSearch::FromOQL($sJoinedReq);
$aReAliasingMap = [];
$oMainSearch->AddCondition_PointingTo($oJoinedSearch, $sExtKeyToRemote, TREE_OPERATOR_EQUALS, $aReAliasingMap);
$this->debug($oMainSearch->ToOQL());
$this->debug(print_r($aReAliasingMap, true));
$this->assertEquals($aExpectedReAliasingMap, $aReAliasingMap, 'Canonicalized', 0.0, 10, true);
}
public function AddCondition_PointingToReAliasingMapProvider()
{
return [
'No initial join' => [
'sMainReq' => 'SELECT `Link` FROM lnkContactToTicket AS `Link` JOIN Ticket AS `Ticket` ON `Link`.ticket_id = `Ticket`.id WHERE (`Ticket`.`id` = :id)',
'sJoinedReq' => 'SELECT `Remote` FROM Contact AS `Remote` WHERE `Remote`.`obsolescence_flag` = 0',
'sExtKeyToRemote' => 'contact_id',
'aExpectedReAliasingMap' => [],
],
'Initial join no renaming' => [
'sMainReq' => 'SELECT `Link` FROM lnkContactToTicket AS `Link` JOIN Ticket AS `Ticket` ON `Link`.ticket_id = `Ticket`.id JOIN Contact AS `Remote` ON `Link`.contact_id = `Remote`.id WHERE (`Ticket`.`id` = :id)',
'sJoinedReq' => 'SELECT `Remote` FROM Contact AS `Remote` WHERE `Remote`.`obsolescence_flag` = 0',
'sExtKeyToRemote' => 'contact_id',
'aExpectedReAliasingMap' => ['Remote' => ['Remote']],
],
'Initial join renaming' => [
'sMainReq' => 'SELECT `Link` FROM lnkContactToTicket AS `Link` JOIN Ticket AS `Ticket` ON `Link`.ticket_id = `Ticket`.id JOIN Contact AS `Contact` ON `Link`.contact_id = `Contact`.id WHERE (`Ticket`.`id` = :id)',
'sJoinedReq' => 'SELECT `Remote` FROM Contact AS `Remote` WHERE `Remote`.`obsolescence_flag` = 0',
'sExtKeyToRemote' => 'contact_id',
'aExpectedReAliasingMap' => ['Remote' => ['Contact']],
],
];
}
}

364
test/core/ormLinkSetTest.php
View File

@@ -47,201 +47,194 @@ class ormLinkSetTest extends ItopDataTestCase
const CREATE_TEST_ORG = true;
/**
* @throws Exception
*/
protected function setUp()
{
parent::setUp();
}
* @throws Exception
*/
protected function setUp()
{
parent::setUp();
}
/**
*
*/
public function testConstruct()
{
$oOrmLink = new ormLinkSet('UserRequest', 'contacts_list');
static::assertNotNull($oOrmLink);
}
/**
*
*/
public function testConstruct()
{
$oOrmLink = new ormLinkSet('UserRequest', 'contacts_list');
static::assertNotNull($oOrmLink);
}
/**
*
*/
public function testConstruct2()
{
$this->expectException('Exception');
/**
*
*/
public function testConstruct2()
{
$this->expectException('Exception');
new ormLinkSet('UserRequest', 'ref');
}
new ormLinkSet('UserRequest', 'ref');
}
/**
* @throws Exception
*/
public function testBasic()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++)
{
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
/**
* @throws Exception
*/
public function testBasic()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
}
/**
* @throws Exception
*/
public function testSuccesiveAdds()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++)
{
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
/**
* @throws Exception
*/
public function testSuccesiveAdds()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
$this->AddContactToCI($this->CreatePerson($i), $oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(4, $oContactsSet->Count());
$this->AddContactToCI($this->CreatePerson($i), $oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(4, $oContactsSet->Count());
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(4, $oContactsSet->Count());
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(4, $oContactsSet->Count());
}
/**
* @throws Exception
*/
public function testRemove()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++)
{
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
/**
* @throws Exception
*/
public function testRemove()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
for ($i = 0; $i < 3; $i++)
{
$this->RemoveContactFromCI($aPersons[$i], $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
for ($i = 0; $i < 3; $i++) {
$this->RemoveContactFromCI($aPersons[$i], $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
}
/**
* @throws Exception
*/
public function testAddThenRemove()
{
$oServer = $this->CreateServer(1);
for ($i = 0; $i < 3; $i++)
{
$oPerson = $this->CreatePerson($i);
$this->AddContactToCI($oPerson, $oServer);
$this->RemoveContactFromCI($oPerson, $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
/**
* @throws Exception
*/
public function testAddThenRemove()
{
$oServer = $this->CreateServer(1);
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$this->AddContactToCI($oPerson, $oServer);
$this->RemoveContactFromCI($oPerson, $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(0, $oContactsSet->Count());
}
/**
* @throws Exception
*/
public function testRemoveThenAdd()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
/**
* @throws Exception
*/
public function testRemoveThenAdd()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
for ($i = 0; $i < 3; $i++) {
$this->RemoveContactFromCI($aPersons[$i], $oServer);
$this->AddContactToCI($aPersons[$i], $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
for ($i = 0; $i < 3; $i++) {
$this->RemoveContactFromCI($aPersons[$i], $oServer);
$this->AddContactToCI($aPersons[$i], $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
}
/**
* @throws Exception
*/
public function testAddDuplicate()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++)
{
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
/**
* @throws Exception
*/
public function testAddDuplicate()
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
}
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
for ($i = 0; $i < 3; $i++)
{
$this->AddContactToCI($aPersons[$i], $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(6, $oContactsSet->Count());
for ($i = 0; $i < 3; $i++) {
$this->AddContactToCI($aPersons[$i], $oServer);
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(6, $oContactsSet->Count());
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oServer->DBUpdate();
$this->ReloadObject($oServer);
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
}
$oContactsSet = $oServer->Get('contacts_list');
static::assertEquals(3, $oContactsSet->Count());
}
/**
* @throws Exception
@@ -250,8 +243,7 @@ class ormLinkSetTest extends ItopDataTestCase
{
$oServer = $this->CreateServer(1);
$aPersons = array();
for ($i = 0; $i < 3; $i++)
{
for ($i = 0; $i < 3; $i++) {
$oPerson = $this->CreatePerson($i);
$aPersons[] = $oPerson;
$this->AddContactToCI($oPerson, $oServer);
@@ -260,14 +252,12 @@ class ormLinkSetTest extends ItopDataTestCase
$oServer->DBUpdate();
$this->ReloadObject($oServer);
for ($i = 3; $i < 6; $i++)
{
for ($i = 3; $i < 6; $i++) {
$oPerson = $this->CreatePerson($i);
$this->AddContactToCI($oPerson, $oServer);
}
for ($i = 0; $i < 3; $i++)
{
for ($i = 0; $i < 3; $i++) {
$this->RemoveContactFromCI($aPersons[$i], $oServer);
}
@@ -277,11 +267,17 @@ class ormLinkSetTest extends ItopDataTestCase
/**
* @dataProvider ToDBObjectSetProvider
*
* @param $sHostClass
* @param $sAttCode
* @param $sOriginalFilter
* @param $bShowObsolete
* @param $sExpectedFilter
*
* @throws \CoreException
* @throws \CoreWarning
* @throws \MySQLException
* @throws \OQLException
*/
public function testToDBObjectSet($sHostClass, $sAttCode, $sOriginalFilter, $bShowObsolete, $sExpectedFilter)
{
@@ -296,19 +292,19 @@ class ormLinkSetTest extends ItopDataTestCase
{
return [
'lnkContactToFunctionalCI' => [
'sHostClass' => 'ApplicationSolution',
'sAttCode' => 'contacts_list',
'sHostClass' => 'ApplicationSolution',
'sAttCode' => 'contacts_list',
'sOriginalFilter' => 'SELECT `lnkContactToFunctionalCI` FROM lnkContactToFunctionalCI AS `lnkContactToFunctionalCI` JOIN FunctionalCI AS `FunctionalCI` ON `lnkContactToFunctionalCI`.functionalci_id = `FunctionalCI`.id WHERE (`FunctionalCI`.`id` = :id)',
'bShowObsolete' => false,
'bShowObsolete' => false,
'sExpectedFilter' => 'SELECT `Link`, `Remote` FROM lnkContactToFunctionalCI AS `Link` JOIN FunctionalCI AS `FunctionalCI` ON `Link`.functionalci_id = `FunctionalCI`.id JOIN Contact AS `Remote` ON `Link`.contact_id = `Remote`.id WHERE ((`FunctionalCI`.`id` = :id) AND (`Remote`.`obsolescence_flag` = 0))',
],
// 'lnkFAQToFAQ' => [
// 'sHostClass' => 'FAQ',
// 'sAttCode' => 'contacts_list',
// 'sOriginalFilter' => '',
// 'bShowObsolete' => true,
// 'sExpectedFilter' => '',
// ],
],
'lnkContactToTicket' => [
'sHostClass' => 'Ticket',
'sAttCode' => 'contacts_list',
'sOriginalFilter' => 'SELECT `lnkContactToTicket` FROM lnkContactToTicket AS `lnkContactToTicket` JOIN Ticket AS `Ticket` ON `lnkContactToTicket`.ticket_id = `Ticket`.id JOIN Contact AS `Contact1` ON `lnkContactToTicket`.contact_id = `Contact1`.id WHERE (`Ticket`.`id` = :id)',
'bShowObsolete' => false,
'sExpectedFilter' => 'SELECT `Link`, `Remote` FROM lnkContactToTicket AS `Link` JOIN Ticket AS `Ticket` ON `Link`.ticket_id = `Ticket`.id JOIN Contact AS `Remote` ON `Link`.contact_id = `Remote`.id WHERE ((`Ticket`.`id` = :id) AND (`Remote`.`obsolescence_flag` = 0))',
],
];
}