blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-28 17:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

generateESI Job bugfixes (correct models, Ids in error logs), added insertvon

Browse Source
This commit is contained in:
KarpAlex
2023-03-23 17:50:32 +01:00
parent cd6443d9c0
commit 903f3d2f37
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/jobs/ESIJob.php
+11 -15
View File
@@ -10,6 +10,7 @@ require_once('schedulers/ESIScheduler.php');
class ESIJob extends JQW_Controller
{
const ESI_PREFIX = 'urn:schac:personalUniqueCode:int:esi:at:';
const INSERT_VON = 'generateEsiJob';
/**
* Controller initialization
@@ -19,11 +20,8 @@ class ESIJob extends JQW_Controller
parent::__construct();
// load models
$this->load->model('Person_model', 'PersonModel');
$this->load->model('Kennzeichen_model', 'KennzeichenModel');
// load libraries
//$this->load->library('extensions/FHC-Core-DVUH/DVUHIssueLib');
$this->load->model('person/Person_model', 'PersonModel');
$this->load->model('person/Kennzeichen_model', 'KennzeichenModel');
}
//------------------------------------------------------------------------------------------------------------------
@@ -39,6 +37,7 @@ class ESIJob extends JQW_Controller
// Gets the latest jobs
$lastJobs = $this->getLastJobs(ESIScheduler::JOB_TYPE_GENERATE_ESI);
if (isError($lastJobs))
{
$this->logError(getCode($lastJobs).': '.getError($lastJobs), ESIScheduler::JOB_TYPE_GENERATE_ESI);
@@ -69,7 +68,7 @@ class ESIJob extends JQW_Controller
if (hasData($activeKennzeichenRes))
{
$this->logError("Active ESI for person Id $prestudent_id already exists");
$this->logError("Active ESI for person Id $person_id already exists");
continue;
}
@@ -91,7 +90,7 @@ class ESIJob extends JQW_Controller
continue;
}
$esi = self::ESI_PREFIX.$matrikelnr;
$esi = self::ESI_PREFIX.$matr_nr;
// check if ESI was already used
$this->KennzeichenModel->addSelect('1');
@@ -101,17 +100,18 @@ class ESIJob extends JQW_Controller
if (hasData($existingKennzeichenRes))
{
$this->logError("ESI $esi for person Id $prestudent_id already exists");
$this->logError("ESI $esi for person Id $person_id already exists");
continue;
}
// if everything ok, save the esi for the person
$saveEsiResult = $this->Kennzeichen_model->insert(
$saveEsiResult = $this->KennzeichenModel->insert(
array(
'person_id' => $person_id,
'kennzeichentyp_kurzbz' => ESIScheduler::KENNZEICHENTYP_KURZBZ,
'inhalt' => $esi,
'aktiv' => true
'aktiv' => true,
'insertvon' => self::INSERT_VON
)
);
@@ -119,10 +119,6 @@ class ESIJob extends JQW_Controller
{
$this->logError("Error when sending ESI, person Id $person_id ".getError($saveEsiResult));
}
elseif (hasData($saveEsiResult))
{
// TODO everything ok
}
}
}
@@ -133,7 +129,7 @@ class ESIJob extends JQW_Controller
array(JobsQueueLib::STATUS_DONE, date('Y-m-d H:i:s')) // Job properties new values
);
if (hasData($lastJobs)) $this->updateJobsQueue($jobType, getData($lastJobs));
if (hasData($lastJobs)) $this->updateJobsQueue(ESIScheduler::JOB_TYPE_GENERATE_ESI, getData($lastJobs));
}
$this->logInfo(ESIScheduler::JOB_TYPE_GENERATE_ESI.' job stop');