blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-23 09:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue plausichecks: added issue producer files, code formatting

Browse Source
This commit is contained in:
KarpAlex
2022-09-15 18:56:18 +02:00
parent 0d03689f57
commit d5eff7d615
6 changed files with 127 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/jobs/PlausiIssueProducer.php
+40
View File
@@ -0,0 +1,40 @@
<?php
/**
* Job for producing Plausicheck issues
*/
class PlausiIssueProducer extends IssueProducer_Controller
{
public function __construct()
{
parent::__construct();
// set fehler codes which can be produced by the job
// structure: fehlercode => class (library) name for resolving
$this->_fehlerLibMappings = array(
'zgvDatumInZukunft' => 'ZgvDatumInZukunft',
'zgvDatumVorGeburtsdatum' => 'ZgvDatumVorGeburtsdatum',
'zgvMasterDatumInZukunft' => 'ZgvMasterDatumInZukunft',
'zgvMasterDatumVorZgvdatum' => 'ZgvMasterDatumVorZgvdatum',
'zgvMasterDatumVorGeburtsdatum' => 'ZgvMasterDatumVorGeburtsdatum',
'keinAufenthaltszweckPlausi' => 'KeinAufenthaltszweckPlausi',
'zuVieleZweckeIncomingPlausi' => 'ZuVieleZweckeIncomingPlausi',
'falscherIncomingZweckPlausi' => 'FalscherIncomingZweckPlausi',
'outgoingAufenthaltfoerderungfehltPlausi' => 'OutgoingAufenthaltfoerderungfehltPlausi',
'outgoingAngerechneteEctsFehlenPlausi' => 'OutgoingAngerechneteEctsFehlenPlausi',
'outgoingErworbeneEctsFehlenPlausi' => 'OutgoingErworbeneEctsFehlenPlausi'
);
$this->load->model('studiensemester_model', 'StudiensemesterModel');
}
public function run()
{
$semRes = $this->StudiensemesterModel->getAkt();
if (hasData($semRes))
{
$studiensemester_kurzbz = getData($semRes)[0]->studiensemester_kurzbz;
}
}
}
application/core/IIssueExistsChecker.php
+8 -2
View File
@@ -7,9 +7,15 @@ interface IIssueExistsChecker
{
/**
* Checks if an issue exists.
* Classes for checking if a certain issue exists implement this method.
* @param array $params parameters needed for issue detection
* @return object with success(true) if issue exists, success(false) otherwise
*/
public function checkIfIssueExists($params);
public function checkIfIssueExists($paramsForChecking);
/**
* Produces an issue.
* @param array $params parameters needed for issue detection
* @return object with success(true) if issue exists, success(false) otherwise
*/
public function produceIssue($person_id, $oe_kurzbz, $paramsForProducing);
}
application/core/IssueProducer_Controller.php
+40 -61
View File
@@ -7,8 +7,9 @@ abstract class IssueProducer_Controller extends JOB_Controller
{
const ISSUES_FOLDER = 'issues';
const CHECK_ISSUE_EXISTS_METHOD_NAME = 'checkIfIssueExists';
const PRODUCE_ISSUE_METHOD_NAME = 'produceIssue';
protected $_codeLibMappings;
protected $_fehlerLibMappings;
public function __construct()
{
@@ -20,73 +21,51 @@ abstract class IssueProducer_Controller extends JOB_Controller
}
/**
* Initializes issue resolution.
* Initializes issue production.
*/
public function run()
public function produceIssue($fehler_kurzbz, $person_id, $oe_kurzbz, $paramsForChecking, $paramsForProduction)
{
$this->logInfo("Issue producer job started");
// get libname from fehler_kurzbz
$libName = $this->_fehlerLibMappings[$fehler_kurzbz];
// if called from extension (extension name set), path includes extension names, otherwise it is the core library folder
$libRootPath = isset($this->_extensionName) ? 'extensions/' . $this->_extensionName . '/' : '';
$issuesLibPath = $libRootPath . self::ISSUES_FOLDER . '/';
$issuesLibFilePath = DOC_ROOT . 'application/' . $libRootPath . 'libraries/' . self::ISSUES_FOLDER . '/' . $libName . '.php';
foreach ($this->_codeLibMappings as $fehlercode => $library)
// check if library file exists
if (!file_exists($issuesLibFilePath)) return error("Issue library file " . $issuesLibFilePath . " does not exist");
// load library connected to fehler_kurzbz
$this->load->library($issuesLibPath . $libName);
$lowercaseLibName = mb_strtolower($libName);
// check if method is defined in library class
if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_EXISTS_METHOD_NAME)))
return error("Method " . self::CHECK_ISSUE_EXISTS_METHOD_NAME . " is not defined in library $lowercaseLibName");
// call the function for checking for issue resolution
$issueExistsRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_EXISTS_METHOD_NAME}($paramsForChecking);
if (isError($issueExistsRes)) return $issueExistsRes;
$issueExistsData = getData($issueExistsRes);
if ($issueExistsData === true)
{
// add person id and oe kurzbz automatically as params, merge it with additional params
// decode bewerbung_parameter into assoc array
$params = array_merge(
array('issue_id' => $issue->issue_id, 'issue_person_id' => $issue->person_id, 'issue_oe_kurzbz' => $issue->oe_kurzbz),
isset($issue->behebung_parameter) ? json_decode($issue->behebung_parameter, true) : array()
// write issue if it was detected
$produceRes = $this->{$lowercaseLibName}->{self::PRODUCE_ISSUE_METHOD_NAME}(
$fehler_kurzbz,
isset($params['person_id']) ? $params['person_id'] : null,
isset($params['oe_kurzbz']) ? $params['oe_kurzbz'] : null,
$paramsForProduction
);
// if called from extension (extension name set), path includes extension names, otherwise it is the core library folder
$libRootPath = isset($this->_extensionName) ? 'extensions/' . $this->_extensionName . '/' : '';
$issuesLibPath = $libRootPath . self::ISSUES_FOLDER . '/';
$issuesLibFilePath = DOC_ROOT . 'application/' . $libRootPath . 'libraries/' . self::ISSUES_FOLDER . '/' . $libName . '.php';
if (isError($produceRes))
return $produceRes;
// check if library file exists
if (!file_exists($issuesLibFilePath))
{
// log error and continue with next issue if not
$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
continue;
}
// load library connected to fehlercode
$this->load->library(
$issuesLibPath . $libName
);
$lowercaseLibName = mb_strtolower($libName);
// check if method is defined in libary class
if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_EXISTS_METHOD_NAME)))
{
// log error and continue with next issue if not
$this->logError("Method " . self::CHECK_ISSUE_EXISTS_METHOD_NAME . " is not defined in library $lowercaseLibName");
continue;
}
// call the function for checking for issue resolution
$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_EXISTS_METHOD_NAME}($params);
if (isError($issueResolvedRes))
{
$this->logError(getError($issueResolvedRes));
}
else
{
$issueResolvedData = getData($issueResolvedRes);
if ($issueResolvedData === true)
{
// set issue to resolved if needed
$behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
if (isError($behobenRes))
$this->logError(getError($behobenRes));
else
$this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
}
}
return success("Issue " . $issue->issue_id . " successfully written");
}
$this->logInfo("Issue resolve job ended");
}
}
application/core/IssueResolver_Controller.php
+2 -4
View File
@@ -73,13 +73,11 @@ abstract class IssueResolver_Controller extends JOB_Controller
}
// load library connected to fehlercode
$this->load->library(
$issuesLibPath . $libName
);
$this->load->library($issuesLibPath . $libName);
$lowercaseLibName = mb_strtolower($libName);
// check if method is defined in libary class
// check if method is defined in library class
if (!is_callable(array($this->{$lowercaseLibName}, self::CHECK_ISSUE_RESOLVED_METHOD_NAME)))
{
// log error and continue with next issue if not
application/libraries/IssuesLib.php
+12 -2
View File
@@ -169,6 +169,9 @@ class IssuesLib
return $this->_changeIssueStatus($issue_id, $data, $user);
}
// --------------------------------------------------------------------------------------------------------------
// Private methods
/**
* Changes status of an issue.
* @param int $issue_id
@@ -215,8 +218,15 @@ class IssuesLib
* @param string $inhalt_extern
* @return object success or error
*/
private function _addIssue($fehlercode, $person_id = null, $oe_kurzbz = null, $fehlertext_params = null, $resolution_params = null, $fehlercode_extern = null, $inhalt_extern = null)
{
private function _addIssue(
$fehlercode,
$person_id = null,
$oe_kurzbz = null,
$fehlertext_params = null,
$resolution_params = null,
$fehlercode_extern = null,
$inhalt_extern = null
) {
if (isEmptyString($person_id) && isEmptyString($oe_kurzbz))
return error("Person_id or oe_kurzbz must be set.");
application/libraries/issues/PlausicheckLib.php
+25
View File
@@ -0,0 +1,25 @@
<?php
if (! defined('BASEPATH')) exit('No direct script access allowed');
class Lib
{
private $_ci; // Code igniter instance
/**
* Object initialization
*/
public function __construct()
{
$this->_ci =& get_instance();
$this->_ci->load->model('', '');
}
public function getStudents()
{
$qry = '
';
}
}