Prevent empty table tags appearance (#156)

* Prevent empty table tags appearance

* Prevent empty table tags appearance

databuilder/models/table_metadata.py

@@ -160,7 +160,7 @@ class TableMetadata(Neo4jCsvSerializable):
         self.is_view = is_view
         self.attrs = None
         if isinstance(tags, str):
-            tags = tags.split(',')
+            tags = list(filter(None, tags.split(',')))
         if isinstance(tags, list):
             tags = [tag.lower().strip() for tag in tags]
         self.tags = tags

setup.py

@@ -2,7 +2,7 @@ import os
 from setuptools import setup, find_packages
 
 
-__version__ = '1.4.10'
+__version__ = '1.4.11'
 
 
 requirements_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'requirements.txt')

tests/unit/models/test_table_metadata.py

@@ -6,6 +6,10 @@ from databuilder.models.table_metadata import ColumnMetadata, TableMetadata
 
 class TestTableMetadata(unittest.TestCase):
     def setUp(self):
+        # type: () -> None
+        super(TestTableMetadata, self).setUp()
+
+    def test_serialize(self):
         # type: () -> None
         self.table_metadata = TableMetadata('hive', 'gold', 'test_schema1', 'test_table1', 'test_table1', [
             ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0),
@@ -23,21 +27,6 @@ class TestTableMetadata(unittest.TestCase):
             ColumnMetadata('etl_created_at', 'description of etl_created_at', 'timestamp', 4),
             ColumnMetadata('ds', None, 'varchar', 5)])
 
-        self.table_metadata3 = TableMetadata('hive', 'gold', 'test_schema3', 'test_table3', 'test_table3', [
-            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0),
-            ColumnMetadata('test_id2', 'description of test_id2', 'bigint', 1),
-            ColumnMetadata('is_active', None, 'boolean', 2),
-            ColumnMetadata('source', 'description of source', 'varchar', 3),
-            ColumnMetadata('etl_created_at', 'description of etl_created_at', 'timestamp', 4),
-            ColumnMetadata('ds', None, 'varchar', 5)], is_view=False, attr1='uri', attr2='attr2')
-
-        self.table_metadata4 = TableMetadata('hive', 'gold', 'test_schema4', 'test_table4', 'test_table4', [
-            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0, ['col-tag1', 'col-tag2'])],
-            is_view=False, tags=['tag1', 'tag2'], attr1='uri', attr2='attr2')
-
-        self.table_metadata5 = TableMetadata('hive', 'gold', 'test_schema5', 'test_table5', 'test_table5', [
-            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0)], tags="tag3, tag4")
-
         self.expected_nodes_deduped = [
             {'name': 'test_table1', 'KEY': 'hive://gold.test_schema1/test_table1', 'LABEL': 'Table',
              'is_view:UNQUOTED': False},
@@ -112,8 +101,6 @@ class TestTableMetadata(unittest.TestCase):
                                    'END_LABEL': 'Schema', 'START_KEY': 'hive://gold',
                                    'TYPE': 'SCHEMA', 'REVERSE_TYPE': 'SCHEMA_OF'})
 
-    def test_serialize(self):
-        # type: () -> None
         node_row = self.table_metadata.next_node()
         actual = []
         while node_row:
@@ -147,7 +134,16 @@ class TestTableMetadata(unittest.TestCase):
 
         self.assertEqual(self.expected_rels_deduped, actual)
 
-        # Test additional K/V Attributes
+    def test_table_attributes(self):
+        # type: () -> None
+        self.table_metadata3 = TableMetadata('hive', 'gold', 'test_schema3', 'test_table3', 'test_table3', [
+            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0),
+            ColumnMetadata('test_id2', 'description of test_id2', 'bigint', 1),
+            ColumnMetadata('is_active', None, 'boolean', 2),
+            ColumnMetadata('source', 'description of source', 'varchar', 3),
+            ColumnMetadata('etl_created_at', 'description of etl_created_at', 'timestamp', 4),
+            ColumnMetadata('ds', None, 'varchar', 5)], is_view=False, attr1='uri', attr2='attr2')
+
         node_row = self.table_metadata3.next_node()
         actual = []
         while node_row:
@@ -157,7 +153,12 @@ class TestTableMetadata(unittest.TestCase):
         self.assertEqual(actual[0].get('attr1'), 'uri')
         self.assertEqual(actual[0].get('attr2'), 'attr2')
 
-        # Test tag field
+    def test_tags_field(self):
+        # type: () -> None
+        self.table_metadata4 = TableMetadata('hive', 'gold', 'test_schema4', 'test_table4', 'test_table4', [
+            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0, ['col-tag1', 'col-tag2'])],
+            is_view=False, tags=['tag1', 'tag2'], attr1='uri', attr2='attr2')
+
         node_row = self.table_metadata4.next_node()
         actual = []
         while node_row:
@@ -199,6 +200,11 @@ class TestTableMetadata(unittest.TestCase):
         self.assertEqual(actual[6], expected_col_tag_rel1)
         self.assertEqual(actual[7], expected_col_tag_rel2)
 
+    def test_tags_populated_from_str(self):
+        # type: () -> None
+        self.table_metadata5 = TableMetadata('hive', 'gold', 'test_schema5', 'test_table5', 'test_table5', [
+            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0)], tags="tag3, tag4")
+
         # Test table tag field populated from str
         node_row = self.table_metadata5.next_node()
         actual = []
@@ -226,6 +232,26 @@ class TestTableMetadata(unittest.TestCase):
         self.assertEqual(actual[2], expected_tab_tag_rel3)
         self.assertEqual(actual[3], expected_tab_tag_rel4)
 
+    def test_tags_arent_populated_from_empty_list_and_str(self):
+        # type: () -> None
+        self.table_metadata6 = TableMetadata('hive', 'gold', 'test_schema6', 'test_table6', 'test_table6', [
+            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0)], tags=[])
+
+        self.table_metadata7 = TableMetadata('hive', 'gold', 'test_schema7', 'test_table7', 'test_table7', [
+            ColumnMetadata('test_id1', 'description of test_table1', 'bigint', 0)], tags="")
+
+        # Test table tag fields are not populated from empty List
+        node_row = self.table_metadata6.next_node()
+        while node_row:
+            self.assertNotEqual(node_row.get('LABEL'), 'Tag')
+            node_row = self.table_metadata6.next_node()
+
+        # Test table tag fields are not populated from empty str
+        node_row = self.table_metadata7.next_node()
+        while node_row:
+            self.assertNotEqual(node_row.get('LABEL'), 'Tag')
+            node_row = self.table_metadata7.next_node()
+
 
 if __name__ == '__main__':
     unittest.main()