Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various tests fixes & client contacts importing (#3259)

Browse Source 
* Fix testClientNotArchived() returns null

* Fix testClientRestored() test

* Fix risky/incomplete tests

* Importing client contacts
This commit is contained in:
Benjamin Beganović 2020-01-29 03:43:38 +01:00 committed by GitHub
parent 69fa60b91c
commit 61b3385102
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 70 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Jobs/Util/Import.php
View File

@ -246,7 +246,8 @@ class Import implements ShouldQueue
{
Client::unguard();
$client_repository = new ClientRepository(new ClientContactRepository());
$contact_repository = new ClientContactRepository();
$client_repository = new ClientRepository($contact_repository);
foreach ($data as $key => $resource) {
@ -255,11 +256,26 @@ class Import implements ShouldQueue
$modified['user_id'] = $this->processUserId($resource);
unset($modified['id']);
unset($modified['contacts']);
$client = $client_repository->save($modified, ClientFactory::create(
$this->company->id, $modified['user_id'])
);
if(array_key_exists('contacts', $resource)) { // need to remove after importing new migration.json
$modified_contacts = $resource['contacts'];
foreach($modified_contacts as $key => $client_contacts) {
$modified_contacts[$key]['company_id'] = $this->company->id;
$modified_contacts[$key]['user_id'] = $this->processUserId($resource);
$modified_contacts[$key]['client_id'] = $client->id;
$modified_contacts[$key]['password'] = 'mysuperpassword'; // @todo, and clean up the code..
unset($modified_contacts[$key]['id']);
}
$contact_repository->save($modified_contacts, $client);
}
$key = "clients_{$resource['id']}";
$this->ids['clients'][$key] = [

91
tests/Unit/Migration/ImportTest.php
View File

@ -7,6 +7,7 @@ use App\Exceptions\ResourceDependencyMissing;
use App\Exceptions\ResourceNotAvailableForMigration;
use App\Jobs\Util\Import;
use App\Jobs\Util\StartMigration;
use App\Mail\MigrationFailed;
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\Company;
@ -19,6 +20,7 @@ use App\Models\Quote;
use App\Models\TaxRate;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Str;
use Tests\MockAccountData;
use Tests\TestCase;
@ -45,13 +47,15 @@ class ImportTest extends TestCase
public function testExceptionOnUnavailableResource()
{
Mail::fake();
$data['panda_bears'] = [
'name' => 'Awesome Panda Bear',
];
Import::dispatchNow($data, $this->company, $this->user);
Mail::assertSent(MigrationFailed::class);
}
public function testCompanyUpdating()
@ -69,18 +73,18 @@ class ImportTest extends TestCase
public function testInvoicesFailsWithoutClient()
{
try {
$data['invoices'] = [
0 => [
'client_id' => 1,
'is_amount_discount' => false,
]
];
Mail::fake();
Import::dispatchNow($data, $this->company, $this->user);
} catch (ResourceDependencyMissing $e) {
$this->assertTrue(true);
}
$data['invoices'] = [
0 => [
'client_id' => 1,
'is_amount_discount' => false,
]
];
Import::dispatchNow($data, $this->company, $this->user);
Mail::assertSent(MigrationFailed::class);
}
public function testInvoicesImporting()
@ -102,18 +106,18 @@ class ImportTest extends TestCase
public function testQuotesFailsWithoutClient()
{
try {
$data['quotes'] = [
0 => [
'client_id' => 1,
'is_amount_discount' => false,
]
];
Mail::fake();
Import::dispatchNow($data, $this->company, $this->user);
} catch (ResourceDependencyMissing $e) {
$this->assertTrue(true);
}
$data['quotes'] = [
0 => [
'client_id' => 1,
'is_amount_discount' => false,
]
];
Import::dispatchNow($data, $this->company, $this->user);
Mail::assertSent(MigrationFailed::class);
}
public function testImportFileExists()
@ -165,8 +169,6 @@ class ImportTest extends TestCase
->where('balance', $random_balance)
->first();
// Originally was checked with ClientContact::whereEmail() but it throws 'array to string conversion' on insert.
$this->assertNotNull($client);
$this->assertGreaterThan($original_number, Client::count());
$this->assertGreaterThanOrEqual(0, $client->balance);
@ -263,18 +265,18 @@ class ImportTest extends TestCase
public function testPaymentDependsOnClient()
{
try {
$data['payments'] = [
0 => [
'client_id' => 1,
'amount' => 1,
]
];
Mail::fake();
Import::dispatchNow($data, $this->company, $this->user);
} catch (ResourceDependencyMissing $e) {
$this->assertTrue(true);
}
$data['payments'] = [
0 => [
'client_id' => 1,
'amount' => 1,
]
];
Import::dispatchNow($data, $this->company, $this->user);
Mail::assertSent(MigrationFailed::class);
}
public function testQuotesImport()
@ -410,8 +412,21 @@ class ImportTest extends TestCase
}
}*/
print_r($differences);
$this->assertCount(0, $differences);
}
public function testClientContactsImport()
{
$this->invoice->forceDelete();
$original = ClientContact::count();
$migration_file = base_path() . '/tests/Unit/Migration/migration.json';
$migration_array = json_decode(file_get_contents($migration_file), 1);
Import::dispatchNow($migration_array, $this->company, $this->user);
$this->assertGreaterThan($original, ClientContact::count());
}
}