From 60e0e849801069921d78068788707d6911745f29 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 9 Jul 2019 10:01:29 +1000 Subject: [PATCH] Fixes for tests - base PHP version now 7.3 --- app/Jobs/Account/CreateAccount.php | 8 +------- app/Jobs/User/CreateUser.php | 3 +++ app/Listeners/User/CreatedUserActivity.php | 2 +- app/Models/BaseModel.php | 2 +- app/Models/ClientContact.php | 3 +++ app/Models/CompanyUser.php | 3 +-- app/Models/User.php | 8 ++++++++ .../migrations/2014_10_13_000000_create_users_table.php | 2 -- database/seeds/RandomDataSeeder.php | 3 +++ package.json | 2 +- tests/Feature/ClientTest.php | 2 +- 11 files changed, 23 insertions(+), 15 deletions(-) diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php index 908bb8d2da97..ae8d645fbe80 100644 --- a/app/Jobs/Account/CreateAccount.php +++ b/app/Jobs/Account/CreateAccount.php @@ -58,18 +58,15 @@ class CreateAccount * Create company */ $company = CreateCompany::dispatchNow($this->request, $account); - /* * Set default company */ $account->default_company_id = $company->id; $account->save(); - /* * Create user */ $user = CreateUser::dispatchNow($this->request, $account, $company, true); //make user company_owner - /* * Required dependencies */ @@ -77,23 +74,20 @@ class CreateAccount auth()->login($user, false); $user->setCompany($company); - /* * Create token */ $company_token = CreateCompanyToken::dispatchNow($company, $user); - /* * Login user */ //Auth::loginUsingId($user->id, true); - /* * Fire related events */ if($user) event(new AccountCreated($user)); - + return $account; } } diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php index 399fbc84596a..7d3e6a10b03e 100644 --- a/app/Jobs/User/CreateUser.php +++ b/app/Jobs/User/CreateUser.php @@ -18,6 +18,7 @@ use App\Models\User; use App\Utils\Traits\MakesHash; use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Log; class CreateUser { @@ -30,6 +31,8 @@ class CreateUser protected $company; + protected $company_owner; + /** * Create a new job instance. * diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php index 78ba8bd1e6a1..628d60ad75ba 100644 --- a/app/Listeners/User/CreatedUserActivity.php +++ b/app/Listeners/User/CreatedUserActivity.php @@ -40,7 +40,7 @@ class CreatedUserActivity $fields = new \stdClass; - if(auth()->user()->id) + if(auth()->user()) $fields->user_id = auth()->user()->id; else $fields->user_id = $event->user->id; diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index 49ee3ba1bbf7..6e0bb4d56998 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -29,7 +29,7 @@ class BaseModel extends Model ///const CREATED_AT = 'creation_date'; //const UPDATED_AT = 'last_update'; - //protected $dateFormat = 'Y-m-d H:i:s.u'; + protected $dateFormat = 'Y-m-d H:i:s.u'; public function __call($method, $params) { diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php index 38b78d93cfb8..36ffad06d5f0 100644 --- a/app/Models/ClientContact.php +++ b/app/Models/ClientContact.php @@ -37,6 +37,9 @@ class ClientContact extends Authenticatable protected $dates = ['deleted_at']; + protected $dateFormat = 'Y-m-d H:i:s.u'; + + protected $fillable = [ 'first_name', 'last_name', diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php index cede911778a6..c322b16a364f 100644 --- a/app/Models/CompanyUser.php +++ b/app/Models/CompanyUser.php @@ -19,14 +19,13 @@ class CompanyUser extends Pivot { protected $guarded = ['id']; - /** * The attributes that should be cast to native types. * * @var array */ protected $casts = [ - 'settings' => 'collection', + 'settings' => 'object', 'permissions' => 'object', ]; diff --git a/app/Models/User.php b/app/Models/User.php index af6fa7ac758a..119531f709d9 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -45,6 +45,8 @@ class User extends Authenticatable implements MustVerifyEmail protected $with = ['companies','user_companies']; + protected $dateFormat = 'Y-m-d H:i:s.u'; + public $company; /** @@ -77,6 +79,11 @@ class User extends Authenticatable implements MustVerifyEmail 'slack_webhook_url', ]; + protected $casts = [ + 'settings' => 'object', + 'permissions' => 'object', + ]; + /** * Returns a account. * @@ -105,6 +112,7 @@ class User extends Authenticatable implements MustVerifyEmail public function companies() { return $this->belongsToMany(Company::class)->using(CompanyUser::class)->withPivot('permissions', 'settings', 'is_admin', 'is_owner', 'is_locked'); + } /** diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php index 6f2a01e71a04..e1b1a64194dc 100644 --- a/database/migrations/2014_10_13_000000_create_users_table.php +++ b/database/migrations/2014_10_13_000000_create_users_table.php @@ -172,8 +172,6 @@ class CreateUsersTable extends Migration $table->boolean('is_owner')->default(false); $table->boolean('is_admin'); $table->boolean('is_locked')->default(false); // locks user out of account - $table->timestamps(6); - $table->softDeletes(); $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); diff --git a/database/seeds/RandomDataSeeder.php b/database/seeds/RandomDataSeeder.php index 745889bba624..7691f15309eb 100644 --- a/database/seeds/RandomDataSeeder.php +++ b/database/seeds/RandomDataSeeder.php @@ -1,5 +1,6 @@ 1, 'is_admin' => 1, 'is_locked' => 0, + 'permissions' => json_encode([]), + 'settings' => json_encode(DefaultSettings::userSettings()), ]); $client = factory(\App\Models\Client::class)->create([ diff --git a/package.json b/package.json index 7ebc471da596..aa57d6838813 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "hashids": "^1.2.2", "laravel-echo": "^1.4.0", "lodash.get": "^4.4.2", - "puppeteer": "^1.15.0", + "puppeteer": "^1.18.1", "quill": "^1.3.6", "socket.io-client": "^2.1.1", "ts-loader": "3.5.0", diff --git a/tests/Feature/ClientTest.php b/tests/Feature/ClientTest.php index c436dbe4caa8..7f7aeaa55eaf 100644 --- a/tests/Feature/ClientTest.php +++ b/tests/Feature/ClientTest.php @@ -64,7 +64,7 @@ class ClientTest extends TestCase $acc = $response->json(); - +Log::error($acc); $account = Account::find($this->decodePrimaryKey($acc['data']['id'])); $token = $account->default_company->tokens->first()->token;