Changed: Fix findJobById return cached value. This issue can affect dependent job schedule if it is done by other enqueue job

aigarszuika · aigarszuika · commit 29e0260ca0ec · 2021-05-26T16:40:11.000+03:00
diff --git a/pkg/job-queue/Doctrine/JobStorage.php b/pkg/job-queue/Doctrine/JobStorage.php
@@ -58,13 +58,18 @@ public function findJobById($id)
     {
         $qb = $this->getEntityRepository()->createQueryBuilder('job');
 
-        return $qb
+        $job = $qb
             ->addSelect('rootJob')
             ->leftJoin('job.rootJob', 'rootJob')
             ->where('job = :id')
             ->setParameter('id', $id)
             ->getQuery()->getOneOrNullResult()
         ;
+        if ($job) {
+            $this->refreshJobEntity($job);
+        }
+
+        return $job;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,18 @@ public function findJobById($id)`
`58`	`58`	`{`
`59`	`59`	`$qb = $this->getEntityRepository()->createQueryBuilder('job');`
`60`	`60`
`61`		`- return $qb`
	`61`	`+ $job = $qb`
`62`	`62`	`->addSelect('rootJob')`
`63`	`63`	`->leftJoin('job.rootJob', 'rootJob')`
`64`	`64`	`->where('job = :id')`
`65`	`65`	`->setParameter('id', $id)`
`66`	`66`	`->getQuery()->getOneOrNullResult()`
`67`	`67`	`;`
	`68`	`+ if ($job) {`
	`69`	`+ $this->refreshJobEntity($job);`
	`70`	`+ }`
	`71`	`+`
	`72`	`+ return $job;`
`68`	`73`	`}`
`69`	`74`
`70`	`75`	`/**`