Skip to content

Commit

Permalink
UserController, UserResource fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
koykoy027 committed Mar 16, 2024
1 parent fe218c0 commit 29ad7dc
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 39 deletions.
14 changes: 13 additions & 1 deletion app/Http/Controllers/Api/Auth/AuthenticationController.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,20 @@ public function login(LoginRequest $request)

public function register(RegisterRequest $request)
{
$user = User::create([
'created_by' => Auth::user()->id,
'updated_by' => Auth::user()->id,
'email' => $request->email,
'password' => Hash::make($request->password),
]);

$user = User::registerUser($request);
UserProfile::create([
'id' => $user->id,
'firstname' => $request->firstname,
'middlename' => $request->middlename,
'lastname' => $request->lastname,
'gender' => $request->gender,
]);

return $this->success([
'user' => $user,
Expand Down
18 changes: 5 additions & 13 deletions app/Http/Controllers/Api/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,18 @@
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use App\Models\User;
use Illuminate\Http\Request;

class UserController extends Controller
{
public function index()
{
return [
User::activeUsers()
->with('students')
->get(),
];
return UserResource::collection(
User::activeUsers()->get()
);
}

public function show($id)
public function show(User $user)
{

return [
User::activeUsers()
->orWhere('id', $id)
->first(),
];
return new UserResource($user);
}
}
4 changes: 0 additions & 4 deletions app/Http/Resources/UserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ public function toArray(Request $request): array
'middlename' => $this->user_profile->middlename,
'lastname' => $this->user_profile->lastname,
],
'created' => [
StudentResource::collection($this->students),
// 'id' => $this->students,
]
];
}
}
20 changes: 0 additions & 20 deletions app/Models/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,9 @@ class User extends Authenticatable
public static function activeUsers()
{
$users = self::where('is_active', self::ACTIVE);

return $users;
}

public static function registerUser(RegisterRequest $request)
{
$user = self::create([
'created_by' => Auth::user()->id,
'updated_by' => Auth::user()->id,
'email' => $request->email,
'password' => Hash::make($request->password),
]);

UserProfile::create([
'id' => $user->id,
'firstname' => $request->firstname,
'middlename' => $request->middlename,
'lastname' => $request->lastname,
'gender' => $request->gender,
]);
return $user;
}

public function user_profile()
{
return $this->hasOne(UserProfile::class, 'id');
Expand Down
3 changes: 2 additions & 1 deletion routes/api.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
return $request->user();
});

// token required
Route::middleware(['auth:sanctum'])->group(function () {
Route::controller(StudentController::class)->group(function () {
Route::get('/students', 'index');
Expand All @@ -20,7 +21,7 @@

Route::controller(UserController::class)->group(function () {
Route::get('/users', 'index');
Route::get('/users/{id}', 'show');
Route::get('/users/{user}', 'show');
});
});

Expand Down

0 comments on commit 29ad7dc

Please sign in to comment.