#3 Parse seconds, weeks and spent_at

Author: mnvx

app/Model/Service/Eloquent/EloquentNoteService.php

@@ -62,16 +62,18 @@ public function parseSpentTime(\Traversable $list)
     protected function parseSpentTimeItem(Note $item, Note $prev = null): array
     {
         $hours = 0;
+        $spentAt = null;
 
-        $pattern = '/(added|subtracted) (((\d{1,3}[dhm])\s+)+)of time spent at \d{4}-\d{2}-\d{2}/';
+        $pattern = '/(added|subtracted) ((?:(?:\d{1,3}[wdhms])\s+)+)of time spent at (\d{4}-\d{2}-\d{2})/';
         preg_match($pattern, $item->body, $match);
 
-        if (!empty($match) && count($match) >= 2) {
+        if (!empty($match) && count($match) === 4) {
             $sign = $match[1] === 'added' ? 1 : -1;
             $times = array_filter(explode(' ', $match[2]));
             foreach ($times as $time) {
                 $hours += $sign * $this->parseTime(trim($time));
             }
+            $spentAt = $match[3];
         }
 
         // Get description from previous comment if its corresponds to
@@ -89,6 +91,7 @@ protected function parseSpentTimeItem(Note $item, Note $prev = null): array
 
         $row = [
             'note_id' => $item->id,
+            'spent_at' => $spentAt,
             'gitlab_created_at' => $item->gitlab_created_at,
             'hours' => $hours,
             'description' => $description,
@@ -105,6 +108,9 @@ protected function parseTime(string $time)
     {
         $value = mb_substr($time, 0, -1);
         $period = mb_substr($time, -1);
+        if ($period === 's') {
+            return $value / 3600;
+        }
         if ($period === 'm') {
             return $value / 60;
         }

tests/Unit/TestEloquentNoteService.php tests/Unit/EloquentNoteServiceTest.phptests/Unit/TestEloquentNoteService.php renamed to tests/Unit/EloquentNoteServiceTest.php

@@ -7,7 +7,7 @@
 use App\Providers\AppServiceProvider;
 use Tests\TestCase;
 
-class TestEloquentNoteService extends TestCase
+class EloquentNoteServiceTest extends TestCase
 {
 
     public function setUp()
@@ -34,6 +34,18 @@ public function testParseTime(string $time, float $expectedHours)
     public function parseTimeDataProvider()
     {
         return [
+            [
+                'time' => '0s',
+                'hours' => 0,
+            ],
+            [
+                'time' => '36s',
+                'hours' => 0.01,
+            ],
+            [
+                'time' => '360s',
+                'hours' => 0.1,
+            ],
             [
                 'time' => '0m',
                 'hours' => 0,
@@ -99,7 +111,7 @@ public function testParseSpentTimeItem(array $itemData, array $prevItemData = nu
         $prev = $prevItemData ? new Note($prevItemData) : null;
         $row = $method->invokeArgs($service, [$item, $prev]);
         $this->assertEquals($expectedRow['hours'], $row['hours']);
-//        $this->assertEquals($expectedRow['spent_at'], $row['spent_at']);
+        $this->assertEquals($expectedRow['spent_at'], $row['spent_at']);
         $this->assertEquals($expectedRow['gitlab_created_at'], $row['gitlab_created_at']);
         $this->assertEquals($expectedRow['description'], $row['description']);
     }
@@ -125,7 +137,20 @@ public function parseSpentTimeItemDataProvider()
                 'prevItemData' => null,
                 'expectedRow' => [
                     'hours' => 1.5,
-                    'spent_at' => null,
+                    'spent_at' => '2018-11-24',
+                    'gitlab_created_at' => '2018-01-01T12:12:13',
+                    'description' => null,
+                ],
+            ],
+            [
+                'itemData' => [
+                    'body' => 'added 1h 30m 36s of time spent at 2018-11-14 just now ',
+                    'gitlab_created_at' => '2018-01-01T12:12:13',
+                ],
+                'prevItemData' => null,
+                'expectedRow' => [
+                    'hours' => 1.51,
+                    'spent_at' => '2018-11-14',
                     'gitlab_created_at' => '2018-01-01T12:12:13',
                     'description' => null,
                 ],
@@ -199,7 +224,7 @@ public function parseSpentTimeItemDataProvider()
 
             [
                 'itemData' => [
-                    'body' => 'added 2h of time spent at 2018-11-24 just now',
+                    'body' => 'added 2h of time spent at 2018-11-21 just now',
                     'gitlab_created_at' => '2018-01-01T12:12:12',
                 ],
                 'prevItemData' => [
@@ -208,14 +233,14 @@ public function parseSpentTimeItemDataProvider()
                 ],
                 'expectedRow' => [
                     'hours' => 2,
-                    'spent_at' => null,
+                    'spent_at' => '2018-11-21',
                     'gitlab_created_at' => '2018-01-01T12:12:12',
                     'description' => 'added 1h 30m of time spent at 2018-11-24 just now',
                 ],
             ],
             [
                 'itemData' => [
-                    'body' => 'added 2h of time spent at 2018-11-24 just now',
+                    'body' => 'added 2h of time spent at 2018-11-23 just now',
                     'gitlab_created_at' => '2018-01-02T12:12:12',
                 ],
                 'prevItemData' => [
@@ -224,7 +249,7 @@ public function parseSpentTimeItemDataProvider()
                 ],
                 'expectedRow' => [
                     'hours' => 2,
-                    'spent_at' => null,
+                    'spent_at' => '2018-11-23',
                     'gitlab_created_at' => '2018-01-02T12:12:12',
                     'description' => null,
                 ],
@@ -241,7 +266,7 @@ public function parseSpentTimeItemDataProvider()
                 ],
                 'expectedRow' => [
                     'hours' => 3.5,
-                    'spent_at' => null,
+                    'spent_at' => '2018-11-24',
                     'gitlab_created_at' => '2018-01-01T12:12:12',
                     'description' => 'test primary with hours',
                 ],
@@ -257,7 +282,7 @@ public function parseSpentTimeItemDataProvider()
                 ],
                 'expectedRow' => [
                     'hours' => 4.5,
-                    'spent_at' => null,
+                    'spent_at' => '2018-11-24',
                     'gitlab_created_at' => '2018-01-02T12:12:12',
                     'description' => null,
                 ],