kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-16 22:58:09 +00:00
Code Issues Projects Releases Wiki Activity

Improve test coverage and quality

Browse Source
This commit is contained in:
James Cole
2019-06-16 13:16:46 +02:00
parent 1ce1a84c9e
commit 72c0d7a874
34 changed files with 3211 additions and 2524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

768
tests/Unit/Factory/TransactionFactoryTest.php
View File

@@ -24,13 +24,7 @@ declare(strict_types=1);
namespace Tests\Unit\Factory;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Factory\TransactionFactory;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\NullArrayObject;
use Log;
use Tests\TestCase;
@@ -52,752 +46,130 @@ class TransactionFactoryTest extends TestCase
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testCreateBasic(): void
public function testCreateNegative(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$journal = $this->getRandomWithdrawal();
$account = $this->getRandomAsset();
$euro = TransactionCurrency::whereCode('EUR')->first();
$euro = $this->getEuro();
$amount = '10';
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
// set details:
$factory->setUser($this->user());
$factory->setJournal($journal);
$transaction = $factory->create($account, $euro, $amount);
$factory->setAccount($account);
$factory->setCurrency($euro);
$factory->setReconciled(false);
// create negative
$transaction = $factory->createNegative($amount, null);
$this->assertEquals($transaction->account_id, $account->id);
$this->assertEquals('-10', $transaction->amount);
$transaction->forceDelete();
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testCreateNull(): void
public function testCreatePositive(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$journal = $this->getRandomWithdrawal();
$account = new Account;
$euro = TransactionCurrency::whereCode('EUR')->first();
$account = $this->getRandomAsset();
$euro = $this->getEuro();
$amount = '10';
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
// set details:
$factory->setUser($this->user());
$factory->setJournal($journal);
$transaction = $factory->create($account, $euro, $amount);
$factory->setAccount($account);
$factory->setCurrency($euro);
$factory->setReconciled(false);
$this->assertNull($transaction);
// create positive
$transaction = $factory->createPositive($amount, null);
$this->assertEquals($transaction->account_id, $account->id);
$this->assertEquals('10', $transaction->amount);
$transaction->forceDelete();
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testCreatePair(): void
public function testCreateNegativeForeign(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// used objects
$withdrawal = $this->getRandomWithdrawal();
$asset = $this->getRandomAsset();
$expense = $this->getRandomExpense();
$currency = TransactionCurrency::whereCode('EUR')->first();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findNull')->withArgs([1])->once()->andReturn($asset);
$accountRepos->shouldReceive('findByName')->withArgs(['Some destination', [AccountType::EXPENSE]])->once()->andReturn($expense);
$data = new NullArrayObject(
[
'source_id' => 1,
'destination_name' => 'Some destination',
'amount' => '20',
]
);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$pairs = $factory->createPair($data, $currency, null);
$first = $pairs->first();
$this->assertCount(2, $pairs);
$this->assertEquals('-20', $first->amount);
$this->assertEquals($currency->id, $first->transaction_currency_id);
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testCreatePairForeign(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// used objects:
$withdrawal = $this->getRandomWithdrawal();
$expense = $this->getRandomExpense();
$asset = $this->getRandomAsset();
$currency = TransactionCurrency::whereCode('EUR')->first();
$foreign = TransactionCurrency::whereCode('USD')->first();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findNull')->withArgs([1])->once()->andReturn($asset);
$accountRepos->shouldReceive('findByName')->withArgs(['Some destination', [AccountType::EXPENSE]])->once()->andReturn($expense);
$data = new NullArrayObject(
[
'source_id' => 1,
'destination_name' => 'Some destination',
'amount' => '20',
'foreign_amount' => '20',
]
);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$pairs = $factory->createPair($data, $currency, $foreign);
$first = $pairs->first();
$this->assertCount(2, $pairs);
$this->assertEquals('-20', $first->amount);
$this->assertEquals($currency->id, $first->transaction_currency_id);
$this->assertEquals($foreign->id, $first->foreign_currency_id);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Deposit and an Revenue account ID (this is OK).
* Expected result: the same revenue account.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testDepositSourceAsseRevenueId(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$deposit = $this->getRandomDeposit();
$revenue = $this->getRandomRevenue();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findNull')->once()->withArgs([$revenue->id])->andReturn($revenue);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($deposit);
$result = $factory->getAccount('source', null, $revenue->id, null);
$this->assertEquals($revenue->id, $result->id);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Deposit and nothing else (this is OK).
* Expected result: a cash account
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testDepositSourceRevenueCash(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$deposit = $this->getRandomDeposit();
$revenue = $this->getRandomRevenue();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('getCashAccount')->once()->andReturn($revenue);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($deposit);
$result = $factory->getAccount('source', null, null, null);
$this->assertEquals($revenue->name, $result->name);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Deposit and an Revenue account name (this is OK).
* Expected result: a new revenue account.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testDepositSourceRevenueNameNew(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$deposit = $this->getRandomDeposit();
$name = 'random rev name ' . random_int(1, 100000);
$revenue = $this->getRandomRevenue();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findByName')->once()->withArgs([$name, [AccountType::REVENUE]])->andReturnNull();
// system will automatically expand search:
$accountRepos->shouldReceive('findByName')->once()->withArgs(
[$name, [AccountType::REVENUE, AccountType::CASH, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE, AccountType::INITIAL_BALANCE,
AccountType::RECONCILIATION]]
)->andReturnNull();
// then store new account:
$accountRepos->shouldReceive('store')->once()->withArgs(
[[
'account_type_id' => null,
'accountType' => AccountType::REVENUE,
'name' => $name,
'active' => true,
'iban' => null,
]]
)->andReturn($revenue);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($deposit);
$result = $factory->getAccount('source', null, null, $name);
$this->assertEquals($revenue->name, $result->name);
}
/**
* @throws FireflyException
*/
public function testDramaBasic(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$withdrawal = $this->getRandomWithdrawal();
$source = $withdrawal->transactions()->where('amount', '<', 0)->first();
$dest = $withdrawal->transactions()->where('amount', '>', 0)->first();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$factory->makeDramaOverAccountTypes($source->account, $dest->account);
}
/**
* @throws FireflyException
*/
public function testDramaNotAllowed(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$withdrawal = $this->getRandomWithdrawal();
// this is an asset account.
$source = $withdrawal->transactions()->where('amount', '<', 0)->first();
// so destiny cannot be also asset account
$dest = $this->getRandomAsset();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
try {
$factory->makeDramaOverAccountTypes($source->account, $dest);
} catch (FireflyException $e) {
$this->assertEquals(
'Journal of type "Withdrawal" has a source account of type "Asset account" and cannot accept a "Asset account"-account as destination, but only accounts of: Expense account, Loan, Debt, Mortgage',
$e->getMessage()
);
}
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testGetAmountBasic(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$amount = '10';
// data used in calls.
$journal = $this->getRandomWithdrawal();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$account = $this->getRandomAsset();
$euro = $this->getEuro();
$dollar = $this->getDollar();
$amount = '10';
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
// set details:
$factory->setUser($this->user());
$factory->setJournal($journal);
$factory->setAccount($account);
$factory->setCurrency($euro);
$factory->setForeignCurrency($dollar);
$factory->setReconciled(false);
$result = $factory->getAmount($amount);
$this->assertEquals($amount, $result);
// create negative
$transaction = $factory->createNegative($amount, $amount);
$this->assertEquals($transaction->account_id, $account->id);
$this->assertEquals('-10', $transaction->amount);
$this->assertEquals('-10', $transaction->foreign_amount);
$this->assertEquals($euro->id, $transaction->transaction_currency_id);
$this->assertEquals($dollar->id, $transaction->foreign_currency_id);
$transaction->forceDelete();
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testGetAmountNull(): void
public function testCreatePositiveForeign(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$amount = '';
// data used in calls.
$journal = $this->getRandomWithdrawal();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$account = $this->getRandomAsset();
$euro = $this->getEuro();
$dollar = $this->getDollar();
$amount = '10';
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
// set details:
$factory->setUser($this->user());
$factory->setJournal($journal);
$factory->setAccount($account);
$factory->setCurrency($euro);
$factory->setForeignCurrency($dollar);
$factory->setReconciled(false);
try {
$factory->getAmount($amount);
} catch (FireflyException $e) {
$this->assertEquals('The amount cannot be an empty string: ""', $e->getMessage());
}
// create positive
$transaction = $factory->createPositive($amount, $amount);
$this->assertEquals($transaction->account_id, $account->id);
$this->assertEquals('10', $transaction->amount);
$this->assertEquals('10', $transaction->foreign_amount);
$this->assertEquals($euro->id, $transaction->transaction_currency_id);
$this->assertEquals($dollar->id, $transaction->foreign_currency_id);
$transaction->forceDelete();
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testGetAmountZero(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$amount = '0.0';
// data used in calls.
$journal = $this->getRandomWithdrawal();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($journal);
try {
$factory->getAmount($amount);
} catch (FireflyException $e) {
$this->assertEquals('The amount seems to be zero: "0.0"', $e->getMessage());
}
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testGetForeignAmountBasic(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$amount = '10';
// data used in calls.
$journal = $this->getRandomWithdrawal();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($journal);
$result = $factory->getForeignAmount($amount);
$this->assertEquals($amount, $result);
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testGetForeignAmountEmpty(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$amount = '';
// data used in calls.
$journal = $this->getRandomWithdrawal();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($journal);
$result = $factory->getForeignAmount($amount);
$this->assertNull($result);
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testGetForeignAmountNull(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$amount = null;
// data used in calls.
$journal = $this->getRandomWithdrawal();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($journal);
$result = $factory->getForeignAmount($amount);
$this->assertNull($result);
}
/**
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testGetForeignAmountZero(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
$amount = '0.0';
// data used in calls.
$journal = $this->getRandomWithdrawal();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($journal);
$result = $factory->getForeignAmount($amount);
$this->assertNull($result);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Withdrawal and an Asset account ID (this is OK).
* Expected result: the same asset account.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testWithdrawalSourceAssetId(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$withdrawal = $this->getRandomWithdrawal();
$asset = $this->getRandomAsset();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findNull')->once()->withArgs([$asset->id])->andReturn($asset);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$result = $factory->getAccount('source', null, $asset->id, null);
$this->assertEquals($asset->id, $result->id);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Withdrawal and an Asset account ID (this is OK).
* Expected result: find won't return anything so we expect a big fat error.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testWithdrawalSourceAssetIdNOK(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$withdrawal = $this->getRandomWithdrawal();
$asset = $this->getRandomAsset();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findNull')->once()->withArgs([$asset->id])->andReturn($asset);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
try {
$factory->getAccount('source', null, $asset->id, null);
} catch (FireflyException $e) {
$this->assertEquals('TransactionFactory: Cannot create asset account with ID #0 or name "(no name)".', $e->getMessage());
}
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Withdrawal and an Asset account name (this is OK).
* Expected result: the same asset account.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testWithdrawalSourceAssetName(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$withdrawal = $this->getRandomWithdrawal();
$asset = $this->getRandomAsset();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findByName')->once()->withArgs([$asset->name, [AccountType::ASSET]])->andReturn($asset);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$result = $factory->getAccount('source', null, null, $asset->name);
$this->assertEquals($asset->id, $result->id);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Withdrawal and an Asset account name (this is OK).
* Expected result: the same asset account.
*
* This will initially return NULL and then search again with all possible types.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testWithdrawalSourceAssetName2(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$withdrawal = $this->getRandomWithdrawal();
$asset = $this->getRandomAsset();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
$accountRepos->shouldReceive('findByName')->once()->withArgs([$asset->name, [AccountType::ASSET]])->andReturnNull();
$accountRepos->shouldReceive('findByName')->once()->withArgs(
[$asset->name, [AccountType::ASSET, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE]]
)->andReturn($asset);
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$result = $factory->getAccount('source', null, null, $asset->name);
$this->assertEquals($asset->id, $result->id);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Withdrawal and an Asset account object (this is OK).
* Expected result: the same asset account.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testWithdrawalSourceAssetObj(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$withdrawal = $this->getRandomWithdrawal();
$asset = $this->getRandomAsset();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$result = $factory->getAccount('source', $asset, null, null);
$this->assertEquals($asset->id, $result->id);
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Withdrawal and an Expense account object (this is not OK).
* Expected result: big fat error because of missing data.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testWithdrawalSourceAssetObjNOK(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$withdrawal = $this->getRandomWithdrawal();
$expense = $this->getRandomExpense();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
try {
$factory->getAccount('source', $expense, null, null);
} catch (FireflyException $e) {
$this->assertEquals('TransactionFactory: Cannot create asset account with ID #0 or name "(no name)".', $e->getMessage());
}
}
/**
* To cover everything, test several combinations.
*
* For the source account, submit a Withdrawal and Loan account object (this is OK).
* Expected result: the same loan account.
*
* @covers \FireflyIII\Factory\TransactionFactory
*/
public function testWithdrawalSourceLoanObj(): void
{
$this->markTestIncomplete('Needs to be rewritten for v4.8.0');
return;
// mock classes
$accountRepos = $this->mock(AccountRepositoryInterface::class);
// data used in calls.
$withdrawal = $this->getRandomWithdrawal();
$loan = $this->getRandomLoan();
// mock calls.
$accountRepos->shouldReceive('setUser')->once();
/** @var TransactionFactory $factory */
$factory = app(TransactionFactory::class);
$factory->setUser($this->user());
$factory->setJournal($withdrawal);
$result = $factory->getAccount('source', $loan, null, null);
$this->assertEquals($loan->id, $result->id);
}
}