Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Make default error value NULL, make data non-nullable

Browse Source 
[MAILPOET-5599]
This commit is contained in:
Jan Jakes
2023-09-22 14:51:03 +02:00
committed by Aschepikov
parent c5f50b2a47
commit 7fac20fc8c
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mailpoet/lib/Automation/Engine/Data/AutomationRunLog.php
View File

@@ -53,8 +53,8 @@ class AutomationRunLog {
/** @var array */
private $data = [];
/** @var array */
private $error = [];
/** @var array|null */
private $error;
public function __construct(
int $automationRunId,
@@ -147,7 +147,7 @@ class AutomationRunLog {
$this->updatedAt = new DateTimeImmutable();
}
public function getError(): array {
public function getError(): ?array {
return $this->error;
}
@@ -163,7 +163,7 @@ class AutomationRunLog {
'updated_at' => $this->updatedAt->format(DateTimeImmutable::W3C),
'run_number' => $this->runNumber,
'data' => Json::encode($this->data),
'error' => Json::encode($this->error),
'error' => $this->error ? Json::encode($this->error) : null,
];
}
@@ -189,7 +189,7 @@ class AutomationRunLog {
$log->updatedAt = new DateTimeImmutable($data['updated_at']);
$log->runNumber = (int)$data['run_number'];
$log->data = Json::decode($data['data']);
$log->error = Json::decode($data['error']);
$log->error = isset($data['error']) ? Json::decode($data['error']) : null;
return $log;
}

7
mailpoet/lib/Migrations/Db/Migration_20230831_143755_Db.php
View File

@@ -40,8 +40,9 @@ class Migration_20230831_143755_Db extends DbMigration {
$this->connection->executeStatement("UPDATE $logsTable SET status = 'complete' WHERE status = 'completed'");
// fix empty values for errors and data
$this->connection->executeStatement("ALTER TABLE $logsTable CHANGE `data` `data` longtext NOT NULL AFTER run_number");
$this->connection->executeStatement("UPDATE $logsTable SET data = '{}' WHERE data = '[]' OR data IS NULL");
$this->connection->executeStatement("UPDATE $logsTable SET error = '{}' WHERE error = '[]' OR error IS NULL");
$this->connection->executeStatement("UPDATE $logsTable SET error = NULL WHERE error = '[]' OR error IS NULL");
// remove "completed_at" column (with "updated_at" it's no longer needed), backfill "updated_at"
if ($this->columnExists($logsTable, 'completed_at')) {
@@ -98,8 +99,8 @@ class Migration_20230831_143755_Db extends DbMigration {
$startedAt = strval($item['started_at']);
$date = "DATE_SUB('$startedAt', INTERVAL 1 SECOND)";
$queries[] = "
INSERT INTO {$logsTable} (automation_run_id, step_id, step_type, step_key, status, started_at, updated_at, run_number)
VALUES ($runId, '$triggerId', 'trigger', '$triggerKey', 'complete', $date, $date, 1)
INSERT INTO {$logsTable} (automation_run_id, step_id, step_type, step_key, status, started_at, updated_at, run_number, data)
VALUES ($runId, '$triggerId', 'trigger', '$triggerKey', 'complete', $date, $date, 1, '{}')
";
$triggerAddedMap[$runId] = true;
}

4
mailpoet/tests/integration/Automation/Engine/Control/StepRunLoggerTest.php
View File

@@ -195,7 +195,7 @@ class StepRunLoggerTest extends MailPoetTest {
'errorClass' => get_class($data['error']),
'code' => $data['error']->getCode(),
'trace' => Json::decode(Json::encode($data['error']->getTrace())), // normalize objects to arrays
] : [];
] : null;
$expected = [
'id' => $data['id'] ?? $log->getId(),
@@ -208,7 +208,7 @@ class StepRunLoggerTest extends MailPoetTest {
'updated_at' => $data['updated_at'] ?? $log->getUpdatedAt()->format(DateTimeImmutable::W3C),
'run_number' => $data['row_number'] ?? 1,
'data' => $data['data'] ?? '{}',
'error' => Json::encode($error),
'error' => $error ? Json::encode($error) : null,
];
$this->assertSame($expected, $log->toArray());
}

2
mailpoet/tests/integration/Automation/Engine/Storage/AutomationRunLogStorageTest.php
View File

@@ -37,7 +37,7 @@ class AutomationRunLogStorageTest extends \MailPoetTest {
$log = $this->storage->getAutomationRunLog($id);
$this->assertInstanceOf(AutomationRunLog::class, $log);
$errors = $log->getError();
expect($errors)->array();
$this->assertIsArray($errors);
expect(array_keys($errors))->equals([
'message',
'errorClass',