[internal-api-client] OrchestrationJobMatcher::matchTaskJobsForOrchestrationJob with optional ComponentsApi

Author: ErikZigo

src/Orchestration/OrchestrationJobMatcher.php

@@ -16,16 +16,17 @@ class OrchestrationJobMatcher
 {
     public function __construct(
         private readonly Client $internalClient,
-        private readonly ?Components $componentsApi = null,
     ) {
     }
 
-    public function matchTaskJobsForOrchestrationJob(string $jobId): OrchestrationJobMatcherResults
-    {
+    public function matchTaskJobsForOrchestrationJob(
+        string $jobId,
+        ?Components $componentsApi = null,
+    ): OrchestrationJobMatcherResults {
         $job = $this->internalClient->getJob($jobId);
 
         $childJobs = $this->getOrchestrationTaskJobs($job);
-        $configuration = $this->getCurrentOrchestrationConfiguration($job);
+        $configuration = $this->getCurrentOrchestrationConfiguration($job, $componentsApi);
         $this->validateInputs($job, $configuration);
         $matchedTasks = [];
         foreach ($configuration['tasks'] as $task) {
@@ -67,18 +68,18 @@ private function getOrchestrationTaskJobs(JobInterface $job): array
         );
     }
 
-    private function getCurrentOrchestrationConfiguration(JobInterface $job): array
+    private function getCurrentOrchestrationConfiguration(JobInterface $job, ?Components $componentsApi = null): array
     {
         $configuration = $job->getConfigData();
         if ($configuration) {
             return $configuration;
         }
 
         // for situations where job token is expired/deleted
-        if ($this->componentsApi) {
+        if ($componentsApi) {
             return JobFactory\JobConfigurationResolver::resolveJobConfiguration(
                 $job,
-                $this->componentsApi,
+                $componentsApi,
             )['configuration'];
         }
 

tests/Orchestration/OrchestrationJobMatcherTest.php

@@ -380,9 +380,9 @@ public function testMatcherLoadsConfigurationDirectlyFromComponentsApi(): void
             ])
         ;
 
-        $matcher = new OrchestrationJobMatcher($queueClientMock, $componentsApiMock);
+        $matcher = new OrchestrationJobMatcher($queueClientMock);
 
-        $results = $matcher->matchTaskJobsForOrchestrationJob('123');
+        $results = $matcher->matchTaskJobsForOrchestrationJob('123', $componentsApiMock);
 
         self::assertSame('123', $results->jobId);
         self::assertSame('456', $results->configId);