Include progress field in _findProgress() method

Author: houseoftech

Model/QueuedTask.php

@@ -355,6 +355,7 @@ protected function _findProgress($state, $query = [], $results = []) {
 			$query['fields'] = [
 				$this->alias . '.reference',
 				'(CASE WHEN ' . $this->alias . '.notbefore > NOW() THEN \'NOT_READY\' WHEN ' . $this->alias . '.fetched IS null THEN \'NOT_STARTED\' WHEN ' . $this->alias . '.fetched IS NOT null AND ' . $this->alias . '.completed IS null AND ' . $this->alias . '.failed = 0 THEN \'IN_PROGRESS\' WHEN ' . $this->alias . '.fetched IS NOT null AND ' . $this->alias . '.completed IS null AND ' . $this->alias . '.failed > 0 THEN \'FAILED\' WHEN ' . $this->alias . '.fetched IS NOT null AND ' . $this->alias . '.completed IS NOT null THEN \'COMPLETED\' ELSE \'UNKNOWN\' END) AS status',
+				$this->alias . '.progress',
 				$this->alias . '.failure_message'
 			];
 			if (isset($query['conditions']['exclude'])) {
@@ -380,6 +381,9 @@ protected function _findProgress($state, $query = [], $results = []) {
 				'reference' => $result[$this->alias]['reference'],
 				'status' => $result[0]['status']
 			];
+			if (!empty($result[$this->alias]['progress'])) {
+				$results[$k]['progress'] = $result[$this->alias]['progress'];
+			}
 			if (!empty($result[$this->alias]['failure_message'])) {
 				$results[$k]['failure_message'] = $result[$this->alias]['failure_message'];
 			}