Merge branch 'feature/saterday-night-fixes'

ConductionNL · Oct 21, 2024 · 2a84753 · 2a84753
2 parents 933422f + f8f211a
commit 2a84753
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/Db/AuditTrail.php b/lib/Db/AuditTrail.php
@@ -9,6 +9,8 @@
 class AuditTrail extends Entity implements JsonSerializable
 {
 	protected ?string $uuid = null;
+	protected ?int $schema = null;
+	protected ?int $register = null;
 	protected ?int $object = null;
 	protected ?string $action = null;
 	protected ?array $changed = null;
@@ -17,10 +19,13 @@ class AuditTrail extends Entity implements JsonSerializable
 	protected ?string $session = null;
 	protected ?string $request = null;
 	protected ?string $ipAddress = null;
+	protected ?string $version = null;
 	protected ?DateTime $created = null;
 
 	public function __construct() {
 		$this->addType(fieldName: 'uuid', type: 'string');
+		$this->addType(fieldName: 'schema', type: 'integer');
+		$this->addType(fieldName: 'register', type: 'integer');
 		$this->addType(fieldName: 'object', type: 'integer');
 		$this->addType(fieldName: 'action', type: 'string');
 		$this->addType(fieldName: 'changed', type: 'json');
@@ -29,6 +34,7 @@ public function __construct() {
 		$this->addType(fieldName: 'session', type: 'string');
 		$this->addType(fieldName: 'request', type: 'string');
 		$this->addType(fieldName: 'ipAddress', type: 'string');
+		$this->addType(fieldName: 'version', type: 'string');
 		$this->addType(fieldName: 'created', type: 'datetime');
 	}
 
@@ -66,6 +72,8 @@ public function jsonSerialize(): array
 		return [
 			'id' => $this->id,
 			'uuid' => $this->uuid,
+			'schema' => $this->schema,
+			'register' => $this->register,
 			'object' => $this->object,
 			'action' => $this->action,
 			'changed' => $this->changed,
@@ -74,6 +82,7 @@ public function jsonSerialize(): array
 			'session' => $this->session,
 			'request' => $this->request,
 			'ipAddress' => $this->ipAddress,
+			'version' => $this->version,
 			'created' => isset($this->created) ? $this->created->format('c') : null
 		];
 	}

diff --git a/lib/Migration/Version1Date20241020231700.php b/lib/Migration/Version1Date20241020231700.php
@@ -40,6 +40,8 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table = $schema->createTable('openregister_audit_trails');
 			$table->addColumn('id', Types::INTEGER, ['autoincrement' => true, 'notnull' => true]);	
 			$table->addColumn('uuid', Types::STRING, ['notnull' => false, 'length' => 255]);
+			$table->addColumn('schema', Types::INTEGER, ['notnull' => false]);
+			$table->addColumn('regsiter', Types::INTEGER, ['notnull' => false]);
 			$table->addColumn('object', Types::INTEGER, ['notnull' => true]);
 			$table->addColumn('action', Types::STRING, ['notnull' => true, 'default' => 'update']);
 			$table->addColumn('changed', Types::JSON, ['notnull' => true]);
@@ -48,6 +50,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table->addColumn('session', Types::STRING, ['notnull' => true, 'length' => 255]);
 			$table->addColumn('request', Types::STRING, ['notnull' => false, 'length' => 255]);
 			$table->addColumn('ip_address', Types::STRING, ['notnull' => false, 'length' => 255]);
+			$table->addColumn('version', Types::STRING, ['notnull' => false, 'length' => 255]);
 			$table->addColumn('created', Types::DATETIME, ['notnull' => true]);
 
 			$table->setPrimaryKey(['id']);