Merge pull request #83 from Crudzaso/develop

Develop

.github/workflows/deploy-main.yml

@@ -8,6 +8,10 @@ jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
+      - name: Fix git ownership
+        run: |
+          git config --global --add safe.directory "${{ secrets.PATH }}"
+
       - name: Executing remote SSH commands using password
         uses: appleboy/ssh-action@v0.1.6
         with:
@@ -20,8 +24,7 @@ jobs:
             git pull origin main
             git fetch
             echo '${{ secrets.ENV_FILE }}' > .env
-            composer install
+            composer install --no-dev --optimize-autoloader
             composer dump-autoload
-            php artisan migrate:fresh --seed
+            php artisan migrate:fresh --seed || echo "Database migration failed, skipping."
             php artisan optimize:clear
-

app/Http/Request/UserRequest.php → app/Http/Requests/UserRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Request;
+namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -16,13 +16,13 @@ public function rules()
         return [
             'name' => 'required|string|max:255',
             'lastname' => 'required|string|max:255',
-            'document' => 'required|string|unique:users,document,' . $this->user,
+            'document' => 'required|string|unique:users,document,' . ($this->user ?? ''),
             'document_type' => 'required|string',
             'phone_number' => 'nullable|string',
-            'email' => 'required|string|email|max:255|unique:users,email,' . $this->user,
+            'email' => 'required|string|email|max:255|unique:users,email,' . ($this->user ?? ''),
             'password' => 'sometimes|required|string|min:8',
-            'google_id' => 'nullable|string|unique:users,google_id,' . $this->user,
-            'github_id' => 'nullable|string|unique:users,github_id,' . $this->user,
+            'google_id' => 'nullable|string|unique:users,google_id,' . ($this->user ?? ''),
+            'github_id' => 'nullable|string|unique:users,github_id,' . ($this->user ?? ''),
         ];
     }
 }