Lint code

openfoodfoundation · Jan 28, 2025 · 870d3e9 · 870d3e9
1 parent e0516d2
commit 870d3e9
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 65 deletions.
diff --git a/routes/api.php b/routes/api.php
@@ -258,58 +258,57 @@
                     ]
                 );
 
-
             /**
              * My Teams
              */
             Route::post('/my-teams', [ApiMyTeamsController::class, 'store'])
-                 ->name('api.v1.my-teams.post')
-                 ->middleware(
-                     [
-                         'abilities:' .
-                         PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
-                         PersonalAccessTokenAbility::MY_TEAM_CREATE->value,
-                     ]
-                 );
+                ->name('api.v1.my-teams.post')
+                ->middleware(
+                    [
+                        'abilities:' .
+                        PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
+                        PersonalAccessTokenAbility::MY_TEAM_CREATE->value,
+                    ]
+                );
             Route::get('/my-teams', [ApiMyTeamsController::class, 'index'])
-                 ->name('api.v1.my-teams.getMany')
-                 ->middleware(
-                     [
-                         'abilities:' .
-                         PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
-                         PersonalAccessTokenAbility::MY_TEAM_READ->value,
-                     ]
-                 );
+                ->name('api.v1.my-teams.getMany')
+                ->middleware(
+                    [
+                        'abilities:' .
+                        PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
+                        PersonalAccessTokenAbility::MY_TEAM_READ->value,
+                    ]
+                );
 
             Route::get('/my-teams/{id}', [ApiMyTeamsController::class, 'show'])
-                 ->name('api.v1.my-teams.get')
-                 ->middleware(
-                     [
-                         'abilities:' .
-                         PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
-                         PersonalAccessTokenAbility::MY_TEAM_READ->value,
-                     ]
-                 );
+                ->name('api.v1.my-teams.get')
+                ->middleware(
+                    [
+                        'abilities:' .
+                        PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
+                        PersonalAccessTokenAbility::MY_TEAM_READ->value,
+                    ]
+                );
 
             Route::put('/my-teams/{id}', [ApiMyTeamsController::class, 'update'])
-                 ->name('api.v1.my-teams.put')
-                 ->middleware(
-                     [
-                         'abilities:' .
-                         PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
-                         PersonalAccessTokenAbility::MY_TEAM_UPDATE->value,
-                     ]
-                 );
+                ->name('api.v1.my-teams.put')
+                ->middleware(
+                    [
+                        'abilities:' .
+                        PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
+                        PersonalAccessTokenAbility::MY_TEAM_UPDATE->value,
+                    ]
+                );
 
             Route::delete('/my-teams/{id}', [ApiMyTeamsController::class, 'destroy'])
-                 ->name('api.v1.my-teams.delete')
-                 ->middleware(
-                     [
-                         'abilities:' .
-                         PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
-                         PersonalAccessTokenAbility::MY_TEAM_DELETE->value,
-                     ]
-                 );
+                ->name('api.v1.my-teams.delete')
+                ->middleware(
+                    [
+                        'abilities:' .
+                        PersonalAccessTokenAbility::SUPER_ADMIN->value . ',' .
+                        PersonalAccessTokenAbility::MY_TEAM_DELETE->value,
+                    ]
+                );
 
             /**
              * My Search

diff --git a/routes/web.php b/routes/web.php
@@ -77,7 +77,7 @@
     Route::get('/my-voucher-set-merchant-team-approval-request/{approvalRequestId}', function (Request $request, $approvalRequestId) {
 
         $approvalRequest = VoucherSetMerchantTeamApprovalRequest::where('merchant_user_id', Auth::id())
-                                                                ->find($approvalRequestId);
+            ->find($approvalRequestId);
 
         if (!$approvalRequest) {
             return Redirect::to('/');
@@ -139,16 +139,16 @@
          * User's team is NOT a merchant of the voucher's service team
          */
         $teamMerchant = TeamMerchantTeam::where('team_id', $voucher->allocated_to_service_team_id)
-                                        ->where('merchant_team_id', $team->id)
-                                        ->first();
+            ->where('merchant_team_id', $team->id)
+            ->first();
 
         /**
          * User's team is NOT a merchant for the voucher set
          */
         $teamMerchantOfVoucherSet = VoucherSetMerchantTeam::where('voucher_set_id', $voucherSetId)
-                                                          ->where('merchant_team_id', $team->id)
-                                                          ->whereNotNull('voucher_set_merchant_team_approval_request_id')
-                                                          ->first();
+            ->where('merchant_team_id', $team->id)
+            ->whereNotNull('voucher_set_merchant_team_approval_request_id')
+            ->first();
 
         if (!$teamMerchant || !$teamMerchantOfVoucherSet) {
             return Inertia::render('App/ErrorMessagePage', [
@@ -196,15 +196,15 @@
          * User's team is NOT a merchant of the voucher's service team
          */
         $teamMerchant = TeamMerchantTeam::where('team_id', $voucher->allocated_to_service_team_id)
-                                        ->where('merchant_team_id', $team->id)
-                                        ->first();
+            ->where('merchant_team_id', $team->id)
+            ->first();
 
         /**
          * User's team is NOT a merchant for the voucher set
          */
         $teamMerchantOfVoucherSet = VoucherSetMerchantTeam::where('voucher_set_id', $voucher->voucher_set_id)
-                                                          ->where('merchant_team_id', $team->id)
-                                                          ->first();
+            ->where('merchant_team_id', $team->id)
+            ->first();
 
         if (($voucher->created_by_team_id != $team->id && $voucher->allocated_to_service_team_id != $team->id) && !$teamMerchant && !$teamMerchantOfVoucherSet) {
             return Inertia::render('App/ErrorMessagePage', [
@@ -250,15 +250,15 @@
          * User's team is NOT a merchant of the voucher set's service team
          */
         $teamMerchant = TeamMerchantTeam::where('team_id', $voucherSet->allocated_to_service_team_id)
-                                        ->where('merchant_team_id', $team->id)
-                                        ->first();
+            ->where('merchant_team_id', $team->id)
+            ->first();
 
         /**
          * User's team is NOT a merchant for the voucher set
          */
         $teamMerchantOfVoucherSet = VoucherSetMerchantTeam::where('voucher_set_id', $voucherSetId)
-                                                          ->where('merchant_team_id', $team->id)
-                                                          ->first();
+            ->where('merchant_team_id', $team->id)
+            ->first();
 
         if (($voucherSet->created_by_team_id != $team->id && $voucherSet->allocated_to_service_team_id != $team->id) && !$teamMerchant && !$teamMerchantOfVoucherSet) {
             return Inertia::render('App/ErrorMessagePage', [
@@ -301,7 +301,7 @@
     Route::get('/switch-team/{id}', function ($id) {
 
         $teamUserForThisTeam = TeamUser::where('user_id', Auth::id())
-                                       ->where('team_id', $id)->first();
+            ->where('team_id', $id)->first();
 
         if ($teamUserForThisTeam) {
             Auth::user()->current_team_id = $id;

diff --git a/tests/Feature/API/App/MyProfile/MyProfileDeleteTest.php b/tests/Feature/API/App/MyProfile/MyProfileDeleteTest.php
@@ -9,7 +9,6 @@
 
 class MyProfileDeleteTest extends BaseAPITestCase
 {
-
     protected string $endPoint = '/my-profile';
 
     #[Test]

diff --git a/tests/Feature/API/App/MyProfile/MyProfileGetTest.php b/tests/Feature/API/App/MyProfile/MyProfileGetTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace Tests\Feature\API\App\MyProfile;
 
 use App\Enums\PersonalAccessTokenAbility;
@@ -12,7 +11,6 @@
 
 class MyProfileGetTest extends BaseAPITestCase
 {
-
     protected string $endPoint = '/my-profile';
 
     #[Test]
@@ -76,6 +74,4 @@ public function itCanGetDataFromIdSuffix()
         $this->assertEquals($responseObj->data->current_team_id, $this->user->current_team_id);
         $this->assertEquals($responseObj->data->name, $this->user->name);
     }
-
-
 }
diff --git a/tests/Feature/API/App/MyProfile/MyProfilePostTest.php b/tests/Feature/API/App/MyProfile/MyProfilePostTest.php
@@ -3,14 +3,12 @@
 namespace Tests\Feature\API\App\MyProfile;
 
 use App\Enums\PersonalAccessTokenAbility;
-use Illuminate\Foundation\Testing\RefreshDatabase;
 use Laravel\Sanctum\Sanctum;
 use PHPUnit\Framework\Attributes\Test;
 use Tests\Feature\API\BaseAPITestCase;
 
 class MyProfilePostTest extends BaseAPITestCase
 {
-
     protected string $endPoint = '/my-profile';
 
     #[Test]

diff --git a/tests/Feature/API/App/MyProfile/MyProfilePutTest.php b/tests/Feature/API/App/MyProfile/MyProfilePutTest.php
@@ -93,7 +93,6 @@ public function itCanNotUpdateNoNumbers()
 
     }
 
-
     #[Test]
     public function itCanNotUpdateNoSymbols()
     {
@@ -129,5 +128,4 @@ public function itCanNotUpdateNoStEnoughCharacters()
         $response->assertStatus(400);
 
     }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     class MyProfileDeleteTest extends BaseAPITestCase
     {
         protected string $endPoint = '/my-profile';
         #[Test]
@@ Expand Down @@