From eca7d37c2e26f7d085127fdeda3fd5b0f8f63698 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 May 2021 13:29:54 +1000 Subject: [PATCH 1/2] Remove strict dependencies for MySQL --- app/Utils/SystemHealth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index 3d1d72317977..dc7a9f6b0bac 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -25,7 +25,7 @@ use Illuminate\Support\Facades\Queue; class SystemHealth { private static $extensions = [ - 'mysqli', + // 'mysqli', 'gd', 'curl', 'zip', @@ -34,7 +34,7 @@ class SystemHealth 'mbstring', 'xml', 'bcmath', - 'mysqlnd', + // 'mysqlnd', //'intl', //todo double check whether we need this for email dns validation ]; From 817f7c685f849a56d1800491f8098acb0a03fdba Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 28 May 2021 18:37:08 +1000 Subject: [PATCH 2/2] Import company --- .../ValidationRules/User/AttachableUser.php | 2 +- app/Jobs/Company/CompanyExport.php | 39 +-- app/Jobs/Company/CompanyImport.php | 5 +- tests/Feature/Import/ImportCompanyTest.php | 233 ++++++++++++++---- tests/Feature/Import/backup.zip | Bin 12865 -> 12888 bytes 5 files changed, 216 insertions(+), 63 deletions(-) diff --git a/app/Http/ValidationRules/User/AttachableUser.php b/app/Http/ValidationRules/User/AttachableUser.php index db7cec97a3e3..35237377eed3 100644 --- a/app/Http/ValidationRules/User/AttachableUser.php +++ b/app/Http/ValidationRules/User/AttachableUser.php @@ -58,7 +58,7 @@ class AttachableUser implements Rule if(!$user) return true; - $user_already_attached = CompanyUser::query() + $user_already_attached = CompanyUser::query() ->where('user_id', $user->id) ->where('account_id',$user->account_id) ->where('company_id', auth()->user()->company()->id) diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 13ec256dfb81..8fa94893d591 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -121,7 +121,7 @@ class CompanyExport implements ShouldQueue $user->account_id = $this->encodePrimaryKey($user->account_id); // $user->id = $this->encodePrimaryKey($user->id); - return $user; + return $user->makeVisible(['id']); })->all(); @@ -205,7 +205,7 @@ class CompanyExport implements ShouldQueue $credit = $this->transformBasicEntities($credit); $credit = $this->transformArrayOfKeys($credit, ['recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id','invoice_id']); - return $credit; + return $credit->makeVisible(['id']); })->all(); @@ -214,7 +214,7 @@ class CompanyExport implements ShouldQueue $credit = $this->transformArrayOfKeys($credit, ['company_id', 'user_id', 'client_contact_id', 'recurring_invoice_id']); - return $credit; + return $credit->makeVisible(['id']); })->all(); @@ -224,7 +224,7 @@ class CompanyExport implements ShouldQueue $document = $this->transformArrayOfKeys($document, ['user_id', 'assigned_user_id', 'company_id', 'project_id', 'vendor_id']); - return $document; + return $document->makeVisible(['id']); })->all(); @@ -232,7 +232,7 @@ class CompanyExport implements ShouldQueue $expense_category = $this->transformArrayOfKeys($expense_category, ['user_id', 'company_id']); - return $expense_category; + return $expense_category->makeVisible(['id']); })->all(); @@ -242,7 +242,7 @@ class CompanyExport implements ShouldQueue $expense = $this->transformBasicEntities($expense); $expense = $this->transformArrayOfKeys($expense, ['vendor_id', 'invoice_id', 'client_id', 'category_id', 'recurring_expense_id','project_id']); - return $expense; + return $expense->makeVisible(['id']); })->all(); @@ -250,7 +250,7 @@ class CompanyExport implements ShouldQueue $gs = $this->transformArrayOfKeys($gs, ['user_id', 'company_id']); - return $gs; + return $gs->makeVisible(['id']); })->all(); @@ -260,7 +260,7 @@ class CompanyExport implements ShouldQueue $invoice = $this->transformBasicEntities($invoice); $invoice = $this->transformArrayOfKeys($invoice, ['recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id']); - return $invoice; + return $invoice->makeVisible(['id']); })->all(); @@ -269,7 +269,7 @@ class CompanyExport implements ShouldQueue $invoice = $this->transformArrayOfKeys($invoice, ['company_id', 'user_id', 'client_contact_id', 'recurring_invoice_id']); - return $invoice; + return $invoice->makeVisible(['id']); })->all(); @@ -312,7 +312,7 @@ class CompanyExport implements ShouldQueue $project = $this->transformBasicEntities($project); $project = $this->transformArrayOfKeys($project, ['client_id']); - return $project; + return $project->makeVisible(['id']); })->all(); @@ -321,7 +321,7 @@ class CompanyExport implements ShouldQueue $quote = $this->transformBasicEntities($quote); $quote = $this->transformArrayOfKeys($quote, ['invoice_id','recurring_id','client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id']); - return $quote; + return $quote->makeVisible(['id']); })->all(); @@ -339,7 +339,8 @@ class CompanyExport implements ShouldQueue $ri = $this->transformBasicEntities($ri); $ri = $this->transformArrayOfKeys($ri, ['client_id', 'vendor_id', 'project_id', 'design_id', 'subscription_id']); - return $ri; + + return $ri->makeVisible(['id']); })->all(); @@ -357,7 +358,13 @@ class CompanyExport implements ShouldQueue $subscription = $this->transformBasicEntities($subscription); $subscription->group_id = $this->encodePrimaryKey($subscription->group_id); - return $subscription; + return $subscription->makeVisible([ 'id', + 'user_id', + 'assigned_user_id', + 'company_id', + 'product_ids', + 'recurring_product_ids', + 'group_id']); })->all(); @@ -376,7 +383,7 @@ class CompanyExport implements ShouldQueue $task = $this->transformBasicEntities($task); $task = $this->transformArrayOfKeys($task, ['client_id', 'invoice_id', 'project_id', 'status_id']); - return $task; + return $task->makeVisible(['id']); })->all(); @@ -401,7 +408,7 @@ class CompanyExport implements ShouldQueue $this->export_data['vendors'] = $this->company->vendors->map(function ($vendor){ - return $this->transformBasicEntities($vendor); + return $this->transformBasicEntities($vendor)->makeVisible(['id']); })->all(); @@ -411,7 +418,7 @@ class CompanyExport implements ShouldQueue $vendor = $this->transformBasicEntities($vendor); $vendor->vendor_id = $this->encodePrimaryKey($vendor->vendor_id); - return $vendor; + return $vendor->makeVisible(['id']); })->all(); diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 969f4938d43a..3a718e579024 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -70,10 +70,11 @@ class CompanyImport implements ShouldQueue // 'clients', // 'client_contacts', // 'products', - // 'company_gateways', - // 'client_gateway_tokens', // 'vendors', // 'projects', + // 'company_gateways', + // 'client_gateway_tokens', + // 'group_settings', // 'credits', // 'invoices', // 'recurring_invoices', diff --git a/tests/Feature/Import/ImportCompanyTest.php b/tests/Feature/Import/ImportCompanyTest.php index a4ec557d0fdc..ce60bcb08c6e 100644 --- a/tests/Feature/Import/ImportCompanyTest.php +++ b/tests/Feature/Import/ImportCompanyTest.php @@ -14,21 +14,27 @@ use App\Jobs\Import\CSVImport; use App\Models\Account; use App\Models\Client; use App\Models\ClientContact; +use App\Models\ClientGatewayToken; use App\Models\Company; +use App\Models\CompanyGateway; use App\Models\CompanyToken; use App\Models\CompanyUser; use App\Models\Expense; use App\Models\ExpenseCategory; +use App\Models\GroupSetting; 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\Project; +use App\Models\RecurringInvoice; +use App\Models\RecurringInvoiceInvitation; +use App\Models\Subscription; use App\Models\TaskStatus; use App\Models\TaxRate; use App\Models\User; use App\Models\Vendor; +use App\Models\VendorContact; use App\Utils\Traits\MakesHash; use Illuminate\Routing\Middleware\ThrottleRequests; use Illuminate\Support\Facades\Cache; @@ -416,75 +422,200 @@ class ImportCompanyTest extends TestCase $this->assertEquals(1, ClientContact::count()); /***************************** Client Contacts *****************************/ - /* Generic */ - - - /* Generic */ - //vendors! + /* Generic */ + $this->assertEquals(1, count($this->backup_json_object->vendors)); + + $this->genericImport(Vendor::class, + ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id'], + [['users' => 'user_id'], ['users' =>'assigned_user_id']], + 'vendors', + 'number'); + + $this->assertEquals(1, Vendor::count()); + + /* Generic */ + + $this->assertEquals(1, count($this->backup_json_object->projects)); + //$class, $unset, $transforms, $object_property, $match_key + $this->genericImport(Project::class, + ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id','client_id'], + [['users' => 'user_id'], ['users' =>'assigned_user_id'], ['clients' => 'client_id']], + 'projects', + 'number'); + + $this->assertEquals(1, Project::count()); + //projects! - /***************************** Products *****************************/ - // Product::unguard(); +//products! - // $this->assertEquals(1, count($this->backup_json_object->products)); + $this->assertEquals(1, count($this->backup_json_object->products)); - // foreach($this->backup_json_object->products as $obj) - // { + $this->genericNewClassImport(Product::class, + ['user_id', 'company_id', 'hashed_id', 'id'], + [['users' => 'user_id'], ['users' =>'assigned_user_id'], ['vendors' => 'vendor_id'], ['projects' => 'project_id']], + 'products' + ); + $this->assertEquals(1, Product::count()); - // $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); +//company gateways - // $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']); - + $this->assertEquals(1, count($this->backup_json_object->company_gateways)); - // $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); + $this->genericNewClassImport(CompanyGateway::class, + ['user_id', 'company_id', 'hashed_id', 'id'], + [['users' => 'user_id']], + 'company_gateways' + ); - // $new_obj->save(['timestamps' => false]); - - // $this->ids['products']["{$obj->hashed_id}"] = $new_obj->id; + $this->assertEquals(1, CompanyGateway::count()); - // } +//company gateways - // Product::reguard(); - - // $this->assertEquals(1, Product::count()); - /***************************** Products *****************************/ +//client gateway tokens + + $this->genericNewClassImport(ClientGatewayToken::class, + ['company_id', 'id', 'hashed_id','client_id'], + [['clients' => 'client_id']], + 'client_gateway_tokens'); + +//client gateway tokens + +//Group Settings + $this->genericImport(GroupSetting::class, + ['user_id', 'company_id', 'id', 'hashed_id',], + [['users' => 'user_id']], + 'group_settings', + 'name'); +//Group Settings + +//Subscriptions + $this->assertEquals(1, count($this->backup_json_object->subscriptions)); + + $this->genericImport(Subscription::class, + ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id',], + [['group_settings' => 'group_id'], ['users' => 'user_id'], ['users' => 'assigned_user_id']], + 'subscriptions', + 'name'); + + $this->assertEquals(1, Subscription::count()); + +//Subscriptions + +// Recurring Invoices + + $this->assertEquals(2, count($this->backup_json_object->recurring_invoices)); + + $this->genericImport(RecurringInvoice::class, + ['user_id', 'assigned_user_id', 'company_id', 'id', 'hashed_id', 'client_id','subscription_id','project_id','vendor_id','status'], + [ + ['subscriptions' => 'subscription_id'], + ['users' => 'user_id'], + ['users' => 'assigned_user_id'], + ['clients' => 'client_id'], + ['projects' => 'project_id'], + ['vendors' => 'vendor_id'], + ['clients' => 'client_id'], + ], + 'recurring_invoices', + 'number'); + + $this->assertEquals(2, RecurringInvoice::count()); + +// Recurring Invoices + + +// Recurring Invoice Invitations + + $this->assertEquals(2, count($this->backup_json_object->recurring_invoice_invitations)); +nlog($this->backup_json_object->recurring_invoice_invitations); + $this->genericImport(RecurringInvoiceInvitation::class, + ['user_id', 'client_contact_id', 'company_id', 'id', 'hashed_id'], + [ + ['users' => 'user_id'], + ['recurring_invoices' => 'recurring_invoice_id'], + ['client_contacts' => 'client_contact_id'], + ], + 'recurring_invoice_invitations', + 'key'); + + $this->assertEquals(2, RecurringInvoiceInvitation::count()); + +// Recurring Invoice Invitations + } - private function genericImport($class, $unset, $transform, $object_property, $match_key) + private function genericNewClassImport($class, $unset, $transforms, $object_property) { $class::unguard(); - foreach($this->backup_json_object->{$object_property} as $obj) { - + /* Remove unwanted keys*/ $obj_array = (array)$obj; foreach($unset as $un){ unset($obj_array[$un]); } - foreach($trans as $key => $value) + /* Transform old keys to new keys */ + foreach($transforms as $transform) { - $obj_array["{$value}"] = $this->transformId($object_property, $obj->{$value}); + foreach($transform as $key => $value) + { + $obj_array["{$value}"] = $this->transformId($key, $obj->{$value}); + } } + if($class instanceof CompanyGateway) { + $obj_array['config'] = encrypt($obj_array['config']); + } + + $new_obj = new $class(); + $new_obj->company_id = $this->company->id; + $new_obj->fill($obj_array); + + $new_obj->save(['timestamps' => false]); + + $this->ids["{$object_property}"]["{$obj->hashed_id}"] = $new_obj->id; + + } + + $class::reguard(); + + + } + + private function genericImport($class, $unset, $transforms, $object_property, $match_key) + { + + $class::unguard(); + + foreach($this->backup_json_object->{$object_property} as $obj) + { + /* Remove unwanted keys*/ + $obj_array = (array)$obj; + foreach($unset as $un){ + unset($obj_array[$un]); + } + + /* Transform old keys to new keys */ + foreach($transforms as $transform) + { + foreach($transform as $key => $value) + { + $obj_array["{$value}"] = $this->transformId($key, $obj->{$value}); + } + } + + /* New to convert product ids from old hashes to new hashes*/ + if($class instanceof Subscription){ + $obj_array['product_ids'] = $this->recordProductIds($obj_array['product_ids']); + $obj_array['recurring_product_ids'] = $this->recordProductIds($obj_array['recurring_product_ids']); + } + $new_obj = $class::firstOrNew( [$match_key => $obj->{$match_key}, 'company_id' => $this->company->id], $obj_array, @@ -497,8 +628,22 @@ class ImportCompanyTest extends TestCase } $class::reguard(); - + + } + private function recordProductIds($ids) + { + + $id_array = explode(",", $ids); + + $tmp_arr = []; + + foreach($id_array as $id) { + + $tmp_arr[] = $this->encodePrimaryKey($this->transformId('products', $id)); + } + + return implode(",", $tmp_arr); } private function transformId(string $resource, ?string $old): ?int diff --git a/tests/Feature/Import/backup.zip b/tests/Feature/Import/backup.zip index 4f613405b01020b44d99135800c355f3ef9077b7..fec0e85ceba85bd3a0605dd32d02f525344ac5dd 100644 GIT binary patch delta 1264 zcmV@6aWAK0069tkqjO)^_j3>`nX!bXEPpqYOZgw? z-%D{lNSUyi|LfuD(aGm#-q^Yfu7mz@w|jNF=Z?(w`3Ivj9ND*5$JW-CpWpm+a(23D z?OfS*Z!2gT!Oqu%{lTS~Qx1YT&D$s7I8-@!eug72MY7U0F8oA|b6Pw7(!Rdx>dy9d z^KAD9eJXZ7`0w6ynn8P`cz=9Ub*-k?y!DXx&cEGsw>tLQosYrSw}HKLGT2v3Hhp?i zKT-7bC7W>2i4($OASgq_%qA~`$w9J4o6sMjG2wPy{*seOnQFu5>9ex#h`e*yM2^Fs z2iEDE6<9->fuxYg%U^`(hYx<~?D?-GE%0npR%MK04ZOGnRxqxdH-DyY5qh>ov{=Ma zA6o%+HhVKNC3MZm$ijVVfK@o=)OJ}Z;Ts?9xwELS?>H*%IX(9F2X7#3otmVSXif$(3|l6|N>4hN0!WVAxlQ z?M`10B+uH}efo-B-l(jR=c4lL4LcR`KBYyADm`__Uu*rLxas89fwYcKL+&U8=<>z& ztavS=n%<3+8_*2(4QP+B43H)U@!eas&j5dVgI9d;7L}myfS*ahk+-q39`MmEjdj9*KMe+kkI|@~3W%a&71Qa({rzn{L_I zxg{a|J`}fi2VaccT*{G7D^atI0nZEO?!Lv2WvAXby?D390>pCe znjYK!Yk%3EA3ps}iVgQ)I0bW&TM1ubI-I(3JgVvh#J#wiFJ%&W-hEDtjIrH%i zk!QDT+0rE5A+JjgLMtLdR_Ndaxw zZ9AxLw9LAXu#n*@t0%UM0l~d?)Q5KWe^5&Y2wrBT`RFhJ0A%q3 z08mQ-0u%!j000000IZ6WgfT1%^_j3>`@6aWAK000C(kqjORc@?l=e-*G`d=-~z!Gxw7rvR?swpov#P` zgG)1~90haQw@<)xsPgdq3{PH)WTkst_>mgtw08QXeSOu{o$c-B+3pScRP224-@WNH zgZ4&$@%X6fT1~Hc>ml!*f4k{!b?mo0AA_%N1AFIWu&e41V^5BPb{Sr4h7#8-(<8KL1*f+FeC;~Dzkk}(dOVHp)l`g7>1Vff)!mQhBAGskGvsg_vw>yd84vM-e$_P2jf&Q_mpNTs&v8~e;W0N zf|QefdTG&|29r?+(6xf=S+U`-no5n7>&6WAbz_fUb4#OLd}LO=K*yinpx2|%&5;?y z?xH&D2><-Un8#|sSc&RkeEXK0+$flTM0~67x|)2vlDDqZu+uS9zg)LTft?%54a?>3 zHp%{BK>t|0f2dCsR|-mi#B%qKf1*m&R`iM4r0~OfOZZYZOC#^fa(({BY+gBZU;O8v z5linc@`)0;36d`yDn|>i?Flxj##-QNmivTjY|K&P_dN}d+%|n`_vzNSFh`Alx5%@v zPq(VYDZ@E>F?=?AIWgNS)&WJeJxA%2mEw)O^YJvE#l%Zf6RjBXt8_O!4Erg!h8LAG z;p~6f5ZSM+m1bf;v8HCbQU0_GxQi*ShoaK;@K9bte>)Vm)80~#HIH|UJdmDof#qHg}7h^YcE)GTAb^Mbi+ zZLu@ZsTVvi-fgh}v7Ec6$M)J$B|3x={X1DL4wI+T1 zTk1lOAyK+}5OZ{>r%@w(d}tKxC>0GhYcw^G8bDoL!1+(MWT1j zLC}c@u}H*fdT3ixK-+cO4yqe1v+g4-q<90S*+hLJ0lMKv*!BfO)x=}R^yDx8ps_^q z?b~>i;u&UyRS@6eWN&H