Merge branch 'main' into 11864-update-work-experience-ui

.github/workflows/lint.yml

@@ -81,7 +81,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: "8.3"
           extensions: bcmath
 
       - name: Install composer dependencies

.github/workflows/phpunit.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: "8.3"
           extensions: bcmath
           coverage: pcov
 

.github/workflows/translations.yml

@@ -52,7 +52,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.2"
+          php-version: "8.3"
           extensions: bcmath
 
       - name: Install composer dependencies

.gitignore

@@ -8,3 +8,4 @@ hydrogen-logs
 .jekyll-cache
 .turbo
 .env
+hostingstart.html

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.2.9-apache-bullseye as base
+FROM php:8.3.9-apache-bullseye as base
 
 # Install pdo_pgsql extension.
 RUN apt-get update \

api/app/Generators/PoolCandidateCsvGenerator.php

@@ -11,10 +11,12 @@
 use App\Enums\CitizenshipStatus;
 use App\Enums\EstimatedLanguageAbility;
 use App\Enums\EvaluatedLanguageAbility;
+use App\Enums\FinalDecision;
 use App\Enums\GovEmployeeType;
 use App\Enums\IndigenousCommunity;
 use App\Enums\Language;
 use App\Enums\OperationalRequirement;
+use App\Enums\OverallAssessmentStatus;
 use App\Enums\PoolCandidateStatus;
 use App\Enums\PoolSkillType;
 use App\Enums\PriorityWeight;
@@ -54,6 +56,8 @@ class PoolCandidateCsvGenerator extends CsvGenerator implements FileGeneratorInt
 
     protected array $RODData = [];
 
+    protected array $finalDecisions = [];
+
     protected array $generatedHeaders = [
         'general_questions' => [],
         'screening_questions' => [],
@@ -274,6 +278,32 @@ public function generate(): self
                             }
                         }
                     }
+
+                    $decision = null;
+                    if (is_null($candidate->computed_final_decision) || $candidate->computed_final_decision === FinalDecision::TO_ASSESS->name) {
+                        if (! isset($candidate->computed_assessment_status['overallAssessmentStatus'])) {
+                            $decision = Lang::get('final_decision.to_assess', [], $this->lang);
+                        } else {
+                            if ($candidate->computed_assessment_status['overallAssessmentStatus'] === OverallAssessmentStatus::DISQUALIFIED->name) {
+                                $decision = Lang::get('final_decision.disqualified_pending', [], $this->lang);
+                            } elseif ($candidate->computed_assessment_status['currentStep'] === null) {
+                                $decision = Lang::get('final_decision.qualified_pending', [], $this->lang);
+                            } else {
+                                $decision = Lang::get('final_decision.to_assess', [], $this->lang)
+                                            .$this->colon()
+                                            .Lang::get('common.step', [], $this->lang)
+                                            .' '
+                                            .$candidate->computed_assessment_status['currentStep'];
+                            }
+                        }
+                    } else {
+                        $decision = $this->localizeEnum($candidate->computed_final_decision, FinalDecision::class);
+                    }
+
+                    $this->finalDecisions[] = [
+                        'candidate' => $currentCandidate,
+                        'value' => $decision,
+                    ];
                 }
 
                 // 1 is added to the key to account for the header row
@@ -398,6 +428,7 @@ private function generatePoolHeaders()
                                 );
                             }
                         }
+                        $this->generatedHeaders['ROD_details'][] = $this->localizeHeading('final_decision');
                     }
                 }
             });
@@ -448,6 +479,12 @@ private function generatePoolCells(Worksheet $sheet, int $columnCount)
                     }
                 }
             }
+            $currentColumn++;
+            if (isset($this->finalDecisions)) {
+                foreach ($this->finalDecisions as $row) {
+                    $sheet->setCellValue([$currentColumn, $row['candidate'] + 1], $row['value']);
+                }
+            }
         }
 
     }

api/app/GraphQL/Validators/UpdateUserAsUserInputValidator.php

@@ -45,8 +45,8 @@ public function rules(): array
                  */
                 Rule::unique('users', 'email')->ignore($this->arg('id'), 'id'),
                 Rule::unique('users', 'work_email')->ignore($this->arg('id'), 'id'),
-                // Note: Domains should be kept in sync with the workEmailDomainRegex
-                'ends_with:gc.ca,canada.ca,elections.ca,ccc.ca,canadapost-postescanada.ca,gg.ca',
+                // Note: Should be kept in sync with the workEmailDomainRegex
+                'regex:/@([A-Za-z0-9-]+\.)*(gc\.ca|canada\.ca|elections\.ca|ccc\.ca|canadapost-postescanada\.ca|gg\.ca)$/i',
             ],
             'sub' => [
                 'sometimes',

api/app/Models/PoolCandidate.php

@@ -1149,6 +1149,11 @@ public function computeFinalDecision()
         $status = $this->pool_candidate_status;
         $decision = null;
 
+        // Short circuit for a case which shouldn't really come up. A PoolCandidate should never go from non-draft back to draft, but just in case...
+        if ($status === PoolCandidateStatus::DRAFT->name || $status === PoolCandidateStatus::DRAFT_EXPIRED->name) {
+            return ['decision' => null, 'weight' => null];
+        }
+
         if (in_array($status, PoolCandidateStatus::toAssessGroup())) {
             $assessmentStatus = $this->computed_assessment_status;
             $overallStatus = null;
@@ -1199,6 +1204,7 @@ public function computeFinalDecision()
             FinalDecision::DISQUALIFIED->name => 210,
             FinalDecision::QUALIFIED_REMOVED->name => 220,
             FinalDecision::TO_ASSESS_REMOVED->name => 230,
+            FinalDecision::DISQUALIFIED_REMOVED->name => 235, // I don't think this can be reached right now.
             FinalDecision::REMOVED->name => 240,
             FinalDecision::QUALIFIED_EXPIRED->name => 250,
             default => $this->unMatchedDecision($decision)

api/composer.json

@@ -9,7 +9,7 @@
   ],
   "license": "AGPL-3.0",
   "require": {
-    "php": "^8.2",
+    "php": "^8.3",
     "doctrine/dbal": "^3.1",
     "gctc-ntgc/laravel-scout-postgres-tsvector": "^1.0",
     "guzzlehttp/guzzle": "^7.4",
@@ -62,7 +62,7 @@
     "sort-packages": true,
     "optimize-autoloader": true,
     "platform": {
-      "php": "8.2.9"
+      "php": "8.3.9"
     },
     "allow-plugins": {
       "composer/package-versions-deprecated": true

api/lang/en/common.php

@@ -21,4 +21,5 @@
     'not_sure' => 'Not sure',
     'expected_end_date' => '(Expected end date)',
     'not_found' => 'Not found',
+    'step' => 'Step',
 ];

api/lang/en/headings.php

@@ -80,4 +80,5 @@
     'decision' => 'Decision',
     'decision_details' => 'Decision details',
     'decision_notes' => 'Decision notes',
+    'final_decision' => 'Final decision',
 ];