DONE: layout letter with letterhead and footer, notification for newly...

be/Modules/User/Http/Controllers/UserController.php

@@ -3,6 +3,7 @@
 namespace Modules\User\Http\Controllers;
 
 use App\Http\Controllers\BaseCrudController;
+use App\Services\ActivityLogger;
 use Exception;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -13,7 +14,7 @@ use Modules\Auth\Entities\User;
 use Modules\User\Http\Requests\UserRequest;
 use Modules\User\Repositories\Contracts\UserRepositoryInterface;
 use Modules\User\Services\UserService;
-use Modules\User\Transformers\UserResource;
+use Modules\Auth\Transformers\UserResource;
 use Modules\User\Transformers\UserListResource;
 
 class UserController extends BaseCrudController
@@ -104,6 +105,13 @@ class UserController extends BaseCrudController
             'phone_number' => 'sometimes|string|max:255',
             'image' => 'sometimes|image|mimes:jpeg,png,jpg,gif|max:2048',
             'image_url' => 'sometimes|string|max:255',
+            'gender' => 'sometimes|string|max:255',
+            'marriage_status' => 'sometimes|string|max:255',
+            'member_number' => 'sometimes|integer',
+            'member_type' => 'sometimes|string|max:255',
+            'join_date' => 'sometimes|date',
+            'birth_date' => 'sometimes|date',
+            'birth_place' => 'sometimes|string|max:255',
         ]);
 
         $user = $this->userService->updateProfile(
@@ -182,6 +190,69 @@ class UserController extends BaseCrudController
         }
     }
 
+    public function deletedIndex(Request $request): JsonResponse
+    {
+        $this->authorize('viewAny', $this->modelClass);
+
+        try {
+            $perPage = min((int) $request->get('per_page', 10), 500);
+            $items = $this->userService->getDeletedPaginatedList(
+                $perPage,
+                $request->get('search', ''),
+                $request->get('status', ''),
+                $request->get('sort_by', 'deleted_at'),
+                $request->get('sort_order', 'desc')
+            );
+
+            return response()->json([
+                'success' => true,
+                'data' => UserListResource::collection($items->items()),
+                'pagination' => [
+                    'current_page' => $items->currentPage(),
+                    'per_page' => $items->perPage(),
+                    'total' => $items->total(),
+                    'last_page' => $items->lastPage(),
+                    'from' => $items->firstItem(),
+                    'to' => $items->lastItem(),
+                    'has_more_pages' => $items->hasMorePages(),
+                ],
+                'message' => 'Deleted users retrieved successfully.',
+            ]);
+        } catch (Exception $e) {
+            Log::error("Error fetching deleted {$this->resourceNamePlural}: ".$e->getMessage());
+
+            return $this->errorResponse('Failed to retrieve deleted users.', 500);
+        }
+    }
+
+    public function restore(string $id): JsonResponse
+    {
+        $this->authorize('restore', $this->modelClass);
+
+        try {
+            $user = $this->userService->restoreUser($id);
+
+            if (! $user) {
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Deleted user not found.',
+                ], 404);
+            }
+
+            ActivityLogger::log("Restored {$this->resourceName}: {$user->name}", $user);
+
+            return response()->json([
+                'success' => true,
+                'message' => 'User restored successfully.',
+                'data' => (new UserListResource($user))->resolve(),
+            ]);
+        } catch (Exception $e) {
+            Log::error("Error restoring {$this->resourceName}: ".$e->getMessage());
+
+            return $this->errorResponse('Failed to restore user.', 500);
+        }
+    }
+
     public function show($id): JsonResponse
     {
         $this->authorize('view', $this->modelClass);