From c78f43f0a6ea2270b448b1ea1a550e98ad344cfc Mon Sep 17 00:00:00 2001 From: Roberto Guido Date: Tue, 19 Dec 2023 01:12:22 +0100 Subject: [PATCH] =?UTF-8?q?fix=20pannello=20quantit=C3=A0=20prodotti=20in?= =?UTF-8?q?=20ordine=20con=20multi-gas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/app/User.php | 5 --- code/resources/views/order/fixes.blade.php | 6 ++-- code/tests/Services/UsersServiceTest.php | 42 +++++++++++++--------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/code/app/User.php b/code/app/User.php index bd98173f..7a3a009b 100644 --- a/code/app/User.php +++ b/code/app/User.php @@ -81,11 +81,6 @@ public function suppliers(): BelongsToMany return $this->belongsToMany('App\Supplier'); } - public function allnotifications(): BelongsToMany - { - return $this->belongsToMany('App\Notification')->orderBy('start_date', 'desc'); - } - public function shippingplace(): BelongsTo { return $this->belongsTo('App\Delivery', 'preferred_delivery_id'); diff --git a/code/resources/views/order/fixes.blade.php b/code/resources/views/order/fixes.blade.php index 438b4dac..6f66edd6 100644 --- a/code/resources/views/order/fixes.blade.php +++ b/code/resources/views/order/fixes.blade.php @@ -96,17 +96,17 @@ - + diff --git a/code/tests/Services/UsersServiceTest.php b/code/tests/Services/UsersServiceTest.php index 1876ce97..c118e351 100644 --- a/code/tests/Services/UsersServiceTest.php +++ b/code/tests/Services/UsersServiceTest.php @@ -5,10 +5,13 @@ use Illuminate\Foundation\Testing\DatabaseTransactions; use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Hash; use Tests\TestCase; use App\Exceptions\IllegalArgumentException; use App\Exceptions\AuthException; +use App\User; +use App\Supplier; class UsersServiceTest extends TestCase { @@ -25,18 +28,18 @@ public function setUp(): void $this->actingAs($this->userAdmin); $role = \App\Role::factory()->create(['actions' => 'users.self,users.subusers']); app()->make('RolesService')->setMasterRole($this->gas, 'user', $role->id); - $this->userWithBasePerm = \App\User::factory()->create(['gas_id' => $this->gas->id]); + $this->userWithBasePerm = User::factory()->create(['gas_id' => $this->gas->id]); $this->userWithBasePerm->addRole($role->id, $this->gas); - $this->userWithNoPerms = \App\User::factory()->create(['gas_id' => $this->gas->id]); + $this->userWithNoPerms = User::factory()->create(['gas_id' => $this->gas->id]); - $this->supplier = \App\Supplier::factory()->create(); + $this->supplier = Supplier::factory()->create(); $this->userWithShippingPerms = $this->createRoleAndUser($this->gas, 'supplier.shippings', $this->supplier); - \App\User::factory()->count(3)->create(['gas_id' => $this->gas->id]); + User::factory()->count(3)->create(['gas_id' => $this->gas->id]); $otherGas = \App\Gas::factory()->create(); - \App\User::factory()->count(3)->create(['gas_id' => $otherGas->id]); + User::factory()->count(3)->create(['gas_id' => $otherGas->id]); } /* @@ -86,7 +89,7 @@ public function testCease() ]); $this->actingAs($this->userWithViewPerm); - $users = app()->make('UsersService')->list(); + $users = app()->make('UsersService')->list('', true); $this->assertEquals($initial_count - 1, $users->count()); } @@ -97,17 +100,17 @@ public function testListWithSearchParam() { $this->actingAs($this->userWithViewPerm); - $user1 = \App\User::factory()->create([ + $user1 = User::factory()->create([ 'gas_id' => $this->gas->id, 'firstname' => 'pippo' ]); - $user2 = \App\User::factory()->create([ + $user2 = User::factory()->create([ 'gas_id' => $this->gas->id, 'lastname' => 'super pippo' ]); - \App\User::factory()->create([ + User::factory()->create([ 'gas_id' => $this->gas->id, 'firstname' => 'luigi' ]); @@ -168,7 +171,7 @@ public function testStore() ]); $this->assertEquals('test user', $newUser->username); - $this->assertTrue(\Hash::check('password', $newUser->password)); + $this->assertTrue(Hash::check('password', $newUser->password)); $this->assertEquals('rossi mario', $newUser->printableName()); $this->assertEquals(0, $newUser->pending_balance); } @@ -199,6 +202,8 @@ public function testStoreAndMail() */ public function testStoreFriend() { + $initial_count = $users->count(); + $this->actingAs($this->userWithViewPerm); $newUser = app()->make('UsersService')->storeFriend([ @@ -211,13 +216,16 @@ public function testStoreFriend() $this->nextRound(); $parent = app()->make('UsersService')->show($this->userWithViewPerm->id); + $newUser = app()->make('UsersService')->show($newUser->id); $this->assertEquals('test friend user', $newUser->username); $this->assertEquals(1, $parent->friends->count()); $this->assertEquals($parent->id, $newUser->parent_id); - $this->assertTrue(\Hash::check('password', $newUser->password)); + $this->assertTrue(Hash::check('password', $newUser->password)); $this->assertEquals('rossi mario', $newUser->printableName()); $this->assertEquals(0, $newUser->pending_balance); + + $this->assertEquals($initial_count, User::query()->creditable()->count()); } /* @@ -300,7 +308,7 @@ public function testUpdate() { $this->actingAs($this->userWithAdminPerm); - $user = \App\User::factory()->create([ + $user = User::factory()->create([ 'gas_id' => $this->gas->id ]); @@ -321,9 +329,9 @@ public function testInvalidUsername() $this->expectException(IllegalArgumentException::class); $this->actingAs($this->userWithAdminPerm); - $sample = \App\User::inRandomOrder()->first(); + $sample = User::inRandomOrder()->first(); - $user = \App\User::factory()->create([ + $user = User::factory()->create([ 'gas_id' => $this->gas->id ]); @@ -340,9 +348,9 @@ public function testInvalidCardNumber() $this->expectException(IllegalArgumentException::class); $this->actingAs($this->userWithAdminPerm); - $sample = \App\User::where('gas_id', $this->gas->id)->where('card_number', '!=', '')->whereNotNull('card_number')->inRandomOrder()->first(); + $sample = User::where('gas_id', $this->gas->id)->where('card_number', '!=', '')->whereNotNull('card_number')->inRandomOrder()->first(); - $user = \App\User::factory()->create([ + $user = User::factory()->create([ 'gas_id' => $this->gas->id ]); @@ -494,7 +502,7 @@ public function testAnnualFee() $movement = new \App\Movement(); $movement->type = 'annual-fee'; - $movement->sender_type = 'App\User'; + $movement->sender_type = User::class; $movement->sender_id = $this->userWithNoPerms->id; $movement->target_type = 'App\Gas'; $movement->target_id = $this->gas->id;