Improved naming and functionality for leaves/roots methods

Author: JackAtOmenApps

django_postgresql_dag/models.py

@@ -605,48 +605,52 @@ def ancestors_tree(self):
                 tree[parent] = parent.ancestors_tree()
             return tree
 
-        def _get_roots(self, ancestors_tree):
+        def _roots(self, ancestors_tree):
             """
             Works on objects: no queries
             """
             if not ancestors_tree:
                 return set([self])
             roots = set()
             for ancestor in ancestors_tree:
-                roots.update(ancestor._get_roots(ancestors_tree[ancestor]))
+                roots.update(ancestor._roots(ancestors_tree[ancestor]))
             return roots
 
-        def get_roots(self):
+        def roots(self):
             """
             Returns roots nodes, if any
             # ToDo: Modify to use CTE
             """
             ancestors_tree = self.ancestors_tree()
             roots = set()
             for ancestor in ancestors_tree:
-                roots.update(ancestor._get_roots(ancestors_tree[ancestor]))
+                roots.update(ancestor._roots(ancestors_tree[ancestor]))
+            if len(roots) < 1:
+                roots.add(self)
             return roots
 
-        def _get_leaves(self, descendants_tree):
+        def _leaves(self, descendants_tree):
             """
             Works on objects: no queries
             """
             if not descendants_tree:
                 return set([self])
             leaves = set()
             for descendant in descendants_tree:
-                leaves.update(descendant._get_leaves(descendants_tree[descendant]))
+                leaves.update(descendant._leaves(descendants_tree[descendant]))
             return leaves
 
-        def get_leaves(self):
+        def leaves(self):
             """
             Returns leaves nodes, if any
             # ToDo: Modify to use CTE
             """
             descendants_tree = self.descendants_tree()
             leaves = set()
             for descendant in descendants_tree:
-                leaves.update(descendant._get_leaves(descendants_tree[descendant]))
+                leaves.update(descendant._leaves(descendants_tree[descendant]))
+            if len(leaves) < 1:
+                leaves.add(self)
             return leaves
 
         @staticmethod