Fixes for forced migration

This commit is contained in:
David Bomba 2021-07-25 11:41:13 +10:00
parent ba45d0b272
commit 1a4b9ddac6

View File

@ -57,10 +57,16 @@ class ForceMigration extends Command
{
$data = [];
$company = Company::where('plan', 'free')
->where('is_migrated', false)
->with('accounts')
->first();
$company = Company::on(DB_NINJA_1)
->whereNull('plan')
->orWhereIn('plan', ['','free'])
->whereHas('accounts', function ($query){
$query->where('account_key', 'NOT LIKE', substr(NINJA_ACCOUNT_KEY, 0, 30) . '%');
})
->with('accounts')
->withCount('accounts')
->having('accounts_count', '>=', 1)
->first();
$user = $company->accounts->first()->users()->whereNull('public_id')->orWhere('public_id', 0)->first();
$db = DB_NINJA_1;
@ -72,7 +78,6 @@ class ForceMigration extends Command
$data['companies'][$key]['id'] = $account->id;
}
$this->dispatch(new HostedMigration($user, $data, $db, true));