Export dates from entries

src/Wallabag/CoreBundle/Entity/Entry.php

@@ -101,7 +101,7 @@ class Entry
      *
      * @ORM\Column(name="created_at", type="datetime")
      *
-     * @Groups({"export_all"})
+     * @Groups({"entries_for_user", "export_all"})
      */
     private $createdAt;
 
@@ -110,7 +110,7 @@ class Entry
      *
      * @ORM\Column(name="updated_at", type="datetime")
      *
-     * @Groups({"export_all"})
+     * @Groups({"entries_for_user", "export_all"})
      */
     private $updatedAt;
 

src/Wallabag/CoreBundle/Helper/EntriesExport.php

@@ -298,7 +298,7 @@ class EntriesExport
         $enclosure = '"';
         $handle = fopen('php://memory', 'rb+');
 
-        fputcsv($handle, ['Title', 'URL', 'Content', 'Tags', 'MIME Type', 'Language'], $delimiter, $enclosure);
+        fputcsv($handle, ['Title', 'URL', 'Content', 'Tags', 'MIME Type', 'Language', 'Creation date'], $delimiter, $enclosure);
 
         foreach ($this->entries as $entry) {
             fputcsv(
@@ -311,6 +311,7 @@ class EntriesExport
                     implode(', ', $entry->getTags()->toArray()),
                     $entry->getMimetype(),
                     $entry->getLanguage(),
+                    $entry->getCreatedAt()->format('d/m/Y h:i:s'),
                 ],
                 $delimiter,
                 $enclosure

tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php

@@ -168,7 +168,7 @@ class ExportControllerTest extends WallabagCoreTestCase
         $this->assertGreaterThan(1, $csv);
         // +1 for title line
         $this->assertEquals(count($contentInDB) + 1, count($csv));
-        $this->assertEquals('Title;URL;Content;Tags;"MIME Type";Language', $csv[0]);
+        $this->assertEquals('Title;URL;Content;Tags;"MIME Type";Language;"Creation date"', $csv[0]);
     }
 
     public function testJsonExport()
@@ -210,6 +210,8 @@ class ExportControllerTest extends WallabagCoreTestCase
         $this->assertArrayHasKey('reading_time', $content[0]);
         $this->assertArrayHasKey('domain_name', $content[0]);
         $this->assertArrayHasKey('tags', $content[0]);
+        $this->assertArrayHasKey('created_at', $content[0]);
+        $this->assertArrayHasKey('updated_at', $content[0]);
     }
 
     public function testXmlExport()
@@ -247,5 +249,7 @@ class ExportControllerTest extends WallabagCoreTestCase
         $this->assertNotEmpty('url', (string) $content->entry[0]->url);
         $this->assertNotEmpty('content', (string) $content->entry[0]->content);
         $this->assertNotEmpty('domain_name', (string) $content->entry[0]->domain_name);
+        $this->assertNotEmpty('created_at', (string) $content->entry[0]->created_at);
+        $this->assertNotEmpty('updated_at', (string) $content->entry[0]->updated_at);
     }
 }