From 2f4a74e7a21f6f4d7e7c072d5b65177011bd6835 Mon Sep 17 00:00:00 2001 From: Rodrigo Date: Mon, 16 Nov 2026 16:03:36 -0400 Subject: [PATCH] fix(FOUR-34432): server error when completing a request --- .../TokenPersistenceRawRepository.php | 8 +- .../TokenPersistenceRawRepositoryTest.php | 109 ++++++++++++++++++ 2 files changed, 111 insertions(+), 6 deletions(-) diff --git a/ProcessMaker/Repositories/TokenPersistenceRawRepository.php b/ProcessMaker/Repositories/TokenPersistenceRawRepository.php index eaac21f8e9..9363d3abe3 100644 --- a/ProcessMaker/Repositories/TokenPersistenceRawRepository.php +++ b/ProcessMaker/Repositories/TokenPersistenceRawRepository.php @@ -121,7 +121,7 @@ private function updateToken(ProcessRequestToken $token, array $fields): void if (!array_key_exists($field, $token->getAttributes())) { continue; } - $payload[$field] = $this->serializeColumnValue($field, $token->getAttributes()[$field]); + $payload[$field] = $this->serializeColumnValue($token->getAttributes()[$field]); } $payload['updated_at'] = Carbon::now(); @@ -155,12 +155,8 @@ private function runUpdate(string $table, int $id, array $payload): void DB::update("UPDATE `{$table}` SET {$assignments} WHERE `id` = ?", $values); } - private function serializeColumnValue(string $field, mixed $value): mixed + private function serializeColumnValue(mixed $value): mixed { - if (in_array($field, ['self_service_groups', 'token_properties', 'data'], true)) { - return $value === null ? null : json_encode($value); - } - if ($value instanceof Carbon) { return $value->format('Y-m-d H:i:s'); } diff --git a/tests/unit/ProcessMaker/Repositories/TokenPersistenceRawRepositoryTest.php b/tests/unit/ProcessMaker/Repositories/TokenPersistenceRawRepositoryTest.php index 4d6cf01911..f8411e1984 100644 --- a/tests/unit/ProcessMaker/Repositories/TokenPersistenceRawRepositoryTest.php +++ b/tests/unit/ProcessMaker/Repositories/TokenPersistenceRawRepositoryTest.php @@ -5,6 +5,7 @@ namespace Tests\Unit\ProcessMaker\Repositories; use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\DB; use ProcessMaker\Models\ProcessRequest; use ProcessMaker\Models\ProcessRequestToken; use ProcessMaker\Repositories\TokenPersistenceRawRepository; @@ -61,4 +62,112 @@ public function testPersistInstanceUpdatedMergesDataWithoutEloquentSave(): void $this->assertSame(3, (int) $request->execution_revision); $this->assertSame('Review', $request->last_stage_name); } + + public function testSaveClosedTokenPersistsDataAsJsonObjectNotDoubleEncodedString(): void + { + $request = ProcessRequest::factory()->create(); + $token = ProcessRequestToken::factory()->create([ + 'process_request_id' => $request->id, + 'process_id' => $request->process_id, + 'status' => 'ACTIVE', + 'data' => [], + ]); + + $token->status = 'CLOSED'; + $token->data = ['form_input_1' => 'expected value']; + $token->token_properties = ['data' => ['loop' => true]]; + + app(TokenPersistenceRawRepository::class)->saveClosedToken($token); + $token->refresh(); + + $this->assertIsArray($token->data); + $this->assertSame('expected value', $token->data['form_input_1']); + $this->assertIsArray($token->token_properties); + + $row = DB::selectOne( + 'SELECT JSON_TYPE(data) AS data_type, JSON_TYPE(token_properties) AS props_type FROM process_request_tokens WHERE id = ?', + [$token->id] + ); + $this->assertSame('OBJECT', $row->data_type); + $this->assertSame('OBJECT', $row->props_type); + } + + public function testSaveCompletedTokenPersistsTokenPropertiesAsJsonObject(): void + { + $request = ProcessRequest::factory()->create(); + $token = ProcessRequestToken::factory()->create([ + 'process_request_id' => $request->id, + 'process_id' => $request->process_id, + 'status' => 'ACTIVE', + ]); + + $token->status = 'COMPLETED'; + $token->completed_at = now(); + $token->token_properties = ['mi_index' => 2]; + + app(TokenPersistenceRawRepository::class)->saveCompletedToken($token); + $token->refresh(); + + $this->assertIsArray($token->token_properties); + $this->assertSame(2, $token->token_properties['mi_index']); + + $row = DB::selectOne( + 'SELECT JSON_TYPE(token_properties) AS props_type FROM process_request_tokens WHERE id = ?', + [$token->id] + ); + $this->assertSame('OBJECT', $row->props_type); + } + + public function testSaveActivatedTokenPersistsSelfServiceGroupsAndTokenPropertiesAsJsonObjects(): void + { + $request = ProcessRequest::factory()->create(); + $token = ProcessRequestToken::factory()->create([ + 'process_request_id' => $request->id, + 'process_id' => $request->process_id, + 'status' => 'CLOSED', + 'is_self_service' => true, + ]); + + $token->status = 'ACTIVE'; + $token->self_service_groups = ['groups' => [10, 20], 'users' => [30]]; + $token->token_properties = ['allow_reassignment' => true]; + + app(TokenPersistenceRawRepository::class)->saveActivatedToken($token); + $token->refresh(); + + $this->assertIsArray($token->self_service_groups); + $this->assertSame([10, 20], $token->self_service_groups['groups']); + $this->assertIsArray($token->token_properties); + $this->assertTrue($token->token_properties['allow_reassignment']); + + $row = DB::selectOne( + 'SELECT JSON_TYPE(self_service_groups) AS groups_type, JSON_TYPE(token_properties) AS props_type FROM process_request_tokens WHERE id = ?', + [$token->id] + ); + $this->assertSame('OBJECT', $row->groups_type); + $this->assertSame('OBJECT', $row->props_type); + } + + public function testPersistInstanceUpdatedPersistsRequestDataAsJsonObject(): void + { + $request = ProcessRequest::factory()->create([ + 'data' => ['existing' => 'value'], + 'execution_revision' => 0, + ]); + $request->loadProcessRequestInstance(); + $request->getDataStore()->putData('added', 'from_store'); + + app(TokenPersistenceRawRepository::class)->persistInstanceUpdated($request); + + $row = DB::selectOne( + 'SELECT JSON_TYPE(data) AS data_type FROM process_requests WHERE id = ?', + [$request->id] + ); + $this->assertSame('OBJECT', $row->data_type); + + $request->refresh(); + $this->assertIsArray($request->data); + $this->assertSame('value', $request->data['existing']); + $this->assertSame('from_store', $request->data['added']); + } }