Merge pull request #1 from Innovix-Matrix-Systems/IMS-3

Laravel Version upgrade to 11 & code improvement

Author: AHS12

.env.testing.example

@@ -0,0 +1,58 @@
+APP_NAME=Laravel
+APP_ENV=local
+APP_KEY=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+TELESCOPE_ENABLED=true
+DEBUGBAR_ENABLED=true
+
+LOG_CHANNEL=stack
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=sqlite
+DB_DATABASE=database/database.sqlite
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+FILESYSTEM_DISK=local
+QUEUE_CONNECTION=database
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+
+MEMCACHED_HOST=127.0.0.1
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_MAILER=smtp
+MAIL_HOST=mailpit
+MAIL_PORT=1025
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="[email protected]"
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
+AWS_USE_PATH_STYLE_ENDPOINT=false
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_HOST=
+PUSHER_PORT=443
+PUSHER_SCHEME=https
+PUSHER_APP_CLUSTER=mt1
+
+VITE_APP_NAME="${APP_NAME}"
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_HOST="${PUSHER_HOST}"
+VITE_PUSHER_PORT="${PUSHER_PORT}"
+VITE_PUSHER_SCHEME="${PUSHER_SCHEME}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.github/workflows/laravel-test.yml

@@ -0,0 +1,42 @@
+name: Laravel-Test
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+    branches: ["main"]
+
+jobs:
+  laravel-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
+        with:
+          php-version: "8.2"
+      - uses: actions/checkout@v3
+      - name: Copy .env
+        run: php -r "file_exists('.env') || copy('.env.testing.example', '.env');"
+      - name: Install Dependencies
+        run: |
+          composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+      - name: Generate key
+        run: php artisan key:generate
+      - name: Directory Permissions
+        run: |
+          chmod -R 777 storage storage
+          chmod -R 777 storage bootstrap/cache
+      - name: Create Database
+        env:
+          DB_CONNECTION: sqlite
+          DB_DATABASE: database/database.sqlite
+        run: |
+          mkdir -p database
+          touch database/database.sqlite
+          php artisan cache:clear
+          php artisan migrate --seed
+      - name: Execute tests (Unit and Feature tests) via PEST
+        env:
+          DB_CONNECTION: sqlite
+          DB_DATABASE: database/database.sqlite
+        run: vendor/bin/pest

README.md

@@ -10,7 +10,7 @@ Explore this project and experience the convenience of a ready-made local develo
 
 ## Features
 
-- **Authentication using Laravel Sanctum**: Implement secure authentication using [Laravel Sanctum](https://laravel.com/docs/10.x/sanctum).
+- **Authentication using Laravel Sanctum**: Implement secure authentication using [Laravel Sanctum](https://laravel.com/docs/11.x/sanctum).
 
 - **Role & Permission-Based Authorization**: Utilize [Laravel Permission](https://spatie.be/docs/laravel-permission/v6/introduction) for a flexible authorization system based on roles and permissions.
 
@@ -134,6 +134,10 @@ To execute tests for your application, utilize the following command:
 ./vendor/bin/pest
 ```
 
+```bash
+php artisan test
+```
+
 Running tests is crucial to ensure the reliability and correctness of your application's functionality. The above command will initiate the testing process and provide you with valuable insights into the quality of your codebase.
 
 ## Extra Artisan Commands
@@ -156,15 +160,6 @@ php artisan make:service TestService
 ```
 The newly created service will be located at `app/Http/Services/TestService.php`, ready to handle your application's business logic.
 
-### Generate a Trait
-Traits are reusable code components that enhance code organization. To create a new trait, simply run:
-
-```bash
-php artisan make:trait TestTrait
-```
-
-This command generates a new trait file for your project, promoting code reusability and maintainability.
-
 Leverage these Artisan commands to streamline your development process and maintain a well-structured codebase.
 
 ## Authors

app/Console/Commands/MakeTraitCommand.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Enums;
+
+enum UserRole: string
+{
+    case SUPER_ADMIN = 'Super-Admin';
+    case ADMIN = 'Admin';
+    case USER = 'User';
+}

app/Console/Commands/stubs/traits.stub

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\Enums;
+
+enum UserStatus: int
+{
+    case ACTIVE = 1;
+    case DEACTIVE = 0;
+}

app/Enums/UserRole.php

@@ -34,15 +34,13 @@ public function __construct(AuthService $authService)
      */
     public function login(LoginRequest $request)
     {
-
         $user = User::where('email', $request->email)
             ->with('roles.permissions')
             ->first();
         $authData = $this->authService->login(
             $user,
             $request->password,
             $request->device,
-            true,
         );
         $data = [
             'user' => UserResource::make($authData['user']),