Include a nodegroup's graph as nodegroup.graphid

arches/app/models/migrations/11396_nodegroup_graph.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.2.15 on 2024-08-23 16:20
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("models", "9053_add_future_graphs"),
+    ]
+
+    sql = """
+    UPDATE node_groups
+    SET graphid = sub.graphid
+    FROM (
+        SELECT DISTINCT ng.nodegroupid, n.graphid
+        FROM nodes n
+        JOIN node_groups ng ON n.nodegroupid = ng.nodegroupid
+    ) AS sub
+    WHERE node_groups.nodegroupid = sub.nodegroupid;
+    """
+
+    reverse_sql = """"""
+
+    operations = [
+        migrations.AddField(
+            model_name="nodegroup",
+            name="graph",
+            field=models.ForeignKey(
+                blank=True,
+                db_column="graphid",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="models.graphmodel",
+            ),
+        ),
+        migrations.RunSQL(
+            sql,
+            reverse_sql,
+        ),
+    ]

arches/app/models/migrations/7787_relational_data_model.py

@@ -261,7 +261,7 @@ class Migration(migrations.Migration):
                     join node_groups g on g.nodegroupid = n.nodegroupid
                     where n.nodeid = n.nodegroupid
                     and g.parentnodegroupid is null
-                    and graphid = model_id
+                    and n.graphid = model_id
                 loop
                     perform __arches_create_branch_views(node.nodeid, schema_name, '');
                 end loop;

arches/app/models/migrations/8009_etlmodule.py

@@ -176,7 +176,7 @@
             (select alias from nodes where nodeid = nodegroup_id) as path,
             cardinality
         FROM
-        (SELECT ng.nodegroupid, ng.parentnodegroupid, alias, name, cardinality, graphid FROM node_groups ng
+        (SELECT ng.nodegroupid, ng.parentnodegroupid, n.alias, n.name, ng.cardinality, n.graphid FROM node_groups ng
         INNER JOIN nodes n ON ng.nodegroupid = n.nodeid
         ORDER by ng.nodegroupid) AS root
         WHERE nodegroupid = nodegroup_id
@@ -190,7 +190,7 @@
                 path || ' - ' || parent.alias,
                 parent.cardinality
             FROM
-            (SELECT ng.nodegroupid, ng.parentnodegroupid, alias, name, cardinality, graphid FROM node_groups ng
+            (SELECT ng.nodegroupid, ng.parentnodegroupid, n.alias, n.name, ng.cardinality, n.graphid FROM node_groups ng
             INNER JOIN nodes n ON ng.nodegroupid = n.nodeid
             ORDER by ng.nodegroupid) AS parent
             INNER JOIN nodegroup_tree nt ON nt.nodegroupid = parent.parentnodegroupid
@@ -208,7 +208,7 @@
     DECLARE
     _nodegroupid uuid;
     BEGIN
-    FOR _nodegroupid IN select ng.nodegroupid from node_groups ng join nodes n on ng.nodegroupid = nodeid where graphid = graph_id and ng.parentnodegroupid is null
+    FOR _nodegroupid IN select ng.nodegroupid from node_groups ng join nodes n on ng.nodegroupid = nodeid where n.graphid = graph_id and ng.parentnodegroupid is null
     LOOP
         RETURN QUERY SELECT _nodegroupid, * FROM __get_nodegroup_tree(_nodegroupid);
     END LOOP;

arches/app/models/migrations/8813_resource_model_view_defaults.py

@@ -141,7 +141,7 @@ class Migration(migrations.Migration):
                     join node_groups g on g.nodegroupid = n.nodegroupid
                     where n.nodeid = n.nodegroupid
                     and g.parentnodegroupid is null
-                    and graphid = model_id
+                    and n.graphid = model_id
                 loop
                     perform __arches_create_branch_views(node.nodeid, schema_name, '');
                 end loop;
@@ -281,7 +281,7 @@ class Migration(migrations.Migration):
                     join node_groups g on g.nodegroupid = n.nodegroupid
                     where n.nodeid = n.nodegroupid
                     and g.parentnodegroupid is null
-                    and graphid = model_id
+                    and n.graphid = model_id
                 loop
                     perform __arches_create_branch_views(node.nodeid, schema_name, '');
                 end loop;

arches/app/models/migrations/9068_resource_model_view_defaults.py

@@ -220,7 +220,7 @@ class Migration(migrations.Migration):
                     join node_groups g on g.nodegroupid = n.nodegroupid
                     where n.nodeid = n.nodegroupid
                     and g.parentnodegroupid is null
-                    and graphid = model_id
+                    and n.graphid = model_id
                 loop
                     perform __arches_create_branch_views(node.nodeid, schema_name, '');
                 end loop;

arches/app/models/models.py

@@ -715,6 +715,9 @@ class NodeGroup(models.Model):
         null=True,
         on_delete=models.CASCADE,
     )  # Allows nodegroups within nodegroups
+    graph = models.ForeignKey(
+        GraphModel, db_column="graphid", blank=True, null=True, on_delete=models.CASCADE
+    )
 
     def __init__(self, *args, **kwargs):
         super(NodeGroup, self).__init__(*args, **kwargs)