moved issue resolvers to #own resolvers folder, created first resolver CORE_INOUT_0007 for plausichecks

application/controllers/jobs/IssueResolver.php

@@ -22,7 +22,8 @@ class IssueResolver extends IssueResolver_Controller
 			'CORE_INOUT_0003' => 'CORE_INOUT_0003',
 			'CORE_INOUT_0004' => 'CORE_INOUT_0004',
 			'CORE_INOUT_0005' => 'CORE_INOUT_0005',
-			'CORE_INOUT_0006' => 'CORE_INOUT_0006'
+			'CORE_INOUT_0006' => 'CORE_INOUT_0006',
+			'CORE_INOUT_0007' => 'CORE_INOUT_0007'
 		);
 	}
 }

application/core/IssueResolver_Controller.php

@@ -5,7 +5,8 @@
  */
 abstract class IssueResolver_Controller extends JOB_Controller
 {
-	const ISSUES_FOLDER = 'issues';
+	const CI_PATH = 'application';
+	const ISSUES_FOLDER = 'issues/resolvers';
 	const CHECK_ISSUE_RESOLVED_METHOD_NAME = 'checkIfIssueIsResolved';
 
 	protected $_codeLibMappings;
@@ -47,64 +48,64 @@ abstract class IssueResolver_Controller extends JOB_Controller
 
 				foreach ($openIssues as $issue)
 				{
-					if (isset($this->_codeLibMappings[$issue->fehlercode]))
+					// ignore if Fehlercode is not in libmappings (shouldn't be checked)
+					if (!isset($this->_codeLibMappings[$issue->fehlercode])) continue;
+
+					$libName = $this->_codeLibMappings[$issue->fehlercode];
+
+					// 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()
+					);
+
+					// 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 . self::CI_PATH . '/' . $libRootPath . 'libraries/' . self::ISSUES_FOLDER . '/' . $libName . '.php';
+
+					// check if library file exists
+					if (!file_exists($issuesLibFilePath))
 					{
-						$libName = $this->_codeLibMappings[$issue->fehlercode];
+						// log error and continue with next issue if not
+						$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
+						continue;
+					}
 
-						// 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()
-						);
+					// load library connected to fehlercode
+					$this->load->library($issuesLibPath . $libName);
 
-						// 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';
+					$lowercaseLibName = mb_strtolower($libName);
 
-						// check if library file exists
-						if (!file_exists($issuesLibFilePath))
+					// 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
+						$this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
+						continue;
+					}
+
+					// call the function for checking for issue resolution
+					$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_METHOD_NAME}($params);
+
+					if (isError($issueResolvedRes))
+					{
+						$this->logError(getError($issueResolvedRes));
+					}
+					else
+					{
+						$issueResolvedData = getData($issueResolvedRes);
+
+						if ($issueResolvedData === true)
 						{
-							// log error and continue with next issue if not
-							$this->logError("Issue library file " . $issuesLibFilePath . " does not exist");
-							continue;
-						}
+							// set issue to resolved if needed
+							$behobenRes = $this->issueslib->setBehoben($issue->issue_id, null);
 
-						// load library connected to fehlercode
-						$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_RESOLVED_METHOD_NAME)))
-						{
-							// log error and continue with next issue if not
-							$this->logError("Method " . self::CHECK_ISSUE_RESOLVED_METHOD_NAME . " is not defined in library $lowercaseLibName");
-							continue;
-						}
-
-						// call the function for checking for issue resolution
-						$issueResolvedRes = $this->{$lowercaseLibName}->{self::CHECK_ISSUE_RESOLVED_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");
-							}
+							if (isError($behobenRes))
+								$this->logError(getError($behobenRes));
+							else
+								$this->logInfo("Issue " . $issue->issue_id . " successfully resolved");
 						}
 					}
 				}

application/libraries/issues/PlausicheckLib.php

@@ -1077,7 +1077,7 @@ class PlausicheckLib
 
 		$qry = "
 			SELECT
-				DISTINCT pers.person_id
+				DISTINCT pers.person_id, status.studiensemester_kurzbz
 			FROM
 				public.tbl_prestudent pre
 				JOIN public.tbl_prestudentstatus status USING(prestudent_id)

application/libraries/issues/PlausicheckProducerLib.php

@@ -4,6 +4,7 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 class PlausicheckProducerLib
 {
+	const CI_LIBRARY_PATH = 'application/libraries';
 	const PLAUSI_ISSUES_FOLDER = 'issues/plausichecks';
 	const EXECUTE_PLAUSI_CHECK_METHOD_NAME = 'executePlausiCheck';
 
@@ -36,7 +37,7 @@ class PlausicheckProducerLib
 		'PrestudentStgUngleichStgStudienplan' => 'PrestudentStgUngleichStgStudienplan',
 		'StgPrestudentUngleichStgStudent' => 'StgPrestudentUngleichStgStudent',
 		'StudentstatusNachAbbrecher' => 'StudentstatusNachAbbrecher'
-		//'StudienplanUngueltig' => 'StudienplanUngueltig',
+		//'StudienplanUngueltig' => 'StudienplanUngueltig'
 	);
 
 	public function __construct()
@@ -59,8 +60,7 @@ class PlausicheckProducerLib
 		if (isEmptyString($studiensemester_kurzbz)) $studiensemester_kurzbz = $this->_currentStudiensemester;
 
 		// get path of library for issue to be produced
-		$issuesLibPath = DOC_ROOT . 'application/libraries/' . self::PLAUSI_ISSUES_FOLDER . '/';
-		//$issuesLibPath = base_url('application/libraries/' . self::PLAUSI_ISSUES_FOLDER . '/');
+		$issuesLibPath = DOC_ROOT . self::CI_LIBRARY_PATH . '/' . self::PLAUSI_ISSUES_FOLDER . '/';
 		$issuesLibFilePath = $issuesLibPath . $libName . '.php';
 
 		// check if library file exists

application/libraries/issues/plausichecks/IncomingHeimatNationOesterreich.php

@@ -31,7 +31,7 @@ class IncomingHeimatNationOesterreich extends PlausiChecker
 			{
 				$results[] = array(
 					'person_id' => $person->person_id,
-					'resolution_params' => array('person_id' => $person->person_id)
+					'resolution_params' => array('person_id' => $person->person_id, 'studiensemester_kurzbz' => $studiensemester_kurzbz)
 				);
 			}
 		}

application/libraries/issues/resolvers/CORE_INOUT_0007.php

@@ -0,0 +1,33 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ * Incoming shouldn't have austrian home address.
+ */
+class CORE_INOUT_0007 implements IIssueResolvedChecker
+{
+	public function checkIfIssueIsResolved($params)
+	{
+		if (!isset($params['person_id']) || !is_numeric($params['person_id']))
+			return error('Person Id missing, issue_id: '.$params['issue_id']);
+
+		if (!isset($params['studiensemester_kurzbz']) || isEmptyString($params['studiensemester_kurzbz']))
+			return error('Studiensemester missing, issue_id: '.$params['issue_id']);
+
+		$this->_ci =& get_instance(); // get code igniter instance
+
+		$this->_ci->load->library('issues/PlausicheckLib');
+
+		// check if issue persists
+		$checkRes = $this->_ci->plausichecklib->getIncomingHeimatNationOesterreich($params['studiensemester_kurzbz'], null, $params['person_id']);
+
+		if (isError($checkRes)) return $checkRes;
+
+		if (hasData($checkRes))
+			return success(false); // not resolved if issue is still present 
+		else
+			return success(true); // resolved otherwise
+	}
+}
+