user-detail

app/Http/Controllers/ExamController.php

@@ -44,8 +44,6 @@ class ExamController extends Controller
             'name' => 'required|string',
             'indexes' => 'required|array|min:1',
             'status' => 'required|in:0,1',
-//            'begin' => 'nullable|date',
-//            'end' => 'nullable|date',
         ];
         $request->validate($rules);
         $result = $this->repository->store($request->all());
@@ -104,20 +102,4 @@ class ExamController extends Controller
         return $this->success($result);
     }
 
-    public function users(Request $request)
-    {
-        $result = $this->repository->listUser($request->all());
-        $resource = ExamUserResource::collection($result);
-        return $this->success($resource);
-    }
-
-    public function progress(Request $request)
-    {
-        $result = $this->repository->getUserExamProgress(Auth::id());
-        $resource = new ExamUserResource($result);
-        return $resource;
-//        dd($resource->response()->getData(true));
-        return $this->success($resource);
-    }
-
 }

app/Http/Controllers/ExamUserController.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Resources\ExamResource;
+use App\Http\Resources\ExamUserResource;
+use App\Http\Resources\UserResource;
+use App\Repositories\ExamRepository;
+use App\Repositories\UserRepository;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class ExamUserController extends Controller
+{
+    private $repository;
+
+    public function __construct(ExamRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @param Request $request
+     * @return array
+     */
+    public function index(Request $request)
+    {
+        $result = $this->repository->listUser($request->all());
+        $resource = ExamUserResource::collection($result);
+        return $this->success($resource);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function store(Request $request)
+    {
+        $rules = [
+            'uid' => 'required',
+        ];
+        $request->validate($rules);
+        $result = $this->repository->assignToUser($request->uid, $request->exam_id, $request->begin, $request->end);
+        $resource = new ExamResource($result);
+        return $this->success($resource);
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return array
+     */
+    public function show($id)
+    {
+
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return array
+     */
+    public function update(Request $request, $id)
+    {
+
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return array
+     */
+    public function destroy($id)
+    {
+        $result = $this->repository->removeExamUser($id);
+        return $this->success($result, 'Remove user exam success!');
+    }
+
+}

app/Http/Controllers/UserController.php

@@ -56,11 +56,12 @@ class UserController extends Controller
      * Display the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return array
      */
     public function show($id)
     {
-        //
+        $result = $this->repository->getDetail($id);
+        return $this->success($result);
     }
 
     /**
@@ -113,7 +114,7 @@ class UserController extends Controller
         return $this->success($resource);
     }
 
-    public function exams()
+    public function matchExams()
     {
         $id = Auth::id();
         $examRepository = new ExamRepository();

app/Http/Resources/ExamUserResource.php

@@ -25,8 +25,11 @@ class ExamUserResource extends JsonResource
             'status_text' => $this->statusText,
             'created_at' => formatDatetime($this->created_at),
             'progress' => $this->when($this->progress, $this->progress),
+            'progress_formatted' => $this->when($this->progress_formatted, $this->progress_formatted),
             'begin' => formatDatetime($this->begin),
             'end' => formatDatetime($this->end),
+            'uid' => $this->uid,
+            'exam_id' => $this->exam_id,
             'user' => new UserResource($this->whenLoaded('user')),
             'exam' => new ExamResource($this->whenLoaded('exam')),
         ];