Merge pull request #371 from open-contracting/feat/default-split

feat: split tables by default

core/migrations/0043_alter_table_split.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.3 on 2021-09-23 09:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0042_alter_url_author"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="table",
+            name="split",
+            field=models.BooleanField(default=True),
+        ),
+    ]

core/migrations/0043_table_parent.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.3 on 2021-09-24 10:23
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0042_alter_url_author"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="table",
+            name="parent",
+            field=models.CharField(blank=True, max_length=120, null=True),
+        ),
+    ]

core/models.py

@@ -159,11 +159,12 @@ def __str__(self):
 class Table(models.Model):
     id = models.UUIDField(primary_key=True, editable=False, default=uuid.uuid4)
     name = models.CharField(max_length=120)
-    split = models.BooleanField(default=False)
+    split = models.BooleanField(default=True)
     include = models.BooleanField(default=True)
     heading = models.CharField(max_length=31, blank=True, null=True)
     array_tables = models.ManyToManyField("self", blank=True)
     column_headings = models.JSONField(default=dict, encoder=DjangoJSONEncoder, blank=True, null=True)
+    parent = models.CharField(max_length=120, blank=True, null=True)
 
     def __str__(self):
         return f"{self.__class__.__name__} {self.id}"

core/serializers.py

@@ -8,7 +8,7 @@
 class ArrayTablesSerializer(serializers.ModelSerializer):
     class Meta:
         model = Table
-        fields = ("id", "name", "include", "heading")
+        fields = ("id", "name", "include", "heading", "parent")
 
 
 class DataFileSerializer(serializers.ModelSerializer):
@@ -27,7 +27,7 @@ class TablesSerializer(serializers.ModelSerializer):
     class Meta:
         model = Table
         read_only_fields = ("array_tables",)
-        fields = ("id", "name", "split", "array_tables", "include", "heading")
+        fields = ("id", "name", "split", "array_tables", "include", "heading", "parent")
 
 
 class FlattenSerializer(serializers.ModelSerializer):

core/utils.py

@@ -216,7 +216,7 @@ def get_options_for_table(selections, exclude_tables_list, selection, tables, pa
                 selections[table.name]["only"] = only
             if "repeat" in lite_table_config:
                 selections[table.name]["repeat"] = lite_table_config["repeat"]
-        if table.split:
+        if table.split and selection.kind != selection.OCDS_LITE:
             get_options_for_table(selections, exclude_tables_list, selection, table.array_tables, table, analyzed_data)
 
 

core/views.py

@@ -467,7 +467,9 @@ def _split_table(self, table, analyzed_tables, datasource, child_tables):
                     },
                 )
                 continue
-            child_table = Table.objects.create(name=child_table_key)
+            child_table = Table.objects.create(
+                name=child_table_key, parent=analyzed_tables[child_table_key].parent.name
+            )
             table.array_tables.add(child_table)
             preview_path = f"{datasource_dir}/{child_table_key}_combined.csv"
             store_preview_csv(COLUMNS, PREVIEW_ROWS, analyzed_tables[child_table_key], preview_path)