Skip to content

Commit

Permalink
Add test for nested array attributes in approval process
Browse files Browse the repository at this point in the history
- Adds a new test case to validate handling of nested array attributes through the approval process.
- Ensures multiple array-cast attributes are handled correctly.
- Verifies preservation of complex nested data structures.
- Confirms data integrity is maintained and array casting works after model retrieval.
- Addresses Issue #68.
  • Loading branch information
cjmellor committed Nov 10, 2024
1 parent 6d88e29 commit aa4f700
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Concerns/MustBeApproved.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ protected static function insertApprovalRequest($model): ?bool
unset($filteredDirty[$foreignKey]);

foreach ($filteredDirty as $key => $value) {
if (isset($model->casts[$key]) && $model->casts[$key] === 'json') {
if (isset($model->casts[$key]) && ($model->casts[$key] === 'json' || $model->casts[$key] === 'array')) {
$filteredDirty[$key] = json_decode(json: $value, associative: true);
}
}
Expand Down
68 changes: 67 additions & 1 deletion tests/Feature/MustBeApprovedTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
$this->assertDatabaseHas(table: Approval::class, data: [
'new_data' => json_encode([
'name' => 'Neo',
'data' => json_encode(['foo', 'bar']),
'data' => ['foo', 'bar'],
]),
'original_data' => json_encode([]),
]);
Expand Down Expand Up @@ -317,3 +317,69 @@ public function getApprovalForeignKeyName(): string
'foreign_key' => null,
]);
});

test(description: 'approve a model with nested array attributes', closure: function () {
Schema::create('models_with_nested_arrays', function (Blueprint $table) {
$table->id();
$table->string('name')->nullable();
$table->json('settings')->nullable();
$table->json('metadata')->nullable();
});

$model = new class extends Model
{
use MustBeApproved;

protected $table = 'models_with_nested_arrays';
protected $guarded = [];
public $timestamps = false;

protected $casts = [
'settings' => 'array',
'metadata' => 'array'
];
};

// Create a model with complex nested array data
$testData = [
'name' => 'Test Model',
'settings' => [
'preferences' => [
'theme' => 'dark',
'notifications' => true
],
'features' => ['feature1', 'feature2']
],
'metadata' => [
'tags' => ['important', 'test'],
'version' => 2
]
];

$model->create($testData);

// Verify data in approval table using database assertion instead of model property
$this->assertDatabaseHas(Approval::class, [
'new_data' => json_encode($testData),
'original_data' => json_encode([])
]);

// Nothing should be in the main table yet
expect($model->count())->toBe(0);

// Approve the model
Approval::first()->approve();

// Verify the data after approval
$savedModel = $model->first();

expect($savedModel)
->name->toBe('Test Model')
->settings->toBeArray()
->metadata->toBeArray()
->and($savedModel->settings['preferences']['theme'])->toBe('dark')
->and($savedModel->settings['preferences']['notifications'])->toBeTrue()
->and($savedModel->settings['features'])->toMatchArray(['feature1', 'feature2'])
->and($savedModel->metadata['tags'])->toMatchArray(['important', 'test'])
->and($savedModel->metadata['version'])->toBe(2);
});

0 comments on commit aa4f700

Please sign in to comment.