split events DB field into entity and events, adjust biz logic

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

2 files changed, 21 insertions, 4 deletions

diff --git a/apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php b/apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php
index 43595d1c7cf..8b3f3d5a9c3 100644
--- a/apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php
+++ b/apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php
@@ -25,6 +25,7 @@ declare(strict_types=1);
 namespace OCA\WorkflowEngine\Migration;
 
 use Doctrine\DBAL\Driver\Statement;
+use OCA\WorkflowEngine\Entity\File;
 use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
@@ -49,6 +50,18 @@ class PopulateNewlyIntroducedDatabaseFields implements IRepairStep {
 		$this->populateScopeTable($result);
 
 		$result->closeCursor();
+
+		$this->populateEntityCol();
+	}
+
+	protected function populateEntityCol() {
+		$qb = $this->dbc->getQueryBuilder();
+
+		$qb->update('flow_operations')
+			->set('entity', File::class)
+			->where($qb->expr()->emptyString('entity'))
+			->execute();
+
 	}
 
 	protected function populateScopeTable(Statement $ids): void {
diff --git a/apps/workflowengine/lib/Migration/Version2019Date20190808074233.php b/apps/workflowengine/lib/Migration/Version2019Date20190808074233.php
index 2b9a8aa17cd..ffea3c88d01 100644
--- a/apps/workflowengine/lib/Migration/Version2019Date20190808074233.php
+++ b/apps/workflowengine/lib/Migration/Version2019Date20190808074233.php
@@ -70,12 +70,12 @@ class Version2019Date20190808074233 extends SimpleMigrationStep {
 			$table->addColumn('operation', Type::TEXT, [
 				'notnull' => false,
 			]);
-			$this->addEventsColumn($table);
+			$this->addEntityColumns($table);
 			$table->setPrimaryKey(['id']);
 		} else {
 			$table = $schema->getTable('flow_operations');
-			if(!$table->hasColumn('events')) {
-				$this->addEventsColumn($table);
+			if(!$table->hasColumn('entity')) {
+				$this->addEntityColumns($table);
 			}
 		}
 
@@ -105,7 +105,11 @@ class Version2019Date20190808074233 extends SimpleMigrationStep {
 		return $schema;
 	}
 
-	protected function addEventsColumn(Table $table) {
+	protected function addEntityColumns(Table $table) {
+		$table->addColumn('entity', Type::STRING, [
+			'notnull' => true,
+			'length' => 256,
+		]);
 		$table->addColumn('events', Type::TEXT, [
 			'notnull' => true,
 			'default' => '[]',