fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-3867 “database-upgrade” console action

Browse Source
This commit is contained in:
Roly Gutierrez
2022-06-24 15:48:56 -04:00
parent 03d19c5fc6
commit 2721e6a788
2 changed files with 122 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
workflow/engine/classes/WorkspaceTools.php
View File

@@ -7,6 +7,7 @@ use ProcessMaker\BusinessModel\Process as BmProcess;
/*----------------------------------********---------------------------------*/
use ProcessMaker\ChangeLog\ChangeLog;
/*----------------------------------********---------------------------------*/
use ProcessMaker\BusinessModel\TaskSchedulerBM;
use ProcessMaker\BusinessModel\WebEntry;
use ProcessMaker\Core\Installer;
use ProcessMaker\Core\ProcessesManager;
@@ -1125,6 +1126,7 @@ class WorkspaceTools
$this->upgradeSchema($systemSchemaRbac, false, true); // Perform upgrade to RBAC
$this->upgradeData();
$this->checkRbacPermissions(); //check or add new permissions
$this->checkSchedulerTable();
$this->checkSequenceNumber();
$this->migrateIteeToDummytask($this->name);
/*----------------------------------********---------------------------------*/
@@ -3352,7 +3354,7 @@ class WorkspaceTools
*/
public function checkRbacPermissions()
{
CLI::logging("-> Remove the permissions depreacated in RBAC \n");
CLI::logging("-> Remove the permissions deprecated in RBAC \n");
$this->removePermission();
CLI::logging("-> Verifying roles permissions in RBAC \n");
//Update table RBAC permissions
@@ -3368,6 +3370,17 @@ class WorkspaceTools
}
}
/**
* Check SCHEDULER table integrity.
* @return void
*/
public function checkSchedulerTable(): void
{
CLI::logging("-> Check SCHEDULER table integrity.\n");
TaskSchedulerBM::checkDataIntegrity();
CLI::logging(" SCHEDULER table integrity was checked.\n");
}
/**
* Add sequence numbers
*/

87
workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
View File

@@ -2,6 +2,8 @@
namespace ProcessMaker\BusinessModel;
use Bootstrap;
use Illuminate\Support\Facades\Log;
use ProcessMaker\Core\System;
use ProcessMaker\Model\TaskScheduler;
@@ -223,6 +225,7 @@ class TaskSchedulerBM
]
/*----------------------------------********---------------------------------*/
];
/**
* Return the records in Schedule Table by category
*/
@@ -244,6 +247,7 @@ class TaskSchedulerBM
return $tasks;
}
}
/**
* Save the record Schedule in Schedule Table
*/
@@ -264,26 +268,31 @@ class TaskSchedulerBM
$task->save();
return $task;
}
/**
* Initial data for Schedule Table, with default values
*/
public static function generateInitialData()
{
$arraySystemConfiguration = System::getSystemConfiguration('', '', config("system.workspace"));
$toSave = [];
$win = strtoupper(substr(PHP_OS, 0, 3)) === 'WIN';
foreach (TaskSchedulerBM::$services as $service) {
self::registerScheduledTask($service);
}
}
/**
* Register scheduled task.
* @param array $service
* @return TaskScheduler
*/
private static function registerScheduledTask(array $service)
{
$task = new TaskScheduler;
$task->title = $service["title"];
$task->category = $service["category"];
$task->description = $service["description"];
$task->startingTime = $service["startingTime"];
$task->endingTime = $service["endingTime"];
if ($win) {
$task->body = 'php "' . PATH_TRUNK . $service["filew"] . '" ' . $service["service"] . ' +w' . config("system.workspace") . ' +force +async';
} else {
$task->body = 'su -s /bin/sh -c "php ' . PATH_TRUNK . $service["file"] . " " . $service["service"] . ' +w' . config("system.workspace") . ' +force +async"';
}
$task->body = self::buildBody($service);
$task->expression = $service["expression"];
$task->type = "shell";
$task->system = 1;
@@ -300,6 +309,68 @@ class TaskSchedulerBM
"timezone" => $task->timezone
]);
$task->save();
return $task;
}
/**
* Build body parameter.
* @param array $service
* @return string
*/
private static function buildBody(array $service): string
{
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
return 'php "' . PATH_TRUNK . $service["filew"] . '" ' . $service["service"] . ' +w' . config("system.workspace") . ' +force +async';
} else {
return 'su -s /bin/sh -c "php ' . PATH_TRUNK . $service["file"] . " " . $service["service"] . ' +w' . config("system.workspace") . ' +force +async"';
}
}
/**
* Check data integrity.
* @return array
*/
public static function checkDataIntegrity(): array
{
$beforeChanges = TaskScheduler::select()->get();
//remove missing register
$titleCondition = [];
$descriptionCondition = [];
foreach (self::$services as $service) {
$titleCondition[] = $service['title'];
$descriptionCondition[] = $service['description'];
}
TaskScheduler::whereNotIn('title', $titleCondition)
->whereNotIn('description', $descriptionCondition)
->delete();
//update register or create new register
foreach (self::$services as $service) {
$scheduler = TaskScheduler::select()
->where('title', '=', $service['title'])
->where('description', '=', $service['description'])
->get()
->first();
if (is_null($scheduler)) {
self::registerScheduledTask($service);
} else {
$scheduler->body = self::buildBody($service);
$scheduler->type = 'shell';
$scheduler->category = $service['category'];
$scheduler->system = 1;
$scheduler->update();
}
}
//log changes
$afterChanges = TaskScheduler::select()->get();
$result = [
'beforeChanges' => $beforeChanges,
'afterChanges' => $afterChanges
];
$message = 'Check SCHEDULER table integrity';
Log::channel(':taskSchedulerCheckDataIntegrity')->info($message, Bootstrap::context($result));
return $result;
}
}