fix: 修复新旧版本对于default_node节点变更冲突的问题(旧版本会将新版本迁移后的default_node节点的key修改为非1)

apps/assets/apps.py

@@ -1,16 +1,6 @@
 from __future__ import unicode_literals
 
 from django.apps import AppConfig
-from django.db.models.signals import post_migrate
-
-
-def initial_some_nodes():
-    from .models import Node
-    Node.initial_some_nodes()
-
-
-def initial_some_nodes_callback(sender, **kwargs):
-    initial_some_nodes()
 
 
 class AssetsConfig(AppConfig):
@@ -19,7 +9,3 @@ class AssetsConfig(AppConfig):
     def ready(self):
         super().ready()
         from . import signals_handler
-        try:
-            initial_some_nodes()
-        except Exception:
-            post_migrate.connect(initial_some_nodes_callback, sender=self)

apps/assets/models/node.py

@@ -465,44 +465,6 @@ class SomeNodesMixin:
     empty_key = '-11'
     empty_value = _("empty")
 
-    @classmethod
-    def correct_default_node_if_need(cls):
-        with tmp_to_root_org():
-            wrong_default_org = cls.objects.filter(key='1', value='Default').first()
-            if not wrong_default_org:
-                return
-
-            if wrong_default_org.has_children_or_has_assets():
-                return
-
-            default_org = Organization.default()
-            right_default_org = cls.objects.filter(value=default_org.name).first()
-            if not right_default_org:
-                return
-
-            if right_default_org.date_create > wrong_default_org.date_create:
-                return
-
-            with atomic():
-                logger.warn(f'Correct default node: '
-                            f'old={wrong_default_org.value}-{wrong_default_org.key} '
-                            f'new={right_default_org.value}-{right_default_org.key}')
-                wrong_default_org.delete()
-                right_default_org.key = '1'
-                right_default_org.save()
-
-    @classmethod
-    def default_node(cls):
-        cls.correct_default_node_if_need()
-
-        default_org = Organization.default()
-        with tmp_to_org(default_org):
-            defaults = {'value': default_org.name}
-            obj, created = cls.objects.get_or_create(
-                defaults=defaults, key=cls.default_key,
-            )
-            return obj
-
     def is_default_node(self):
         return self.key == self.default_key
 
@@ -513,15 +475,36 @@ class SomeNodesMixin:
             return False
 
     @classmethod
-    def get_next_org_root_node_key(cls):
+    def org_root(cls):
-        with tmp_to_org(Organization.root()):
+        # 如果使用current_org 在set_current_org时会死循环
-            org_nodes_roots = cls.objects.filter(key__regex=r'^[0-9]+$')
+        ori_org = get_current_org()
-            org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True)
+
-            if not org_nodes_roots_keys:
+        if ori_org and ori_org.is_default():
-                org_nodes_roots_keys = ['1']
+            return cls.default_node()
-            max_key = max([int(k) for k in org_nodes_roots_keys])
+
-            key = str(max_key + 1) if max_key > 0 else '2'
+        if ori_org and ori_org.is_root():
-            return key
+            return None
+
+        org_roots = cls.org_root_nodes()
+        org_roots_length = len(org_roots)
+
+        if org_roots_length == 1:
+            root = org_roots[0]
+            return root
+        elif org_roots_length == 0:
+            root = cls.create_org_root_node()
+            return root
+        else:
+            error = 'Current org {} root node not 1, get {}'.format(ori_org, org_roots_length)
+            raise ValueError(error)
+
+    @classmethod
+    def default_node(cls):
+        default_org = Organization.default()
+        with tmp_to_org(default_org):
+            defaults = {'value': default_org.name}
+            obj, created = cls.objects.get_or_create(defaults=defaults, key=cls.default_key)
+            return obj
 
     @classmethod
     def create_org_root_node(cls):
@@ -531,68 +514,22 @@ class SomeNodesMixin:
             root = cls.objects.create(key=key, value=ori_org.name)
             return root
 
+    @classmethod
+    def get_next_org_root_node_key(cls):
+        with tmp_to_root_org():
+            org_nodes_roots = cls.org_root_nodes()
+            org_nodes_roots_keys = org_nodes_roots.values_list('key', flat=True)
+            if not org_nodes_roots_keys:
+                org_nodes_roots_keys = ['1']
+            max_key = max([int(k) for k in org_nodes_roots_keys])
+            key = str(max_key + 1) if max_key > 0 else '2'
+            return key
+
     @classmethod
     def org_root_nodes(cls):
-        nodes = cls.objects.filter(parent_key='') \
+        root_nodes = cls.objects.filter(parent_key='', key__regex=r'^[0-9]+$') \
-            .filter(key__regex=r'^[0-9]+$') \
+            .exclude(key__startswith='-').order_by('key')
-            .exclude(key__startswith='-') \
+        return root_nodes
-            .order_by('key')
-        return nodes
-
-    @classmethod
-    def org_root(cls):
-        # 如果使用current_org 在set_current_org时会死循环
-        ori_org = get_current_org()
-
-        if ori_org and ori_org.is_default():
-            return cls.default_node()
-        if ori_org and ori_org.is_root():
-            return None
-
-        org_roots = cls.org_root_nodes()
-        org_roots_length = len(org_roots)
-
-        if org_roots_length == 1:
-            return org_roots[0]
-        elif org_roots_length == 0:
-            root = cls.create_org_root_node()
-            return root
-        else:
-            raise ValueError('Current org root node not 1, get {}'.format(org_roots_length))
-
-    @classmethod
-    def initial_some_nodes(cls):
-        cls.default_node()
-
-    @classmethod
-    def modify_other_org_root_node_key(cls):
-        """
-        解决创建 default 节点失败的问题，
-        因为在其他组织下存在 default 节点，故在 DEFAULT 组织下 get 不到 create 失败
-        """
-        logger.info("Modify other org root node key")
-
-        with tmp_to_org(Organization.root()):
-            node_key1 = cls.objects.filter(key='1').first()
-            if not node_key1:
-                logger.info("Not found node that `key` = 1")
-                return
-            if node_key1.org_id == '':
-                node_key1.org_id = str(Organization.default().id)
-                node_key1.save()
-                return
-
-        with transaction.atomic():
-            with tmp_to_org(node_key1.org):
-                org_root_node_new_key = cls.get_next_org_root_node_key()
-                for n in cls.objects.all():
-                    old_key = n.key
-                    key_list = n.key.split(':')
-                    key_list[0] = org_root_node_new_key
-                    new_key = ':'.join(key_list)
-                    n.key = new_key
-                    n.save()
-                    logger.info('Modify key ( {} > {} )'.format(old_key, new_key))
 
 
 class Node(OrgModelMixin, SomeNodesMixin, FamilyMixin, NodeAssetsMixin):

apps/orgs/migrations/0010_auto_20210219_1241.py

@@ -6,7 +6,7 @@ import sys
 from django.db import migrations
 
 
-default_id = '00000000-0000-0000-0000-000000000001'
+default_id = '00000000-0000-0000-0000-000000000002'
 
 
 def add_default_org(apps, schema_editor):

apps/orgs/models.py

@@ -28,8 +28,8 @@ class Organization(models.Model):
 
     ROOT_ID = '00000000-0000-0000-0000-000000000000'
     ROOT_NAME = _('GLOBAL')
-    DEFAULT_ID = '00000000-0000-0000-0000-000000000001'
+    DEFAULT_ID = '00000000-0000-0000-0000-000000000002'
-    DEFAULT_NAME = 'DEFAULT'
+    DEFAULT_NAME = 'Default'
     orgs_mapping = None
 
     class Meta:

apps/perms/const.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-from django.utils.translation import ugettext_lazy as _
-
-UNGROUPED_NODE_ID = "00000000-0000-0000-0000-000000000002"
-UNGROUPED_NODE_KEY = '-2'
-UNGROUPED_NODE_VALUE = _("Ungrouped")
-EMPTY_NODE_ID = "00000000-0000-0000-0000-000000000003"
-EMPTY_NODE_KEY = "-3"
-EMPTY_NODE_VALUE = _("Empty")