Merge branch 'feature/SERPRATI-JOY-868kf24hh-alteracoes-administrador' of Softpar/sfp_api_laravel_serprati into development

.gitignore

@@ -55,3 +55,6 @@ Thumbs.db
 
 # Meta
 .phpstorm.meta.php
+
+# Claude Code
+CLAUDE.md

app/Http/Controllers/UserController.php

@@ -68,7 +68,7 @@ class UserController extends Controller
 
     public function indexPaginated(Request $request): JsonResponse
     {
-        $filters = $request->only(['type', 'status', 'search']);
+        $filters = $request->only(['type', 'status', 'search', 'position_id', 'sector_id']);
         $perPage = min((int) $request->get('per_page', 10), 100);
         $paginator = $this->service->getAllPaginated($filters, $perPage);
 
@@ -144,4 +144,18 @@ class UserController extends Controller
             message: __("messages.updated"),
         );
     }
+
+    public function approve(int $id): JsonResponse
+    {
+        $item = $this->service->approve($id);
+
+        if (!$item) {
+            return $this->errorResponse(message: __('messages.not_found'), code: 404);
+        }
+
+        return $this->successResponse(
+            payload: new UserResource($item),
+            message: __("messages.updated"),
+        );
+    }
 }

app/Services/DashboardService.php

@@ -24,6 +24,9 @@ class DashboardService
       'novos_mes'           => PartnerAgreement::whereMonth('created_at', now()->month)->whereYear('created_at', now()->year)->count(),
       'associados_pendentes' => User::where('type', UserTypeEnum::ASSOCIADO)->where('status', UserStatusEnum::PENDING)->count(),
       'ultimos_acessos'     => UserAccessLog::distinct('user_id')->count('user_id'),
+      'associados_com_acesso_app' => UserAccessLog::whereHas('user', fn ($q) => $q->where('type', UserTypeEnum::ASSOCIADO))
+        ->distinct('user_id')
+        ->count('user_id'),
     ];
   }
 

app/Services/UserService.php

@@ -34,6 +34,14 @@ class UserService
             $query->where('status', $filters['status']);
         }
 
+        if (!empty($filters['position_id'])) {
+            $query->where('position_id', $filters['position_id']);
+        }
+
+        if (!empty($filters['sector_id'])) {
+            $query->where('sector_id', $filters['sector_id']);
+        }
+
         if (!empty($filters['search'])) {
             $term = '%' . mb_strtolower($filters['search']) . '%';
             $query->where(function ($q) use ($term) {
@@ -106,6 +114,18 @@ class UserService
         return $model->fresh();
     }
 
+    public function approve(int $id): ?User
+    {
+        $model = $this->findById($id);
+        if (!$model) return null;
+
+        $model->update([
+            'status' => UserStatusEnum::ACTIVE,
+        ]);
+
+        return $model->fresh();
+    }
+
     public function getUserTypes(): array
     {
         return UserTypeEnum::toArray();

database/migrations/2026_07_22_000001_enable_unaccent_extension.php

@@ -0,0 +1,17 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        DB::statement('CREATE EXTENSION IF NOT EXISTS unaccent');
+    }
+
+    public function down(): void
+    {
+        DB::statement('DROP EXTENSION IF EXISTS unaccent');
+    }
+};

routes/authRoutes/user.php

@@ -27,4 +27,6 @@ Route::controller(UserController::class)->prefix('user')->group(function () {
     Route::delete('/my/avatar', 'deleteAvatar');
 
     Route::put('/{id}/on-leave', 'setOnLeave')->middleware('permission:config.user,edit');
+
+    Route::put('/{id}/approve', 'approve')->middleware('permission:config.user,edit');
 });