Skip to content

Add toArray method to Progressable trait #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
insign wants to merge 1 commit into from
Closed

Add toArray method to Progressable trait #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/Progressable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,4 +644,21 @@ public function incrementStep(int $amount = 1): static {

return $this->setStep($current + $amount);
}

/**
* Get the progress data as an array.
*/
public function toArray(): array {
return [
'progress' => $this->getLocalProgress(),
'overall_progress' => $this->getOverallProgress(),
'message' => $this->getStatusMessage(),
'metadata' => $this->getMetadata(),
'current_step' => $this->getStep(),
'total_steps' => $this->getTotalSteps(),
'estimated_time_remaining' => $this->getEstimatedTimeRemaining(),
'is_complete' => $this->isComplete(),
'is_overall_complete' => $this->isOverallComplete(),
];
}
}
55 changes: 55 additions & 0 deletions tests/ProgressableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Verseles\Progressable\Tests;

use Illuminate\Support\Carbon;
use Orchestra\Testbench\TestCase;
use Verseles\Progressable\Exceptions\UniqueNameAlreadySetException;
use Verseles\Progressable\Exceptions\UniqueNameNotSetException;
Expand Down Expand Up @@ -553,4 +554,58 @@ public function test_set_step_without_total_steps(): void {
$this->assertEquals(5, $this->getStep());
$this->assertEquals(0, $this->getLocalProgress());
}

public function test_to_array_structure(): void {
Carbon::setTestNow(Carbon::now());
$this->setOverallUniqueName('test_to_array_' . $this->testId);

// Setup state
$this->setTotalSteps(100);
$this->setStep(50); // Sets progress to 50%
$this->setStatusMessage('Halfway there');
$this->setMetadata(['foo' => 'bar']);

// Advance time to allow ETA calculation
Carbon::setTestNow(Carbon::now()->addSeconds(10));
// Progress 0 -> 50 in 10 seconds. Rate 5% / sec. Remaining 50%. ETA 10s.
$this->setLocalProgress(50);

$array = $this->toArray();

$this->assertIsArray($array);
$this->assertArrayHasKey('progress', $array);
$this->assertArrayHasKey('overall_progress', $array);
$this->assertArrayHasKey('message', $array);
$this->assertArrayHasKey('metadata', $array);
$this->assertArrayHasKey('current_step', $array);
$this->assertArrayHasKey('total_steps', $array);
$this->assertArrayHasKey('estimated_time_remaining', $array);
$this->assertArrayHasKey('is_complete', $array);
$this->assertArrayHasKey('is_overall_complete', $array);

$this->assertEquals(50, $array['progress']);
$this->assertEquals(50, $array['overall_progress']);
$this->assertEquals('Halfway there', $array['message']);
$this->assertEquals(['foo' => 'bar'], $array['metadata']);
$this->assertEquals(50, $array['current_step']);
$this->assertEquals(100, $array['total_steps']);
// ETA calculation might vary slightly depending on exact timing, but should be around 10
$this->assertEquals(10, $array['estimated_time_remaining']);
$this->assertFalse($array['is_complete']);
}

public function test_to_array_minimal(): void {
$this->setOverallUniqueName('test_to_array_minimal_' . $this->testId);

$array = $this->toArray();

$this->assertEquals(0, $array['progress']);
$this->assertEquals(0, $array['overall_progress']);
$this->assertNull($array['message']);
$this->assertEmpty($array['metadata']);
$this->assertNull($array['current_step']);
$this->assertNull($array['total_steps']);
$this->assertNull($array['estimated_time_remaining']);
$this->assertFalse($array['is_complete']);
}
}
Loading