Fix columns of the public label export

It should contain the source_id instead of the label_source_id. The UUID is unnecessary.
biigle · Aug 15, 2019 · 34e6cfa · 34e6cfa
1 parent 1584e86
commit 34e6cfa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/src/Support/Export/PublicLabelExport.php b/src/Support/Export/PublicLabelExport.php
@@ -31,8 +31,7 @@ public function getContent()
             'parent_id',
             'color',
             'label_tree_id',
-            'label_source_id',
-            'uuid',
+            'source_id',
         ];
         $csv->fputcsv($columns);
 
@@ -46,8 +45,7 @@ public function getContent()
                         $row->parent_id,
                         $row->color,
                         $row->label_tree_id,
-                        $row->label_source_id,
-                        $row->uuid,
+                        $row->source_id,
                     ]);
                 }
             });

diff --git a/tests/Support/Export/PublicLabelExportTest.php b/tests/Support/Export/PublicLabelExportTest.php
@@ -13,7 +13,7 @@ class PublicLabelExportTest extends TestCase
 {
     public function testGetContent()
     {
-        $parent = LabelTest::create();
+        $parent = LabelTest::create(['source_id' => 'abcdef']);
         $child = LabelTest::create([
             'label_tree_id' => $parent->label_tree_id,
             'parent_id' => $parent->id,
@@ -30,8 +30,7 @@ public function testGetContent()
             "{$parent->parent_id}",
             "{$parent->color}",
             "{$parent->label_tree_id}",
-            "{$parent->label_source_id}",
-            "{$parent->uuid}",
+            "{$parent->source_id}",
         ];
         $this->assertEquals($expectParent, $file->fgetcsv());
 
@@ -41,8 +40,7 @@ public function testGetContent()
             "{$child->parent_id}",
             "{$child->color}",
             "{$child->label_tree_id}",
-            "{$child->label_source_id}",
-            "{$child->uuid}",
+            "{$child->source_id}",
         ];
         $this->assertEquals($expectChild, $file->fgetcsv());
     }

diff --git a/tests/Support/Export/PublicLabelTreeExportTest.php b/tests/Support/Export/PublicLabelTreeExportTest.php
@@ -75,8 +75,7 @@ public function testGetAdditionalExports()
             "{$label->parent_id}",
             "{$label->color}",
             "{$label->label_tree_id}",
-            "{$label->label_source_id}",
-            "{$label->uuid}",
+            "{$label->source_id}",
         ];
         $this->assertEquals($expect, $file->fgetcsv());
     }