adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 20:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed timezone in time entries importer (tests)

Browse Source
This commit is contained in:
Constantin Graf
2024-06-06 18:46:23 +02:00
parent 94940be02c
commit f40ae91444
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/V1/OrganizationController.php
View File

@@ -15,6 +15,7 @@ class OrganizationController extends Controller
* Get organization * Get organization
* *
* @operationId getOrganization * @operationId getOrganization
*
* @throws AuthorizationException * @throws AuthorizationException
*/ */
public function show(Organization $organization): OrganizationResource public function show(Organization $organization): OrganizationResource
@@ -28,6 +29,7 @@ class OrganizationController extends Controller
* Update organization * Update organization
* *
* @operationId updateOrganization * @operationId updateOrganization
*
* @throws AuthorizationException * @throws AuthorizationException
*/ */
public function update(Organization $organization, OrganizationUpdateRequest $request): OrganizationResource public function update(Organization $organization, OrganizationUpdateRequest $request): OrganizationResource

16
tests/Unit/Service/Import/Importer/ClockifyTimeEntriesImporterTest.php
View File

@@ -30,16 +30,16 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
$timeEntry1 = $timeEntries->firstWhere('description', ''); $timeEntry1 = $timeEntries->firstWhere('description', '');
$this->assertNotNull($timeEntry1); $this->assertNotNull($timeEntry1);
$this->assertSame('', $timeEntry1->description); $this->assertSame('', $timeEntry1->description);
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->start->toDateTimeString());
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->end->toDateTimeString());
$this->assertFalse($timeEntry1->billable); $this->assertFalse($timeEntry1->billable);
$this->assertTrue($timeEntry1->is_imported); $this->assertTrue($timeEntry1->is_imported);
$this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags); $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
$timeEntry2 = $timeEntries->firstWhere('description', 'Working hard'); $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
$this->assertNotNull($timeEntry2); $this->assertNotNull($timeEntry2);
$this->assertSame('Working hard', $timeEntry2->description); $this->assertSame('Working hard', $timeEntry2->description);
$this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
$this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString()); $this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
$this->assertTrue($timeEntry2->billable); $this->assertTrue($timeEntry2->billable);
$this->assertTrue($timeEntry2->is_imported); $this->assertTrue($timeEntry2->is_imported);
$this->assertSame([], $timeEntry2->tags); $this->assertSame([], $timeEntry2->tags);
@@ -67,16 +67,16 @@ class ClockifyTimeEntriesImporterTest extends ImporterTestAbstract
$timeEntry1 = $timeEntries->firstWhere('description', ''); $timeEntry1 = $timeEntries->firstWhere('description', '');
$this->assertNotNull($timeEntry1); $this->assertNotNull($timeEntry1);
$this->assertSame('', $timeEntry1->description); $this->assertSame('', $timeEntry1->description);
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->start->toDateTimeString());
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->end->toDateTimeString());
$this->assertFalse($timeEntry1->billable); $this->assertFalse($timeEntry1->billable);
$this->assertTrue($timeEntry1->is_imported); $this->assertTrue($timeEntry1->is_imported);
$this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags); $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
$timeEntry2 = $timeEntries->firstWhere('description', 'Working hard'); $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
$this->assertNotNull($timeEntry2); $this->assertNotNull($timeEntry2);
$this->assertSame('Working hard', $timeEntry2->description); $this->assertSame('Working hard', $timeEntry2->description);
$this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
$this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString()); $this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
$this->assertTrue($timeEntry2->billable); $this->assertTrue($timeEntry2->billable);
$this->assertTrue($timeEntry2->is_imported); $this->assertTrue($timeEntry2->is_imported);
$this->assertSame([], $timeEntry2->tags); $this->assertSame([], $timeEntry2->tags);

16
tests/Unit/Service/Import/Importer/TogglTimeEntriesImporterTest.php
View File

@@ -31,15 +31,15 @@ class TogglTimeEntriesImporterTest extends ImporterTestAbstract
$timeEntry1 = $timeEntries->firstWhere('description', ''); $timeEntry1 = $timeEntries->firstWhere('description', '');
$this->assertNotNull($timeEntry1); $this->assertNotNull($timeEntry1);
$this->assertSame('', $timeEntry1->description); $this->assertSame('', $timeEntry1->description);
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->start->toDateTimeString());
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->end->toDateTimeString());
$this->assertFalse($timeEntry1->billable); $this->assertFalse($timeEntry1->billable);
$this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags); $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
$timeEntry2 = $timeEntries->firstWhere('description', 'Working hard'); $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
$this->assertNotNull($timeEntry2); $this->assertNotNull($timeEntry2);
$this->assertSame('Working hard', $timeEntry2->description); $this->assertSame('Working hard', $timeEntry2->description);
$this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
$this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString()); $this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
$this->assertTrue($timeEntry2->billable); $this->assertTrue($timeEntry2->billable);
$this->assertSame([], $timeEntry2->tags); $this->assertSame([], $timeEntry2->tags);
$this->assertSame(2, $report->timeEntriesCreated); $this->assertSame(2, $report->timeEntriesCreated);
@@ -73,15 +73,15 @@ class TogglTimeEntriesImporterTest extends ImporterTestAbstract
$timeEntry1 = $timeEntries->firstWhere('description', ''); $timeEntry1 = $timeEntries->firstWhere('description', '');
$this->assertNotNull($timeEntry1); $this->assertNotNull($timeEntry1);
$this->assertSame('', $timeEntry1->description); $this->assertSame('', $timeEntry1->description);
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->start->toDateTimeString());
$this->assertSame('2024-03-04 10:23:52', $timeEntry1->end->toDateTimeString()); $this->assertSame('2024-03-04 09:23:52', $timeEntry1->end->toDateTimeString());
$this->assertFalse($timeEntry1->billable); $this->assertFalse($timeEntry1->billable);
$this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags); $this->assertSame([$testScenario->tag1->getKey(), $testScenario->tag2->getKey()], $timeEntry1->tags);
$timeEntry2 = $timeEntries->firstWhere('description', 'Working hard'); $timeEntry2 = $timeEntries->firstWhere('description', 'Working hard');
$this->assertNotNull($timeEntry2); $this->assertNotNull($timeEntry2);
$this->assertSame('Working hard', $timeEntry2->description); $this->assertSame('Working hard', $timeEntry2->description);
$this->assertSame('2024-03-04 10:23:00', $timeEntry2->start->toDateTimeString()); $this->assertSame('2024-03-04 09:23:00', $timeEntry2->start->toDateTimeString());
$this->assertSame('2024-03-04 11:23:01', $timeEntry2->end->toDateTimeString()); $this->assertSame('2024-03-04 10:23:01', $timeEntry2->end->toDateTimeString());
$this->assertTrue($timeEntry2->billable); $this->assertTrue($timeEntry2->billable);
$this->assertSame([], $timeEntry2->tags); $this->assertSame([], $timeEntry2->tags);
$this->assertSame(2, $report->timeEntriesCreated); $this->assertSame(2, $report->timeEntriesCreated);