fix exam get begin and end

xiaomlove · Apr 12, 2024 · cb4f91b · cb4f91b
1 parent 6ea03a2
commit cb4f91b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git a/app/Models/Exam.php b/app/Models/Exam.php
@@ -164,14 +164,14 @@ public function getFilterFormattedAttribute(): string
         return implode("<br/>", $arr);
     }
 
-    public function begin(): Attribute
+    protected function beginForUser(): Attribute
     {
         return new Attribute(
             get: fn ($value) => $value ? Carbon::parse($value) : Carbon::now()
         );
     }
 
-    public function end(): Attribute
+    protected function endForUser(): Attribute
     {
         return new Attribute(
             get: function ($value, $attributes) {
@@ -180,8 +180,8 @@ public function end(): Attribute
                 }
                 if (!empty($attributes['duration'])) {
                     /** @var Carbon $begin */
-                    $begin = $this->begin;
-                    return $begin->addDays($attributes['duration']);
+                    $begin = $this->begin_for_user;
+                    return $begin->clone()->addDays($attributes['duration']);
                 }
                 throw new \RuntimeException("No specific end or duration");
             }

diff --git a/app/Repositories/ExamRepository.php b/app/Repositories/ExamRepository.php
@@ -349,27 +349,12 @@ public function assignToUser(int $uid, int $examId, $begin = null, $end = null)
             'exam_id' => $exam->id,
         ];
         if (empty($begin)) {
-            if (!empty($exam->begin)) {
-                $begin = $exam->begin;
-                $logPrefix .= ", begin from exam->begin: $begin";
-            } else {
-                $begin = now();
-                $logPrefix .= ", begin from now: $begin";
-            }
+            $begin = $exam->begin_for_user;
         } else {
             $begin = Carbon::parse($begin);
         }
         if (empty($end)) {
-            if (!empty($exam->end)) {
-                $end = $exam->end;
-                $logPrefix .= ", end from exam->end: $end";
-            } elseif ($exam->duration > 0) {
-                $duration = $exam->duration;
-                $end = $begin->clone()->addDays($duration)->toDateTimeString();
-                $logPrefix .= ", end from begin + duration($duration): $end";
-            } else {
-                throw new \RuntimeException("No specific end or duration");
-            }
+            $end = $exam->end_for_user;
         } else {
             $end = Carbon::parse($end);
         }
@@ -1018,8 +1003,8 @@ public function fetchUserAndDoAssign(Exam $exam): bool|int
         $size = 1000;
         $minId = 0;
         $result = 0;
-        $begin = $exam->begin;
-        $end = $exam->end;
+        $begin = $exam->begin_for_user;
+        $end = $exam->end_for_user;
         while (true) {
             $logPrefix = sprintf('[%s], exam: %s, size: %s', __FUNCTION__, $exam->id , $size);
             $users = (clone $baseQuery)->where("$userTable.id", ">", $minId)->limit($size)->get();

diff --git a/include/constants.php b/include/constants.php
@@ -1,6 +1,6 @@
 <?php
 defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.12');
-defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-04-10');
+defined('RELEASE_DATE') || define('RELEASE_DATE', '2024-04-13');
 defined('IN_TRACKER') || define('IN_TRACKER', false);
 defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
 defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");