user-detail

This commit is contained in:
xiaomlove
2021-04-27 19:13:32 +08:00
parent d1b7561aae
commit d2e05c812e
20 changed files with 594 additions and 50 deletions

View File

@@ -9,6 +9,7 @@ use App\Models\Torrent;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
class ExamRepository extends BaseRepository
{
@@ -150,13 +151,13 @@ class ExamRepository extends BaseRepository
/**
* assign exam to user
*
* @param $uid
* @param int $examId
* @param int $uid
* @param null $examId
* @param null $begin
* @param null $end
* @return mixed
*/
public function assignToUser($uid, $examId = 0, $begin = null, $end = null)
public function assignToUser(int $uid, $examId = null, $begin = null, $end = null)
{
$logPrefix = "uid: $uid, examId: $examId, begin: $begin, end: $end";
if ($examId > 0) {
@@ -247,13 +248,16 @@ class ExamRepository extends BaseRepository
return $newProgress;
}
public function getUserExamProgress($uid, $status = null)
public function getUserExamProgress($uid, $status = null, $with = ['exam', 'user'])
{
$logPrefix = "uid: $uid";
$query = ExamUser::query()->with(['exam', 'user'])->where('uid', $uid)->orderBy('exam_id', 'desc');
$query = ExamUser::query()->where('uid', $uid)->orderBy('exam_id', 'desc');
if ($status) {
$query->where('status', $status);
}
if (!empty($with)) {
$query->with($with);
}
$examUsers = $query->get();
if ($examUsers->isEmpty()) {
return null;
@@ -262,9 +266,15 @@ class ExamRepository extends BaseRepository
do_log("$logPrefix, user exam more than 1.", 'warning');
}
$examUser = $examUsers->first();
$exam = $examUser->exam;
if (empty($examUser->begin) || empty($examUser->end)) {
$examUser->begin = $exam->begin;
$examUser->end = $exam->end;
}
$progress = $this->calculateProgress($examUser);
do_log("$logPrefix, progress: " . nexus_json_encode($progress));
$examUser->progress = $progress;
$examUser->progress_formatted = $this->getProgressFormatted($exam, $progress);
return $examUser;
}
@@ -305,6 +315,49 @@ class ExamRepository extends BaseRepository
}
private function getProgressFormatted(Exam $exam, array $progress, $locale = null)
{
$result = [];
foreach ($exam->indexes as $key => $index) {
if (!isset($index['checked']) || !$index['checked']) {
continue;
}
$currentValue = $progress[$index['index']] ?? 0;
$requireValue = $index['require_value'];
switch ($index['index']) {
case Exam::INDEX_UPLOADED:
case Exam::INDEX_DOWNLOADED:
$currentValueFormatted = mksize($currentValue);
$requireValueAtomic = $requireValue * 1024 * 1024 * 1024;
break;
case Exam::INDEX_SEED_TIME_AVERAGE:
$currentValueFormatted = mkprettytime($currentValue);
$requireValueAtomic = $requireValue * 3600;
break;
default:
$currentValueFormatted = $currentValue;
$requireValueAtomic = $requireValue;
}
$index['require_value_formatted'] = "$requireValue {$index['unit']}";
$index['current_value'] = $currentValue;
$index['current_value_formatted'] = $currentValueFormatted;
$index['passed'] = $currentValue >= $requireValueAtomic;
$result[] = $index;
}
return $result;
}
public function removeExamUser(int $examUserId)
{
$examUser = ExamUser::query()->findOrFail($examUserId);
$result = DB::transaction(function () use ($examUser) {
$examUser->progresses()->delete();
return $examUser->delete();
});
return $result;
}

View File

@@ -1,6 +1,9 @@
<?php
namespace App\Repositories;
use App\Http\Resources\ExamUserResource;
use App\Http\Resources\UserResource;
use App\Models\ExamUser;
use App\Models\Setting;
use App\Models\User;
@@ -20,6 +23,27 @@ class UserRepository extends BaseRepository
return $user;
}
public function getDetail($id)
{
$user = User::query()->findOrFail($id, User::$commonFields);
$userResource = new UserResource($user);
$baseInfo = $userResource->response()->getData(true)['data'];
$examRep = new ExamRepository();
$examProgress = $examRep->getUserExamProgress($id, ExamUser::STATUS_NORMAL, ['exam']);
if ($examProgress) {
$examResource = new ExamUserResource($examProgress);
$examInfo = $examResource->response()->getData(true)['data'];
} else {
$examInfo = null;
}
return [
'base_info' => $baseInfo,
'exam_info' => $examInfo,
];
}
public function store(array $params)
{
$password = $params['password'];