hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-3750 admin - worker - job - add sum for job duration - add time filter like 1h - 3h - 12h - 1d -3d - 1w (#4144)

Browse Source 
* duration sum and time filter

* time filter

* add week and month filter
This commit is contained in:
Aina Sitraka
2022-10-04 18:34:26 +03:00
committed by GitHub
parent 1c9e26245d
commit 1481f163f1
13 changed files with 365 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php
View File

@@ -379,39 +379,71 @@ class WorkerRunningJobRepository extends EntityRepository
return count($qb->getQuery()->getResult());
}
public function findByFilter(array $status, $jobType, $databoxId, $recordId, $start = 0, $limit = WorkerRunningJob::MAX_RESULT)
public function findByFilter(array $status, $jobType, $databoxId, $recordId, $dateTimeFilter = null, $start = 0, $limit = WorkerRunningJob::MAX_RESULT)
{
$qb = $this->createQueryBuilder('w');
$rsm = new ResultSetMappingBuilder($this->_em);
$rsm->addScalarResult('info', 'info');
$rsm->addScalarResult('databoxId', 'databoxId');
$rsm->addScalarResult('recordId', 'recordId');
$rsm->addScalarResult('work', 'work');
$rsm->addScalarResult('workOn', 'workOn');
$rsm->addScalarResult('published', 'published');
$rsm->addScalarResult('created', 'created');
$rsm->addScalarResult('finished', 'finished');
$rsm->addScalarResult('duration', 'duration');
$rsm->addScalarResult('status', 'status');
$sql = "SELECT info, databox_id as databoxId, record_id as recordId, work, work_on as workOn, published, created, finished, status, TIMESTAMPDIFF(SECOND, w.created, w.finished) as duration \n"
. "FROM WorkerRunningJob w \n"
. "WHERE 1";
$params = [];
$statusParam = false;
if (!empty($status)) {
$qb->where($qb->expr()->in('w.status', $status));
$sql .= " AND w.status IN (:status)";
$statusParam = true;
}
if (!empty($jobType)) {
$qb->andWhere('w.work = :work')
->setParameter('work', $jobType);
$sql .= " AND w.work = :work";
$params['work'] = $jobType;
}
if (!empty($databoxId)) {
$qb->andWhere('w.databoxId = :databoxId')
->setParameter('databoxId', $databoxId);
$sql .= " AND w.databoxId = :databoxId";
$params['databoxId'] = $databoxId;
}
if (!empty($recordId)) {
$qb->andWhere('w.recordId = :recordId')
->setParameter('recordId', $recordId);
$sql .= " AND w.recordId = :recordId";
$params['recordId'] = $recordId;
}
if ($dateTimeFilter instanceof DateTime) {
// on published because the row is only created whe the job is started
$sql .= " AND w.published >= :dateTimeFilter";
$params['dateTimeFilter'] = $dateTimeFilter->format('Y-m-d H:i:s');
}
$sql .= " ORDER BY w.id DESC";
if ($limit !== null) {
$qb->setMaxResults($limit);
$sql .= " LIMIT " . $limit;
}
$qb
->setFirstResult($start)
->orderBy('w.id', 'DESC')
;
$sql .= " OFFSET " . $start;
return $qb->getQuery()->getResult();
$q = $this->_em->createNativeQuery($sql, $rsm);
if (!empty($params)) {
$q->setParameters($params);
}
if ($statusParam) {
$q->setParameter('status', $status, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY);
}
return $q->getResult();
}
public function getJobCount(array $status, $jobType, $databoxId, $recordId)