locale + exam assign and checkout cronjob

This commit is contained in:
xiaomlove
2021-04-28 19:44:48 +08:00
parent 034d1c23fb
commit 1c31f4b22d
34 changed files with 1278 additions and 90 deletions
+6 -2
View File
@@ -45,7 +45,11 @@ class Test extends Command
public function handle()
{
$rep = new ExamRepository();
$r = $rep->addProgress(15, 1, 250, 1);
dd($r);
// $r = $rep->assignToUser(1, 1);
// $r = $rep->addProgress(27, 4, 1025, 1);
// dd($r);
// $rep->assignCronjob();
$rep->cronjobCheckout();
}
}
+1
View File
@@ -63,5 +63,6 @@ class Kernel extends HttpKernel
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'permission' => \App\Http\Middleware\Permission::class,
'locale' => \App\Http\Middleware\Locale::class,
];
}
+32
View File
@@ -0,0 +1,32 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\App;
class Locale
{
public static $languageMaps = [
'en' => 'en',
'chs' => 'zh_CN',
'cht' => 'zh_TW',
];
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle(Request $request, Closure $next)
{
$language = $request->user()->language;
$locale = self::$languageMaps[$language->site_lang_folder] ?? 'en';
do_log("set locale: " . $locale);
App::setLocale($locale);
return $next($request);
}
}
+1 -1
View File
@@ -25,7 +25,7 @@ class Permission
do_log("$log, denied!");
throw new UnauthorizedException('Unauthorized!');
}
do_log("$log, pass!");
do_log("$log, allow!");
return $next($request);
}
}
+3 -3
View File
@@ -23,11 +23,11 @@ class ExamUserResource extends JsonResource
'id' => $this->id,
'status' => $this->status,
'status_text' => $this->statusText,
'created_at' => formatDatetime($this->created_at),
'created_at' => format_datetime($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),
'begin' => format_datetime($this->begin),
'end' => format_datetime($this->end),
'uid' => $this->uid,
'exam_id' => $this->exam_id,
'user' => new UserResource($this->whenLoaded('user')),
+1 -1
View File
@@ -19,7 +19,7 @@ class UserResource extends JsonResource
'email' => $this->email,
'username' => $this->username,
'status' => $this->status,
'added' => formatDatetime($this->added),
'added' => format_datetime($this->added),
'class' => $this->class,
'class_text' => $this->class_text,
'avatar' => $this->avatar,
+5 -1
View File
@@ -4,7 +4,7 @@ namespace App\Models;
class ExamUser extends NexusModel
{
protected $fillable = ['exam_id', 'uid', 'status', 'progress', 'begin', 'end'];
protected $fillable = ['exam_id', 'uid', 'status', 'progress', 'begin', 'end', 'is_done'];
public $timestamps = true;
@@ -16,6 +16,10 @@ class ExamUser extends NexusModel
self::STATUS_FINISHED => ['text' => 'Finished'],
];
const IS_DONE_YES = 1;
const IS_DONE_NO = 0;
protected $casts = [
'progress' => 'json'
];
+12
View File
@@ -0,0 +1,12 @@
<?php
namespace App\Models;
class Language extends NexusModel
{
protected $table = 'language';
protected $fillable = [
'lang_name', 'site_lang_folder',
];
}
+12
View File
@@ -0,0 +1,12 @@
<?php
namespace App\Models;
class Message extends NexusModel
{
protected $table = 'messages';
protected $fillable = [
'sender', 'receiver', 'added', 'subject', 'msg', 'unread', 'location', 'saved'
];
}
+5
View File
@@ -123,4 +123,9 @@ class User extends Authenticatable
return $this->hasMany(ExamUser::class, 'uid');
}
public function language()
{
return $this->belongsTo(Language::class, 'lang');
}
}
+1
View File
@@ -2,6 +2,7 @@
namespace App\Providers;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\ServiceProvider;
use Illuminate\Http\Resources\Json\JsonResource;
+191 -47
View File
@@ -5,10 +5,12 @@ use App\Exceptions\NexusException;
use App\Models\Exam;
use App\Models\ExamProgress;
use App\Models\ExamUser;
use App\Models\Message;
use App\Models\Setting;
use App\Models\Torrent;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Database\Query\JoinClause;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\DB;
@@ -25,6 +27,10 @@ class ExamRepository extends BaseRepository
public function store(array $params)
{
$this->checkIndexes($params);
$valid = $this->listValid();
if ($valid->isNotEmpty()) {
throw new NexusException("Valid exam already exists.");
}
$exam = Exam::query()->create($params);
return $exam;
}
@@ -32,6 +38,10 @@ class ExamRepository extends BaseRepository
public function update(array $params, $id)
{
$this->checkIndexes($params);
$valid = $this->listValid($id);
if ($valid->isNotEmpty()) {
throw new NexusException("Valid exam already exists.");
}
$exam = Exam::query()->findOrFail($id);
$exam->update($params);
return $exam;
@@ -78,16 +88,21 @@ class ExamRepository extends BaseRepository
/**
* list valid exams
*
* @param null $excludeId
* @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
*/
public function listValid()
public function listValid($excludeId = null)
{
$now = Carbon::now();
return Exam::query()
$query = Exam::query()
->where('begin', '<=', $now)
->where('end', '>=', $now)
->where('status', Exam::STATUS_ENABLED)
->get();
->orderBy('id', 'desc');
if ($excludeId) {
$query->whereNotIn('id', Arr::wrap($excludeId));
}
return $query->get();
}
/**
@@ -104,48 +119,55 @@ class ExamRepository extends BaseRepository
do_log("$logPrefix, no valid exam.");
return $exams;
}
$user = User::query()->findOrFail($uid, ['id', 'username', 'added', 'class']);
$filtered = $exams->filter(function (Exam $exam) use ($user, $logPrefix) {
$filters = $exam->filters;
if (empty($filters->classes)) {
do_log("$logPrefix, exam: {$exam->id} no class");
return false;
}
if (!in_array($user->class, $filters->classes)) {
do_log("$logPrefix, user class: {$user->class} not in: " . json_encode($filters));
return false;
}
if (!$user->added) {
do_log("$logPrefix, user no added time", 'warning');
return false;
}
$added = $user->added->toDateTimeString();
$registerTimeBegin = $filters->register_time_range[0] ? Carbon::parse($filters->register_time_range[0])->toDateString() : '';
$registerTimeEnd = $filters->register_time_range[1] ? Carbon::parse($filters->register_time_range[1])->toDateString() : '';
if (empty($registerTimeBegin)) {
do_log("$logPrefix, exam: {$exam->id} no register_time_begin");
return false;
}
if ($added < $registerTimeBegin) {
do_log("$logPrefix, added: $added not after: " . $registerTimeBegin);
return false;
}
if (empty($registerTimeEnd)) {
do_log("$logPrefix, exam: {$exam->id} no register_time_end");
return false;
}
if ($added > $registerTimeEnd) {
do_log("$logPrefix, added: $added not before: " . $registerTimeEnd);
return false;
}
return true;
$matched = $exams->filter(function (Exam $exam) use ($uid, $logPrefix) {
return $this->isExamMatchUser($exam, $uid);
});
return $filtered;
return $matched;
}
private function isExamMatchUser(Exam $exam, $user)
{
if (!$user instanceof User) {
$user = User::query()->findOrFail(intval($user), ['id', 'username', 'added', 'class']);
}
$logPrefix = sprintf('exam: %s, user: %s', $exam->id, $user->id);
$filters = $exam->filters;
if (empty($filters->classes)) {
do_log("$logPrefix, exam: {$exam->id} no class");
return false;
}
if (!in_array($user->class, $filters->classes)) {
do_log("$logPrefix, user class: {$user->class} not in: " . json_encode($filters));
return false;
}
if (!$user->added) {
do_log("$logPrefix, user no added time", 'warning');
return false;
}
$added = $user->added->toDateTimeString();
$registerTimeBegin = $filters->register_time_range[0] ? Carbon::parse($filters->register_time_range[0])->toDateString() : '';
$registerTimeEnd = $filters->register_time_range[1] ? Carbon::parse($filters->register_time_range[1])->toDateString() : '';
if (empty($registerTimeBegin)) {
do_log("$logPrefix, exam: {$exam->id} no register_time_begin");
return false;
}
if ($added < $registerTimeBegin) {
do_log("$logPrefix, added: $added not after: " . $registerTimeBegin);
return false;
}
if (empty($registerTimeEnd)) {
do_log("$logPrefix, exam: {$exam->id} no register_time_end");
return false;
}
if ($added > $registerTimeEnd) {
do_log("$logPrefix, added: $added not before: " . $registerTimeEnd);
return false;
}
return true;
}
@@ -244,8 +266,16 @@ class ExamRepository extends BaseRepository
do_log("$logPrefix [addProgress] " . nexus_json_encode($data));
$newProgress = $examUser->progresses()->create($data);
$examProgress = $this->calculateProgress($examUser);
do_log("$logPrefix [updateProgress] " . nexus_json_encode($examProgress));
$examUser->update(['progress' => $examProgress]);
$examProgressFormatted = $this->getProgressFormatted($exam, $examProgress);
$examNotPassed = array_filter($examProgressFormatted, function ($item) {
return !$item['passed'];
});
$update = [
'progress' => $examProgress,
'is_done' => count($examNotPassed) ? ExamUser::IS_DONE_NO : ExamUser::IS_DONE_YES,
];
do_log("$logPrefix [updateProgress] " . nexus_json_encode($update));
$examUser->update($update);
return $newProgress;
}
@@ -253,7 +283,7 @@ class ExamRepository extends BaseRepository
{
$logPrefix = "uid: $uid";
$query = ExamUser::query()->where('uid', $uid)->orderBy('exam_id', 'desc');
if ($status) {
if (!is_null($status)) {
$query->where('status', $status);
}
if (!empty($with)) {
@@ -310,7 +340,7 @@ class ExamRepository extends BaseRepository
->groupBy(['index'])
->get();
do_log("$logPrefix, query: " . last_query() . ", progressSum: " . $progressSum->toJson());
do_log("$logPrefix, " . last_query() . ", progressSum: " . $progressSum->toJson());
return $progressSum->pluck('sum', 'index')->toArray();
@@ -339,7 +369,8 @@ class ExamRepository extends BaseRepository
$currentValueFormatted = $currentValue;
$requireValueAtomic = $requireValue;
}
$index['require_value_formatted'] = "$requireValue {$index['unit']}";
$index['index_formatted'] = nexus_trans('exam.index_text_' . $index['index']);
$index['require_value_formatted'] = "$requireValue " . ($index['unit'] ?? '');
$index['current_value'] = $currentValue;
$index['current_value_formatted'] = $currentValueFormatted;
$index['passed'] = $currentValue >= $requireValueAtomic;
@@ -359,6 +390,119 @@ class ExamRepository extends BaseRepository
return $result;
}
public function cronjonAssign()
{
$exams = $this->listValid();
if ($exams->isEmpty()) {
do_log("No valid exam.");
return true;
}
if ($exams->count() > 1) {
do_log("Valid exam more than 1.", "warning");
}
/** @var Exam $exam */
$exam = $exams->first();
$userTable = (new User())->getTable();
$examUserTable = (new ExamUser())->getTable();
User::query()
->leftJoin($examUserTable, function (JoinClause $join) use ($examUserTable, $userTable) {
$join->on("$userTable.id", "=", "$examUserTable.uid")
->on("$examUserTable.status", "=", DB::raw(ExamUser::STATUS_NORMAL));
})
->whereRaw("$examUserTable.id is null")
->selectRaw("$userTable.*")
->chunk(100, function ($users) use ($exam) {
do_log("user count: " . $users->count() . last_query());
$insert = [];
$now = Carbon::now()->toDateTimeString();
foreach ($users as $user) {
$logPrefix = sprintf('[assignCronjob] user: %s, exam: %s', $user->id, $exam->id);
if (!$this->isExamMatchUser($exam, $user)) {
do_log("$logPrefix, exam not match user.");
continue;
}
$insert[] = [
'uid' => $user->id,
'exam_id' => $exam->id,
'created_at' => $now,
'updated_at' => $now,
];
do_log("$logPrefix, exam assign to user.");
}
ExamUser::query()->insert($insert);
});
return true;
}
public function cronjobCheckout()
{
$now = Carbon::now()->toDateTimeString();
$examUserTable = (new ExamUser())->getTable();
$examTable = (new Exam())->getTable();
$perPage = 100;
$page = 1;
$query = ExamUser::query()
->join($examTable, "$examUserTable.exam_id", "=", "$examTable.id")
->where("$examUserTable.status", ExamUser::STATUS_NORMAL)
->whereRaw("if($examUserTable.begin is not null, $examUserTable.begin <= '$now', $examTable.begin <= '$now')")
->whereRaw("if($examUserTable.end is not null, $examUserTable.end >= '$now', $examTable.end >= '$now')")
->selectRaw("$examUserTable.*")
->with(['exam', 'user', 'user.language'])
->orderBy("$examUserTable.id", "asc");
while (true) {
$logPrefix = sprintf('[%s], page: %s', __FUNCTION__, $page);
$examUsers = $query->forPage($page, $perPage)->get("$examUserTable.*");
if ($examUsers->isEmpty()) {
do_log("$logPrefix, no more data..." . last_query());
break;
} else {
do_log("$logPrefix, fetch exam users: {$examUsers->count()}, " . last_query());
}
$now = Carbon::now()->toDateTimeString();
$idArr = $uidToDisable = $messageToSend = [];
foreach ($examUsers as $examUser) {
$idArr[] = $examUser->id;
$uid = $examUser->uid;
$currentLogPrefix = sprintf("$logPrefix, user: %s, exam: %s, examUser: %s", $uid, $examUser->exam_id, $examUser->id);
if ($examUser->is_done) {
do_log("$currentLogPrefix, [is_done]");
$messageToSend[] = [
'receiver' => $uid,
'added' => $now,
'subject' => 'Exam passed!',
'msg' => sprintf(
'Congratulations! You have complete the exam: %s in time(%s ~ %s)!',
$examUser->exam->name, $examUser->begin ?? $examUser->exam->begin, $examUser->end ?? $examUser->exam->end
),
];
} else {
do_log("$currentLogPrefix, [will be banned]");
//ban user
$uidToDisable[] = $uid;
$messageToSend[] = [
'receiver' => $uid,
'added' => $now,
'subject' => 'Exam not passed! And your account is banned!',
'msg' => sprintf(
'You did not complete the exam: %s in time(%s ~ %s), so your account has been banned!',
$examUser->exam->name, $examUser->begin ?? $examUser->exam->begin, $examUser->end ?? $examUser->exam->end
),
];
}
}
DB::transaction(function () use ($uidToDisable, $messageToSend, $idArr) {
ExamUser::query()->whereIn('id', $idArr)->update(['status' => ExamUser::STATUS_FINISHED]);
Message::query()->insert($messageToSend);
if (!empty($uidToDisable)) {
User::query()->whereIn('id', $uidToDisable)->update(['enabled' => User::ENABLED_NO]);
}
});
$page++;
}
return true;
}
+43
View File
@@ -0,0 +1,43 @@
<?php
namespace App\Repositories;
use App\Models\Message;
use App\Models\User;
use Illuminate\Support\Facades\DB;
class MessageRepository extends BaseRepository
{
public function getList(array $params)
{
$query = Message::query();
list($sortField, $sortType) = $this->getSortFieldAndType($params);
$query->orderBy($sortField, $sortType);
return $query->paginate();
}
public function store(array $params)
{
$model = Message::query()->create($params);
return $model;
}
public function update(array $params, $id)
{
$model = Message::query()->findOrFail($id);
$model->update($params);
return $model;
}
public function getDetail($id)
{
$model = Message::query()->findOrFail($id);
return $model;
}
public function delete($id)
{
$model = Message::query()->findOrFail($id);
$result = $model->delete();
return $result;
}
}