Feature 性能调优 (#263)

* [update] 核心模块性能改进

* [update] 改进产品API性能

* [update] 改进__str__方法性能

* [update] 改进__str__性能以及提高序列化器稳定性

* [update] 提高库存模块数据库查询效率

* [update] 更新单元测试代码

Author: Time1ess

Core/api/auth.py

@@ -15,7 +15,8 @@ class UserViewSet(viewsets.ModelViewSet):
     用户信息API
     """
     pagination_class = SmallResultsSetPagination
-    queryset = User.objects.exclude(is_staff=True).order_by('pk')
+    queryset = (User.objects.exclude(is_staff=True)
+                .prefetch_related('info').order_by('pk'))
     filter_class = filters.UserFilter
 
     def destroy(self, request, pk=None):

Core/models/auth.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.conf import settings
 from django.contrib.auth.models import User, Group
 
 from Core import GENDER_CHOICES, GENDER_MALE
@@ -26,32 +27,43 @@ class Meta:
         verbose_name_plural = '个人信息'
 
     def __str__(self):
-        return '{1}(用户名:{0})'.format(
-            self.user.username, self.user.first_name)
+        return '{}(用户名:{})'.format(
+            self.user.first_name, self.user.username)
 
 
 class DistributionDepartmentManager(models.Manager):
     def get_queryset(self):
         # TODO: To real
-        return super().get_queryset().filter(id=1)
+        return (super().get_queryset()
+                .filter(
+                    id=settings.ERP_CONTEXT['DEPARTMENT']['DISTRIBUTION_ID'])
+                .select_related('group'))
 
 
 class ProcessDepartmentManager(models.Manager):
     def get_queryset(self):
         # TODO: To real
-        return super().get_queryset().filter(id=2)
+        return (super().get_queryset()
+                .filter(id=settings.ERP_CONTEXT['DEPARTMENT']['PROCESS_ID'])
+                .select_related('group'))
 
 
 class ProcurementDepartmentManager(models.Manager):
     def get_queryset(self):
         # TODO: To real
-        return super().get_queryset().filter(id=3)
+        return (super().get_queryset()
+                .filter(
+                    id=settings.ERP_CONTEXT['DEPARTMENT']['PROCUREMENT_ID'])
+                .select_related('group'))
 
 
 class ProductionDepartmentManager(models.Manager):
     def get_queryset(self):
         # TODO: To real
-        return super().get_queryset().filter(id=4)
+        return (super().get_queryset()
+                .filter(
+                    id=settings.ERP_CONTEXT['DEPARTMENT']['PRODUCTION_ID'])
+                .select_related('group'))
 
 
 class Department(models.Model):
@@ -72,6 +84,7 @@ class Department(models.Model):
 
     # Custom managers
     objects = models.Manager()
+    # TODO: Optimization
     distribution = DistributionDepartmentManager()
     process = ProcessDepartmentManager()
     procurement = ProcurementDepartmentManager()
@@ -86,5 +99,7 @@ def __str__(self):
 
     @classmethod
     def get_departments_dict(cls):
-        departments = {d.group.name: d.id for d in cls.objects.all()}
+        departments = {
+            d.group.name: d.id
+            for d in cls.objects.all().select_related('group')}
         return departments

Core/models/work_order.py

@@ -46,7 +46,10 @@ class Meta:
 
     @property
     def uid(self):
+        # TODO: Optimization
+        # May be a bottleneck for all using this strategy
+        # cascade sql calls
         return '{}-{}'.format(self.work_order, self.index)
 
     def __str__(self):
-        return self.uid
+        return '{}-{}'.format(self.work_order_id, self.index)

Core/serializers/work_order.py

@@ -9,10 +9,11 @@ class WorkOrderSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = WorkOrder
-        fields = '__all__'
+        fields = ('id', 'uid', 'sell_type', 'pretty_sell_type',
+                  'client', 'project', 'product', 'count', 'finished')
 
 
 class SubWorkOrderSerializer(serializers.ModelSerializer):
     class Meta:
         model = SubWorkOrder
-        fields = '__all__'
+        fields = ('id', 'work_order', 'index', 'finished')

Core/tests/tests_models.py

@@ -1,51 +1,36 @@
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
 from django.test import TestCase
-from django.contrib.auth.models import User, Group
+from model_mommy import mommy
 
-from Core.models import (WorkOrder, SubWorkOrder,
-                         UserInfo, Department)
+from Core.models import Department
 
 
 class UserInfoTest(TestCase):
     def test_str(self):
-        user_info = UserInfo()
-        user = Mock(spec=User)
-        user._state = Mock()
-        user.username = 'username'
-        user.first_name = 'first_name'
-        user_info.user = user
+        username = 'username'
+        name = 'name'
+        user_info = mommy.prepare(
+            'UserInfo', user__username=username, user__first_name=name)
         expected_str = '{}(用户名:{})'.format(
-            user.first_name, user.username)
+            name, username)
         self.assertEqual(str(user_info), expected_str)
 
 
-def return_fake_department():
-    department = Department()
-    group = Mock(spec=Group)
-    group._state = Mock()
-    group.name = 'group'
-    group.id = 5
-    department.group = group
-
-    def _wrapper():
-        return [department]
-    return _wrapper
-
-
 class DepartmentTest(TestCase):
     def test_str(self):
-        department = Department()
-        group = Mock(spec=Group)
-        group._state = Mock()
-        group.name = 'group'
-        department.group = group
-        expected_str = 'group'
-        self.assertEqual(str(department), expected_str)
+        name = 'group'
+        department = mommy.prepare('Department', group__name=name)
+        self.assertEqual(str(department), name)
 
-    @patch('Core.models.auth.Department.objects.all', return_fake_department())
-    def test_get_departments_dict(self):
-        departments = {d.group.name: d.id for d in Department.objects.all()}
+    @patch('Core.models.auth.Department.objects')
+    def test_get_departments_dict(self, mocked_objects):
+        objects = mommy.prepare('Department', _quantity=4)
+        mocked_objects.all.return_value = mocked_objects
+        mocked_objects.select_related.return_value = objects
+        departments = {
+            d.group.name: d.id
+            for d in Department.objects.all().select_related('group')}
         for key, val in Department.get_departments_dict().items():
             self.assertIn(key, departments)
             self.assertEqual(val, departments[key])
@@ -54,28 +39,29 @@ def test_get_departments_dict(self):
     def test_special_department(self, mocked_queryset):
         mocked_queryset.return_value = mocked_queryset
         mocked_queryset.filter.return_value = mocked_queryset
-        mocked_queryset.get.return_value = None
-        self.assertEqual(Department.distribution.get(), None)
-        self.assertEqual(Department.process.get(), None)
-        self.assertEqual(Department.procurement.get(), None)
-        self.assertEqual(Department.production.get(), None)
+        mocked_queryset.select_related.return_value = mocked_queryset
+        dep = mommy.prepare('Department')
+        mocked_queryset.get.return_value = dep
+        self.assertEqual(Department.distribution.get(), dep)
+        self.assertEqual(Department.process.get(), dep)
+        self.assertEqual(Department.procurement.get(), dep)
+        self.assertEqual(Department.production.get(), dep)
 
 
 class WorkOrderTest(TestCase):
     def test_str(self):
-        uid = '123456'
-        work_order = WorkOrder(uid=uid)
+        uid = '1'
+        work_order = mommy.prepare('WorkOrder', uid=uid)
         self.assertEqual(str(work_order), uid)
 
 
 class SubWorkOrderTest(TestCase):
     def test_str(self):
-        sub_order = SubWorkOrder()
-        work_order = Mock(spec=WorkOrder)
-        work_order._state = Mock()
-        work_order.__str__ = Mock()
-        work_order.__str__.return_value = '1'
-        sub_order.work_order = work_order
-        sub_order.index = 1
+        sub_order = mommy.prepare('SubWorkOrder', work_order_id='1', index=1)
         expected_str = '1-1'
         self.assertEqual(str(sub_order), expected_str)
+
+    def test_uid(self):
+        sub_order = mommy.prepare('SubWorkOrder', work_order__uid='5', index=1)
+        expected_str = '5-1'
+        self.assertEqual(sub_order.uid, expected_str)

Core/utils/renderers.py

@@ -0,0 +1,13 @@
+from rest_framework import renderers
+
+
+class BrowsableAPIWithoutFormRenderer(renderers.BrowsableAPIRenderer):
+    def get_rendered_html_form(self, data, view, method, request):
+        if method in ('PUT', 'POST', 'DELETE'):
+            return None
+        return super().get_rendered_html_form(data, view, method, request)
+
+    def get_context(self, *args, **kwargs):
+        context = super().get_context(*args, **kwargs)
+        context['display_edit_forms'] = False
+        return context

Distribution/api/product.py

@@ -11,7 +11,8 @@
 
 class ProductViewSet(viewsets.ModelViewSet):
     pagination_class = SmallResultsSetPagination
-    queryset = Product.objects.all().order_by('-pk')
+    queryset = (Product.objects.all().order_by('-pk')
+                .prefetch_related('documents'))
     filter_class = ProductFilter
 
     def get_serializer_class(self):

Distribution/serializers/product.py

@@ -1,6 +1,7 @@
 from rest_framework import serializers
 
 from django.db import transaction
+from django.core.cache import cache
 
 from Core.models import Department
 from Core.utils.fsm import TransitionSerializerMixin
@@ -54,31 +55,34 @@ class Meta:
 
     @staticmethod
     def get_departments():
-        dep_distribution = Department.distribution.get()
-        dep_process = Department.process.get()
-        dep_procurement = Department.procurement.get()
-        dep_production = Department.production.get()
-        return dep_distribution, dep_process, dep_procurement, dep_production
+        departments = cache.get('ProductSerializer_get_departments')
+        if departments is None:
+            departments = (
+                Department.distribution.get(), Department.process.get(),
+                Department.procurement.get(), Department.production.get())
+            cache.set('ProductSerializer_get_departments', departments)
+        return departments
 
     def _get_documents(self, product, deps=None, from_distribution=True):
         documents = {}
         dep_distribution, *_deps = self.get_departments()
         if deps is None:
             deps = _deps
-        candidates = BiddingDocument.objects.filter(product=product)
         if from_distribution:
             src = dep_distribution
         else:
             dst = dep_distribution
+        candidates = product.documents.all()
         for dep in deps:
             if from_distribution:
                 dst = dep
             else:
                 src = dep
-            doc = candidates.filter(src=src, dst=dst)
+            doc = [_doc for _doc in candidates
+                   if _doc.src_id == src.id and _doc.dst_id == dst.id]
             if doc:
                 doc = BiddingDocumentSimpleSerializer(
-                    doc.get(),
+                    doc[0],
                     context={'request': self.context['request']}).data
             else:
                 doc = None

Distribution/tests/tests_serializers.py

@@ -30,7 +30,8 @@ def test_get_documents_from_distribution(self, mocked_filter,
         mocked_filter.filter.return_value = mommy.prepare('BiddingDocument')
         serializer = product_serializers.ProductSerializer()
         serializer.context['request'] = Mock()
-        documents = serializer.get_documents_from_distribution(None)
+        product = mommy.prepare('Product')
+        documents = serializer.get_documents_from_distribution(product)
         self.assertEqual(len(documents), 3)
 
     @patch('Distribution.serializers.product.BiddingDocumentSimpleSerializer')
@@ -42,7 +43,8 @@ def test_get_documents_to_distribution(self, mocked_filter,
         _mocked_filter.filter.return_value = []
         mocked_filter.return_value = _mocked_filter
         serializer = product_serializers.ProductSerializer()
-        documents = serializer.get_documents_to_distribution(None)
+        product = mommy.prepare('Product')
+        documents = serializer.get_documents_to_distribution(product)
         self.assertEqual(len(documents), 3)
 
     def test_product_serializer_fields(self):
@@ -68,9 +70,10 @@ def test_product_simple_serializer_get_documents(
         mocked_filter.return_value = _mocked_filter
         serializer = product_serializers.ProductSimpleSerializer()
         serializer.context['department'] = Mock()
-        documents = serializer.get_documents_from_distribution(None)
+        product = mommy.prepare('Product')
+        documents = serializer.get_documents_from_distribution(product)
         self.assertEqual(len(documents), 1)
-        documents = serializer.get_documents_to_distribution(None)
+        documents = serializer.get_documents_to_distribution(product)
         self.assertEqual(len(documents), 1)
 
     def test_product_update_serializer_fields(self):

ERP/settings.py

@@ -33,6 +33,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
 
+    'debug_toolbar',
     'django_filters',
     'rest_framework',
 
@@ -53,6 +54,8 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+
+    'debug_toolbar.middleware.DebugToolbarMiddleware'
 ]
 
 ROOT_URLCONF = 'ERP.urls'
@@ -121,3 +124,13 @@
     'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',),
     'PAGE_SIZE': 100,
 }
+
+
+ERP_CONTEXT = {
+    'DEPARTMENT': {
+        'DISTRIBUTION_ID': 1,
+        'PROCESS_ID': 2,
+        'PROCUREMENT_ID': 3,
+        'PRODUCTION_ID': 4,
+    },
+}