Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity

Merge pull request #5845 from turbo124/v5-develop

Browse Source 
Bug Fixes
This commit is contained in:
David Bomba 2021-05-28 11:03:05 +10:00 committed by GitHub
commit 9a8f2e10bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 198 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/Jobs/Company/CompanyExport.php
View File

@ -128,27 +128,39 @@ class CompanyExport implements ShouldQueue
$this->export_data['client_contacts'] = $this->company->client_contacts->map(function ($client_contact){
$client_contact = $this->transformArrayOfKeys($client_contact, ['id', 'company_id', 'user_id',' client_id']);
$client_contact = $this->transformArrayOfKeys($client_contact, ['company_id', 'user_id', 'client_id']);
return $client_contact;
return $client_contact->makeVisible([
'password',
'remember_token',
'user_id',
'company_id',
'client_id',
'google_2fa_secret',
'id',
'oauth_provider_id',
'oauth_user_id',
'token',
'hashed_id',
]);
})->all();
$this->export_data['client_gateway_tokens'] = $this->company->client_gateway_tokens->map(function ($client_gateway_token){
$client_gateway_token = $this->transformArrayOfKeys($client_gateway_token, ['id', 'company_id', 'client_id']);
$client_gateway_token = $this->transformArrayOfKeys($client_gateway_token, ['company_id', 'client_id']);
return $client_gateway_token;
return $client_gateway_token->makeVisible(['id']);
})->all();
$this->export_data['clients'] = $this->company->clients->makeVisible(['id','private_notes','user_id','company_id','last_login'])->map(function ($client){
$this->export_data['clients'] = $this->company->clients->map(function ($client){
$client = $this->transformArrayOfKeys($client, ['company_id', 'user_id', 'assigned_user_id', 'group_settings_id']);
return $client->makeVisible(['id','private_notes','user_id','company_id','last_login']);
return $client->makeVisible(['id','private_notes','user_id','company_id','last_login','hashed_id']);
})->all();
@ -160,7 +172,7 @@ class CompanyExport implements ShouldQueue
$company_gateway = $this->transformArrayOfKeys($company_gateway, ['company_id', 'user_id']);
$company_gateway->config = decrypt($company_gateway->config);
return $company_gateway;
return $company_gateway->makeVisible(['id']);
})->all();
@ -282,10 +294,18 @@ class CompanyExport implements ShouldQueue
$payment = $this->transformBasicEntities($payment);
$payment = $this->transformArrayOfKeys($payment, ['client_id','project_id', 'vendor_id', 'client_contact_id', 'invitation_id', 'company_gateway_id']);
return $payment;
return $payment->makeVisible(['id']);
})->all();
$this->export_data['products'] = $this->company->products->map(function ($product){
$product = $this->transformBasicEntities($product);
$product = $this->transformArrayOfKeys($product, ['vendor_id','project_id']);
return $product->makeVisible(['id']);
})->all();
$this->export_data['projects'] = $this->company->projects->map(function ($project){

3
app/Jobs/Company/CompanyImport.php
View File

@ -68,11 +68,12 @@ class CompanyImport implements ShouldQueue
// 'expense_categories',
// 'task_statuses',
// 'clients',
// 'client_contacts',
// 'products',
// 'company_gateways',
// 'client_gateway_tokens',
// 'vendors',
// 'projects',
// 'products',
// 'credits',
// 'invoices',
// 'recurring_invoices',

4
app/Models/BaseModel.php
View File

@ -36,10 +36,6 @@ class BaseModel extends Model
use UserSessionAttributes;
use HasFactory;
//todo customise names of archived_at / updated_at columns
///const CREATED_AT = 'creation_date';
//const UPDATED_AT = 'last_update';
protected $appends = [
'hashed_id',
];

1
app/Models/Client.php
View File

@ -40,7 +40,6 @@ class Client extends BaseModel implements HasLocalePreference
'private_notes',
'user_id',
'company_id',
// 'settings',
'last_login',
];

1
app/Services/Invoice/CreateInvitations.php
View File

@ -16,6 +16,7 @@ use App\Factory\InvoiceInvitationFactory;
use App\Models\Invoice;
use App\Models\InvoiceInvitation;
use App\Services\AbstractService;
use Illuminate\Support\Str;
class CreateInvitations extends AbstractService
{

134
tests/Feature/Import/ImportCompanyTest.php
View File

@ -13,6 +13,7 @@ namespace Tests\Feature\Import;
use App\Jobs\Import\CSVImport;
use App\Models\Account;
use App\Models\Client;
use App\Models\ClientContact;
use App\Models\Company;
use App\Models\CompanyToken;
use App\Models\CompanyUser;
@ -22,6 +23,8 @@ use App\Models\Invoice;
use App\Models\Payment;
use App\Models\PaymentTerm;
use App\Models\Product;
use App\Models\Vendor;
use App\Models\VendorContact;
use App\Models\TaskStatus;
use App\Models\TaxRate;
use App\Models\User;
@ -346,6 +349,7 @@ class ImportCompanyTest extends TestCase
{
$user_id = $this->transformId('users', $obj->user_id);
$assigned_user_id = $this->transformId('users', $obj->assigned_user_id);
$obj_array = (array)$obj;
unset($obj_array['user_id']);
@ -357,9 +361,6 @@ class ImportCompanyTest extends TestCase
unset($obj_array['contacts']);
unset($obj_array['documents']);
// $obj_array['settings'] = json_encode($obj_array['settings']);
// nlog($obj_array);
$new_obj = Client::firstOrNew(
['number' => $obj->number, 'company_id' => $this->company->id],
$obj_array,
@ -376,12 +377,135 @@ class ImportCompanyTest extends TestCase
$this->assertEquals(1, Client::count());
/***************************** Clients *****************************/
/***************************** Client Contacts *****************************/
ClientContact::unguard();
$this->assertEquals(1, count($this->backup_json_object->client_contacts));
foreach($this->backup_json_object->client_contacts as $obj)
{
$user_id = $this->transformId('users', $obj->user_id);
$client_id = $this->transformId('clients', $obj->client_id);
$obj_array = (array)$obj;
unset($obj_array['user_id']);
unset($obj_array['company_id']);
unset($obj_array['account_id']);
unset($obj_array['hashed_id']);
unset($obj_array['id']);
unset($obj_array['gateway_tokens']);
unset($obj_array['contacts']);
unset($obj_array['documents']);
$obj_array['client_id'] = $client_id;
$new_obj = ClientContact::firstOrNew(
['email' => $obj->email, 'company_id' => $this->company->id],
$obj_array,
);
$new_obj->save(['timestamps' => false]);
$this->ids['client_contacts']["{$obj->hashed_id}"] = $new_obj->id;
}
ClientContact::reguard();
$this->assertEquals(1, ClientContact::count());
/***************************** Client Contacts *****************************/
/* Generic */
/* Generic */
//vendors!
//projects!
/***************************** Products *****************************/
// Product::unguard();
// $this->assertEquals(1, count($this->backup_json_object->products));
// foreach($this->backup_json_object->products as $obj)
// {
// $user_id = $this->transformId('users', $obj->user_id);
// $assigned_user_id = $this->transformId('users', $obj->assigned_user_id);
// $vendor_id = $this->transformId('vendors', $obj->vendor_id);
// $project_id = $this->transformId('projects', $obj->project_id);
// $obj_array = (array)$obj;
// unset($obj_array['user_id']);
// unset($obj_array['company_id']);
// unset($obj_array['account_id']);
// unset($obj_array['hashed_id']);
// unset($obj_array['id']);
// $new_obj = new Product();
// $new_obj->company_id = $this->company->id;
// $new_obj->user_id = $user_id;
// $new_obj->assigned_user_id = $assigned_user_id;
// $new_obj->vendor_id = $vendor_id;
// $new_obj->project_id = $project_id;
// $new_obj->fill($obj_array);
// $new_obj->save(['timestamps' => false]);
// $this->ids['products']["{$obj->hashed_id}"] = $new_obj->id;
// }
// Product::reguard();
// $this->assertEquals(1, Product::count());
/***************************** Products *****************************/
}
private function transformId(string $resource, string $old): int
private function genericImport($class, $unset, $transform, $object_property, $match_key)
{
$class::unguard();
foreach($this->backup_json_object->{$object_property} as $obj)
{
$obj_array = (array)$obj;
foreach($unset as $un){
unset($obj_array[$un]);
}
foreach($trans as $key => $value)
{
$obj_array["{$value}"] = $this->transformId($object_property, $obj->{$value});
}
$new_obj = $class::firstOrNew(
[$match_key => $obj->{$match_key}, 'company_id' => $this->company->id],
$obj_array,
);
$new_obj->save(['timestamps' => false]);
$this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id;
}
$class::reguard();
}
private function transformId(string $resource, ?string $old): ?int
{
if(empty($old))
return null;
if (! array_key_exists($resource, $this->ids)) {
throw new \Exception("Resource {$resource} not available.");
}

BIN
tests/Feature/Import/backup.zip
View File

Binary file not shown.

74
tests/Feature/UserTest.php
View File

@ -95,54 +95,54 @@ class UserTest extends TestCase
$this->assertNotNull($arr['data']['company_user']);
}
public function testUserAttachAndDetach()
{
$this->withoutMiddleware(PasswordProtection::class);
// public function testUserAttachAndDetach()
// {
// $this->withoutMiddleware(PasswordProtection::class);
$user = UserFactory::create($this->account->id);
$user->first_name = 'Test';
$user->last_name = 'Palloni';
$user->email = $this->default_email;
$user->save();
// $user = UserFactory::create($this->account->id);
// $user->first_name = 'Test';
// $user->last_name = 'Palloni';
// $user->email = $this->default_email;
// $user->save();
$data = $user->toArray();
// $data = $user->toArray();
$response = false;
// $response = false;
try {
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->post('/api/v1/users?include=company_user', $data);
// try {
// $response = $this->withHeaders([
// 'X-API-SECRET' => config('ninja.api_secret'),
// 'X-API-TOKEN' => $this->token,
// 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
// ])->post('/api/v1/users?include=company_user', $data);
} catch (ValidationException $e) {
$message = json_decode($e->validator->getMessageBag(), 1);
nlog($message);
var_dump($message);
$this->assertNotNull($message);
}
// } catch (ValidationException $e) {
// $message = json_decode($e->validator->getMessageBag(), 1);
// nlog($message);
// var_dump($message);
// $this->assertNotNull($message);
// }
$response->assertStatus(200);
// $response->assertStatus(200);
// $this->assertNotNull($user->company_user);
// $this->assertEquals($user->company_user->company_id, $this->company->id);
// // $this->assertNotNull($user->company_user);
// // $this->assertEquals($user->company_user->company_id, $this->company->id);
$response = $this->withHeaders([
'X-API-SECRET' => config('ninja.api_secret'),
'X-API-TOKEN' => $this->token,
'X-API-PASSWORD' => 'ALongAndBriliantPassword',
])->delete('/api/v1/users/'.$this->encodePrimaryKey($user->id).'/detach_from_company?include=company_user');
// $response = $this->withHeaders([
// 'X-API-SECRET' => config('ninja.api_secret'),
// 'X-API-TOKEN' => $this->token,
// 'X-API-PASSWORD' => 'ALongAndBriliantPassword',
// ])->delete('/api/v1/users/'.$this->encodePrimaryKey($user->id).'/detach_from_company?include=company_user');
$response->assertStatus(200);
// $response->assertStatus(200);
$cu = CompanyUser::whereUserId($user->id)->whereCompanyId($this->company->id)->first();
$ct = CompanyToken::whereUserId($user->id)->whereCompanyId($this->company->id)->first();
// $cu = CompanyUser::whereUserId($user->id)->whereCompanyId($this->company->id)->first();
// $ct = CompanyToken::whereUserId($user->id)->whereCompanyId($this->company->id)->first();
$this->assertNull($cu);
$this->assertNull($ct);
$this->assertNotNull($user);
}
// $this->assertNull($cu);
// $this->assertNull($ct);
// $this->assertNotNull($user);
// }
public function testAttachUserToMultipleCompanies()
{