update

jmrashed · jmrashed · commit 27e51c827706 · 2025-10-21T03:06:07.000+06:00
diff --git a/app/controllers/AttendanceController.php b/app/controllers/AttendanceController.php
@@ -13,16 +13,16 @@ public function index()
         $perPage = $this->request->get('per_page', 10);
         $page = $this->request->get('page', 1);
         $attendanceRecords = Attendance::paginate($perPage, $page);
-        return Response::json($attendanceRecords);
+        return Response::success('Attendance records retrieved successfully', $attendanceRecords);
     }
 
     public function show($id)
     {
         $attendance = Attendance::find($id);
         if (!$attendance) {
-            return Response::json(['error' => 'Attendance record not found'], 404);
+            return Response::error('Attendance record not found', 404);
         }
-        return Response::json($attendance);
+        return Response::success('Attendance record retrieved successfully', $attendance);
     }
 
     public function store()
@@ -36,16 +36,16 @@ public function store()
         $attendance->status = $data['status'] ?? 'present';
 
         if ($attendance->save()) {
-            return Response::json(['message' => 'Attendance record created successfully', 'attendance' => $attendance], 201);
+            return Response::success('Attendance record created successfully', ['attendance' => $attendance], 201);
         }
-        return Response::json(['error' => 'Failed to create attendance record'], 500);
+        return Response::error('Failed to create attendance record', 500);
     }
 
     public function update($id)
     {
         $attendance = Attendance::find($id);
         if (!$attendance) {
-            return Response::json(['error' => 'Attendance record not found'], 404);
+            return Response::error('Attendance record not found', 404);
         }
 
         $data = $this->request->json();
@@ -56,21 +56,21 @@ public function update($id)
         $attendance->status = $data['status'] ?? $attendance->status;
 
         if ($attendance->save()) {
-            return Response::json(['message' => 'Attendance record updated successfully', 'attendance' => $attendance]);
+            return Response::success('Attendance record updated successfully', ['attendance' => $attendance]);
         }
-        return Response::json(['error' => 'Failed to update attendance record'], 500);
+        return Response::error('Failed to update attendance record', 500);
     }
 
     public function destroy($id)
     {
         $attendance = Attendance::find($id);
         if (!$attendance) {
-            return Response::json(['error' => 'Attendance record not found'], 404);
+            return Response::error('Attendance record not found', 404);
         }
 
         if ($attendance->delete()) {
-            return Response::json(['message' => 'Attendance record deleted successfully']);
+            return Response::success('Attendance record deleted successfully');
         }
-        return Response::json(['error' => 'Failed to delete attendance record'], 500);
+        return Response::error('Failed to delete attendance record', 500);
     }
 }
diff --git a/app/controllers/DepartmentController.php b/app/controllers/DepartmentController.php
@@ -13,16 +13,16 @@ public function index()
         $perPage = $this->request->get('per_page', 10);
         $page = $this->request->get('page', 1);
         $departments = Department::paginate($perPage, $page);
-        return Response::json($departments);
+        return Response::success('Departments retrieved successfully', $departments);
     }
 
     public function show($id)
     {
         $department = Department::find($id);
         if (!$department) {
-            return Response::json(['error' => 'Department not found'], 404);
+            return Response::error('Department not found', 404);
         }
-        return Response::json($department);
+        return Response::success('Department retrieved successfully', $department);
     }
 
     public function store()
@@ -33,38 +33,38 @@ public function store()
         $department->description = $data['description'] ?? null;
 
         if ($department->save()) {
-            return Response::json(['message' => 'Department created successfully', 'department' => $department], 201);
+            return Response::success('Department created successfully', ['department' => $department], 201);
         }
-        return Response::json(['error' => 'Failed to create department'], 500);
+        return Response::error('Failed to create department', 500);
     }
 
     public function update($id)
     {
         $department = Department::find($id);
         if (!$department) {
-            return Response::json(['error' => 'Department not found'], 404);
+            return Response::error('Department not found', 404);
         }
 
         $data = $this->request->json();
         $department->name = $data['name'] ?? $department->name;
         $department->description = $data['description'] ?? $department->description;
 
         if ($department->save()) {
-            return Response::json(['message' => 'Department updated successfully', 'department' => $department]);
+            return Response::success('Department updated successfully', ['department' => $department]);
         }
-        return Response::json(['error' => 'Failed to update department'], 500);
+        return Response::error('Failed to update department', 500);
     }
 
     public function destroy($id)
     {
         $department = Department::find($id);
         if (!$department) {
-            return Response::json(['error' => 'Department not found'], 404);
+            return Response::error('Department not found', 404);
         }
 
         if ($department->delete()) {
-            return Response::json(['message' => 'Department deleted successfully']);
+            return Response::success('Department deleted successfully');
         }
-        return Response::json(['error' => 'Failed to delete department'], 500);
+        return Response::error('Failed to delete department', 500);
     }
 }
diff --git a/app/controllers/EmployeeProfileController.php b/app/controllers/EmployeeProfileController.php
@@ -13,16 +13,16 @@ public function index()
         $perPage = $this->request->get('per_page', 10);
         $page = $this->request->get('page', 1);
         $employeeProfiles = EmployeeProfile::paginate($perPage, $page);
-        return Response::json($employeeProfiles);
+        return Response::success('Employee Profiles retrieved successfully', $employeeProfiles);
     }
 
     public function show($id)
     {
         $employeeProfile = EmployeeProfile::find($id);
         if (!$employeeProfile) {
-            return Response::json(['error' => 'Employee Profile not found'], 404);
+            return Response::error('Employee Profile not found', 404);
         }
-        return Response::json($employeeProfile);
+        return Response::success('Employee Profile retrieved successfully', $employeeProfile);
     }
 
     public function store()
@@ -36,16 +36,16 @@ public function store()
         $employeeProfile->salary = $data['salary'] ?? null;
 
         if ($employeeProfile->save()) {
-            return Response::json(['message' => 'Employee Profile created successfully', 'employee_profile' => $employeeProfile], 201);
+            return Response::success('Employee Profile created successfully', ['employee_profile' => $employeeProfile], 201);
         }
-        return Response::json(['error' => 'Failed to create employee profile'], 500);
+        return Response::error('Failed to create employee profile', 500);
     }
 
     public function update($id)
     {
         $employeeProfile = EmployeeProfile::find($id);
         if (!$employeeProfile) {
-            return Response::json(['error' => 'Employee Profile not found'], 404);
+            return Response::error('Employee Profile not found', 404);
         }
 
         $data = $this->request->json();
@@ -56,21 +56,21 @@ public function update($id)
         $employeeProfile->salary = $data['salary'] ?? $employeeProfile->salary;
 
         if ($employeeProfile->save()) {
-            return Response::json(['message' => 'Employee Profile updated successfully', 'employee_profile' => $employeeProfile]);
+            return Response::success('Employee Profile updated successfully', ['employee_profile' => $employeeProfile]);
         }
-        return Response::json(['error' => 'Failed to update employee profile'], 500);
+        return Response::error('Failed to update employee profile', 500);
     }
 
     public function destroy($id)
     {
         $employeeProfile = EmployeeProfile::find($id);
         if (!$employeeProfile) {
-            return Response::json(['error' => 'Employee Profile not found'], 404);
+            return Response::error('Employee Profile not found', 404);
         }
 
         if ($employeeProfile->delete()) {
-            return Response::json(['message' => 'Employee Profile deleted successfully']);
+            return Response::success('Employee Profile deleted successfully');
         }
-        return Response::json(['error' => 'Failed to delete employee profile'], 500);
+        return Response::error('Failed to delete employee profile', 500);
     }
 }
diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
@@ -23,14 +23,14 @@ public function register(Request $request, Response $response)
         $result = $this->userService->createUser($data);
 
         if (isset($result['errors'])) {
-            return $this->errorResponse($result['errors'], 422);
+            return Response::error('Validation failed', 422, $result['errors']);
         }
 
         if ($result) {
-            return $this->successResponse('User registered successfully', ['id' => $result['id']], 201);
+            return Response::success('User registered successfully', ['id' => $result['id']], 201);
         }
 
-        return $this->errorResponse('Failed to register user', 500);
+        return Response::error('Failed to register user', 500);
     }
 
     public function login(Request $request, Response $response)
@@ -40,7 +40,7 @@ public function login(Request $request, Response $response)
         $password = $data['password'] ?? null;
 
         if (!$email || !$password) {
-            return $this->errorResponse('Email and password are required', 400);
+            return Response::error('Email and password are required', 400);
         }
 
         $user = $this->userService->authenticateUser($email, $password);
@@ -52,27 +52,27 @@ public function login(Request $request, Response $response)
                 'email' => $user['email'],
                 'exp' => time() + (3600 * 24) // Token valid for 24 hours
             ]);
-            return $this->successResponse('Login successful', ['token' => $token]);
+            return Response::success('Login successful', ['token' => $token]);
         }
 
-        return $this->errorResponse('Invalid credentials', 401);
+        return Response::error('Invalid credentials', 401);
     }
 
     public function index(Request $request, Response $response)
     {
         $perPage = $request->get('per_page', 10);
         $page = $request->get('page', 1);
         $users = $this->userService->getAllUsersPaginated($perPage, $page);
-        return $this->jsonResponse($users);
+        return Response::success('Users retrieved successfully', $users);
     }
 
     public function show(Request $request, Response $response, $id)
     {
         $user = $this->userService->getUserById($id);
         if ($user) {
-            return $this->jsonResponse($user);
+            return Response::success('User retrieved successfully', $user);
         }
-        return $this->errorResponse('User not found', 404);
+        return Response::error('User not found', 404);
     }
 
     public function store(Request $request, Response $response)
@@ -81,13 +81,13 @@ public function store(Request $request, Response $response)
         $result = $this->userService->createUser($data);
 
         if (isset($result['errors'])) {
-            return $this->errorResponse($result['errors'], 422);
+            return Response::error('Validation failed', 422, $result['errors']);
         }
 
         if ($result) {
-            return $this->successResponse('User created successfully', ['id' => $result['id']], 201);
+            return Response::success('User created successfully', ['id' => $result['id']], 201);
         }
-        return $this->errorResponse('Failed to create user', 500);
+        return Response::error('Failed to create user', 500);
     }
 
     public function update(Request $request, Response $response, $id)
@@ -96,20 +96,20 @@ public function update(Request $request, Response $response, $id)
         $result = $this->userService->updateUser($id, $data);
 
         if (isset($result['errors'])) {
-            return $this->errorResponse($result['errors'], 422);
+            return Response::error('Validation failed', 422, $result['errors']);
         }
 
         if ($result) {
-            return $this->successResponse('User updated successfully');
+            return Response::success('User updated successfully');
         }
-        return $this->errorResponse('Failed to update user', 500);
+        return Response::error('Failed to update user', 500);
     }
 
     public function destroy(Request $request, Response $response, $id)
     {
         if ($this->userService->deleteUser($id)) {
-            return $this->successResponse('User deleted successfully', [], 204);
+            return Response::success('User deleted successfully', [], 204);
         }
-        return $this->errorResponse('Failed to delete user', 500);
+        return Response::error('Failed to delete user', 500);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,16 @@ public function index()`
`13`	`13`	`$perPage = $this->request->get('per_page', 10);`
`14`	`14`	`$page = $this->request->get('page', 1);`
`15`	`15`	`$attendanceRecords = Attendance::paginate($perPage, $page);`
`16`		`- return Response::json($attendanceRecords);`
	`16`	`+ return Response::success('Attendance records retrieved successfully', $attendanceRecords);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public function show($id)`
`20`	`20`	`{`
`21`	`21`	`$attendance = Attendance::find($id);`
`22`	`22`	`if (!$attendance) {`
`23`		`- return Response::json(['error' => 'Attendance record not found'], 404);`
	`23`	`+ return Response::error('Attendance record not found', 404);`
`24`	`24`	`}`
`25`		`- return Response::json($attendance);`
	`25`	`+ return Response::success('Attendance record retrieved successfully', $attendance);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public function store()`
`@@ -36,16 +36,16 @@ public function store()`
`36`	`36`	`$attendance->status = $data['status'] ?? 'present';`
`37`	`37`
`38`	`38`	`if ($attendance->save()) {`
`39`		`- return Response::json(['message' => 'Attendance record created successfully', 'attendance' => $attendance], 201);`
	`39`	`+ return Response::success('Attendance record created successfully', ['attendance' => $attendance], 201);`
`40`	`40`	`}`
`41`		`- return Response::json(['error' => 'Failed to create attendance record'], 500);`
	`41`	`+ return Response::error('Failed to create attendance record', 500);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public function update($id)`
`45`	`45`	`{`
`46`	`46`	`$attendance = Attendance::find($id);`
`47`	`47`	`if (!$attendance) {`
`48`		`- return Response::json(['error' => 'Attendance record not found'], 404);`
	`48`	`+ return Response::error('Attendance record not found', 404);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`$data = $this->request->json();`
`@@ -56,21 +56,21 @@ public function update($id)`
`56`	`56`	`$attendance->status = $data['status'] ?? $attendance->status;`
`57`	`57`
`58`	`58`	`if ($attendance->save()) {`
`59`		`- return Response::json(['message' => 'Attendance record updated successfully', 'attendance' => $attendance]);`
	`59`	`+ return Response::success('Attendance record updated successfully', ['attendance' => $attendance]);`
`60`	`60`	`}`
`61`		`- return Response::json(['error' => 'Failed to update attendance record'], 500);`
	`61`	`+ return Response::error('Failed to update attendance record', 500);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public function destroy($id)`
`65`	`65`	`{`
`66`	`66`	`$attendance = Attendance::find($id);`
`67`	`67`	`if (!$attendance) {`
`68`		`- return Response::json(['error' => 'Attendance record not found'], 404);`
	`68`	`+ return Response::error('Attendance record not found', 404);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if ($attendance->delete()) {`
`72`		`- return Response::json(['message' => 'Attendance record deleted successfully']);`
	`72`	`+ return Response::success('Attendance record deleted successfully');`
`73`	`73`	`}`
`74`		`- return Response::json(['error' => 'Failed to delete attendance record'], 500);`
	`74`	`+ return Response::error('Failed to delete attendance record', 500);`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ public function register(Request $request, Response $response)`
`23`	`23`	`$result = $this->userService->createUser($data);`
`24`	`24`
`25`	`25`	`if (isset($result['errors'])) {`
`26`		`- return $this->errorResponse($result['errors'], 422);`
	`26`	`+ return Response::error('Validation failed', 422, $result['errors']);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`if ($result) {`
`30`		`- return $this->successResponse('User registered successfully', ['id' => $result['id']], 201);`
	`30`	`+ return Response::success('User registered successfully', ['id' => $result['id']], 201);`
`31`	`31`	`}`
`32`	`32`
`33`		`- return $this->errorResponse('Failed to register user', 500);`
	`33`	`+ return Response::error('Failed to register user', 500);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public function login(Request $request, Response $response)`
`@@ -40,7 +40,7 @@ public function login(Request $request, Response $response)`
`40`	`40`	`$password = $data['password'] ?? null;`
`41`	`41`
`42`	`42`	`if (!$email \|\| !$password) {`
`43`		`- return $this->errorResponse('Email and password are required', 400);`
	`43`	`+ return Response::error('Email and password are required', 400);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`$user = $this->userService->authenticateUser($email, $password);`
`@@ -52,27 +52,27 @@ public function login(Request $request, Response $response)`
`52`	`52`	`'email' => $user['email'],`
`53`	`53`	`'exp' => time() + (3600 * 24) // Token valid for 24 hours`
`54`	`54`	`]);`
`55`		`- return $this->successResponse('Login successful', ['token' => $token]);`
	`55`	`+ return Response::success('Login successful', ['token' => $token]);`
`56`	`56`	`}`
`57`	`57`
`58`		`- return $this->errorResponse('Invalid credentials', 401);`
	`58`	`+ return Response::error('Invalid credentials', 401);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public function index(Request $request, Response $response)`
`62`	`62`	`{`
`63`	`63`	`$perPage = $request->get('per_page', 10);`
`64`	`64`	`$page = $request->get('page', 1);`
`65`	`65`	`$users = $this->userService->getAllUsersPaginated($perPage, $page);`
`66`		`- return $this->jsonResponse($users);`
	`66`	`+ return Response::success('Users retrieved successfully', $users);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public function show(Request $request, Response $response, $id)`
`70`	`70`	`{`
`71`	`71`	`$user = $this->userService->getUserById($id);`
`72`	`72`	`if ($user) {`
`73`		`- return $this->jsonResponse($user);`
	`73`	`+ return Response::success('User retrieved successfully', $user);`
`74`	`74`	`}`
`75`		`- return $this->errorResponse('User not found', 404);`
	`75`	`+ return Response::error('User not found', 404);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`public function store(Request $request, Response $response)`
`@@ -81,13 +81,13 @@ public function store(Request $request, Response $response)`
`81`	`81`	`$result = $this->userService->createUser($data);`
`82`	`82`
`83`	`83`	`if (isset($result['errors'])) {`
`84`		`- return $this->errorResponse($result['errors'], 422);`
	`84`	`+ return Response::error('Validation failed', 422, $result['errors']);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`if ($result) {`
`88`		`- return $this->successResponse('User created successfully', ['id' => $result['id']], 201);`
	`88`	`+ return Response::success('User created successfully', ['id' => $result['id']], 201);`
`89`	`89`	`}`
`90`		`- return $this->errorResponse('Failed to create user', 500);`
	`90`	`+ return Response::error('Failed to create user', 500);`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`public function update(Request $request, Response $response, $id)`
`@@ -96,20 +96,20 @@ public function update(Request $request, Response $response, $id)`
`96`	`96`	`$result = $this->userService->updateUser($id, $data);`
`97`	`97`
`98`	`98`	`if (isset($result['errors'])) {`
`99`		`- return $this->errorResponse($result['errors'], 422);`
	`99`	`+ return Response::error('Validation failed', 422, $result['errors']);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if ($result) {`
`103`		`- return $this->successResponse('User updated successfully');`
	`103`	`+ return Response::success('User updated successfully');`
`104`	`104`	`}`
`105`		`- return $this->errorResponse('Failed to update user', 500);`
	`105`	`+ return Response::error('Failed to update user', 500);`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public function destroy(Request $request, Response $response, $id)`
`109`	`109`	`{`
`110`	`110`	`if ($this->userService->deleteUser($id)) {`
`111`		`- return $this->successResponse('User deleted successfully', [], 204);`
	`111`	`+ return Response::success('User deleted successfully', [], 204);`
`112`	`112`	`}`
`113`		`- return $this->errorResponse('Failed to delete user', 500);`
	`113`	`+ return Response::error('Failed to delete user', 500);`
`114`	`114`	`}`
`115`	`115`	`}`