Eliminate array_merge when calculating examAttempts.

Part 1 of a performance overhaul.
VATUSA · Jun 6, 2024 · 7d95f4f · 7d95f4f
1 parent 6167fb0
commit 7d95f4f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 28 deletions.
diff --git a/app/Http/Controllers/MgtController.php b/app/Http/Controllers/MgtController.php
@@ -141,28 +141,26 @@ public function getController(Request $request, $cid = null)
             $c1AssignmentDate = $moodle->getUserEnrolmentTimestamp($uid, config('exams.C1.enrolId'));
 
             $examAttempts = [
-                'Basic ATC/S1 Exam' => array_merge([
+                'Basic ATC/S1 Exam' => [
                     'examInfo' => config('exams.BASIC'),
                     'assignDate' => $basicAssignmentDate ?
-                        Carbon::createFromTimestampUTC($basicAssignmentDate)->format('Y-m-d H:i') : false
-                ], ['attempts' => $moodle->getQuizAttempts(config('exams.BASIC.id'), null, $uid)]),
-                'S2 Rating (TWR) Controller Exam' => array_merge([
+                        Carbon::createFromTimestampUTC($basicAssignmentDate)->format('Y-m-d H:i') : false,
+                    'attempts' => $moodle->getQuizAttempts(config('exams.BASIC.id'), null, $uid)],
+                'S2 Rating (TWR) Controller Exam' => [
                     'examInfo' => config('exams.S2'),
                     'assignDate' => $s2AssignmentDate ?
-                        Carbon::createFromTimestampUTC($s2AssignmentDate)->format('Y-m-d H:i') : false
-                ], ['attempts' => $moodle->getQuizAttempts(config('exams.S2.id'), null, $uid)]),
-                'S3 Rating (DEP/APP) Controller Exam' => array_merge([
+                        Carbon::createFromTimestampUTC($s2AssignmentDate)->format('Y-m-d H:i') : false,
+                    'attempts' => $moodle->getQuizAttempts(config('exams.S2.id'), null, $uid)],
+                'S3 Rating (DEP/APP) Controller Exam' => [
                     'examInfo' => config('exams.S3'),
                     'assignDate' => $s3AssignmentDate ?
-                        Carbon::createFromTimestampUTC($s3AssignmentDate)->format('Y-m-d H:i') : false
-                ],
-                    ['attempts' => $moodle->getQuizAttempts(config('exams.S3.id'), null, $uid)]),
-                'C1 Rating (CTR) Controller Exam' => array_merge([
+                        Carbon::createFromTimestampUTC($s3AssignmentDate)->format('Y-m-d H:i') : false,
+                    'attempts' => $moodle->getQuizAttempts(config('exams.S3.id'), null, $uid)],
+                'C1 Rating (CTR) Controller Exam' => [
                     'examInfo' => config('exams.C1'),
                     'assignDate' => $c1AssignmentDate ?
-                        Carbon::createFromTimestampUTC($c1AssignmentDate)->format('Y-m-d H:i') : false
-                ],
-                    ['attempts' => $moodle->getQuizAttempts(config('exams.C1.id'), null, $uid)]),
+                        Carbon::createFromTimestampUTC($c1AssignmentDate)->format('Y-m-d H:i') : false,
+                    'attempts' => $moodle->getQuizAttempts(config('exams.C1.id'), null, $uid)],
             ];
 
             $assignedRoles = RoleHelperV2::assignedRoles($cid);

diff --git a/app/Http/Controllers/MyController.php b/app/Http/Controllers/MyController.php
@@ -73,28 +73,26 @@ public function getProfile(Request $request) {
             config('exams.C1.enrolId'));
 
         $examAttempts = [
-            'Basic ATC/S1 Exam' => array_merge([
+            'Basic ATC/S1 Exam' => [
                 'examInfo' => config('exams.BASIC'),
                 'assignDate' => $basicAssignmentDate ?
-                    Carbon::createFromTimestampUTC($basicAssignmentDate)->format('Y-m-d H:i') : false
-            ], ['attempts' => $moodle->getQuizAttempts(config('exams.BASIC.id'), null, $uid)]),
-            'S2 Rating (TWR) Controller Exam' => array_merge([
+                    Carbon::createFromTimestampUTC($basicAssignmentDate)->format('Y-m-d H:i') : false,
+                'attempts' => $moodle->getQuizAttempts(config('exams.BASIC.id'), null, $uid)],
+            'S2 Rating (TWR) Controller Exam' => [
                 'examInfo' => config('exams.S2'),
                 'assignDate' => $s2AssignmentDate ?
-                    Carbon::createFromTimestampUTC($s2AssignmentDate)->format('Y-m-d H:i') : false
-            ], ['attempts' => $moodle->getQuizAttempts(config('exams.S2.id'), null, $uid)]),
-            'S3 Rating (DEP/APP) Controller Exam' => array_merge([
+                    Carbon::createFromTimestampUTC($s2AssignmentDate)->format('Y-m-d H:i') : false,
+                'attempts' => $moodle->getQuizAttempts(config('exams.S2.id'), null, $uid)],
+            'S3 Rating (DEP/APP) Controller Exam' => [
                 'examInfo' => config('exams.S3'),
                 'assignDate' => $s3AssignmentDate ?
-                    Carbon::createFromTimestampUTC($s3AssignmentDate)->format('Y-m-d H:i') : false
-            ],
-                ['attempts' => $moodle->getQuizAttempts(config('exams.S3.id'), null, $uid)]),
-            'C1 Rating (CTR) Controller Exam' => array_merge([
+                    Carbon::createFromTimestampUTC($s3AssignmentDate)->format('Y-m-d H:i') : false,
+                'attempts' => $moodle->getQuizAttempts(config('exams.S3.id'), null, $uid)],
+            'C1 Rating (CTR) Controller Exam' => [
                 'examInfo' => config('exams.C1'),
                 'assignDate' => $c1AssignmentDate ?
-                    Carbon::createFromTimestampUTC($c1AssignmentDate)->format('Y-m-d H:i') : false
-            ],
-                ['attempts' => $moodle->getQuizAttempts(config('exams.C1.id'), null, $uid)]),
+                    Carbon::createFromTimestampUTC($c1AssignmentDate)->format('Y-m-d H:i') : false,
+                'attempts' => $moodle->getQuizAttempts(config('exams.C1.id'), null, $uid)],
         ];
 
         return view('my.profile',