Merge pull request #24 from usermicrodevices/develop

auto reset product admin internal cache

Author: usermicrodevices

core/admin.py

@@ -438,7 +438,7 @@ def registration(self, request, queryset):
             for r in Record.objects.filter(doc=it):
                 if not Register.objects.filter(rec=r).exists():
                     try:
-                        Register(rec=r).save()
+                        obj, created = Register.objects.get_or_create(rec=r)
                     except Exception as e:
                         self.loge(e)
                         break

core/models.py

@@ -13,6 +13,7 @@
 from django.core.cache import caches
 from django.db.utils import IntegrityError
 from django.apps import apps as django_apps
+from django.contrib import admin
 try:
     from zoneinfo import available_timezones, ZoneInfo
 except:
@@ -161,6 +162,30 @@ def on_rec_post_save(sender, **kwargs):
                 Register(rec=instance).save()
             except Exception as e:
                 instance.loge(e)
+        last_doc = Doc.objects.filter(id__in=Record.objects.filter(product=instance.product).values('doc_id')).order_by('registered_at').last()
+        if last_doc and last_doc.registered_at <= instance.doc.registered_at:
+            updatefields = []
+            if settings.BEHAVIOR_COST.get('register_change_referece', False):
+                if instance.cost and instance.cost != instance.product.cost:
+                    instance.product.cost = instance.cost
+                    updatefields.append('cost')
+            if settings.BEHAVIOR_PRICE.get('register_change_referece', False):
+                if instance.price and instance.price != instance.product.price:
+                    instance.product.price = instance.price
+                    updatefields.append('price')
+            if updatefields:
+                try:
+                    instance.product.save(update_fields=updatefields)
+                except Exception as e:
+                    instance.loge(e)
+        try:
+            product_admin = admin.site.get_model_admin(get_model('refs.Product'))
+        except Exception as e:
+            instance.loge(e)
+        else:
+            if product_admin and hasattr(product_admin, '__objs__'):
+                if instance.product_id in product_admin.__objs__:
+                    del product_admin.__objs__[instance.product_id]
 
 
 class Register(CustomAbstractModel):
@@ -171,20 +196,21 @@ class Meta:
         verbose_name_plural = f'✅{_("Registers")}'
         ordering = ['-id']
 
-@receiver(post_save, sender=Register)
-def on_reg_post_save(sender, **kwargs):
-    instance: Register = kwargs['instance']
-    updatefields = []
-    if settings.BEHAVIOR_COST.get('register_change_referece', False):
-        if instance.rec.cost != instance.rec.product.cost:
-            instance.rec.product.cost = instance.rec.cost
-            updatefields.append('cost')
-    if settings.BEHAVIOR_PRICE.get('register_change_referece', False):
-        if instance.rec.price != instance.rec.product.price:
-            instance.rec.product.price = instance.rec.price
-            updatefields.append('price')
-    if updatefields:
+    def reset_admin_product_cache(self):
         try:
-            instance.rec.product.save(update_fields=updatefields)
+            product_admin = admin.site.get_model_admin(get_model('refs.Product'))
         except Exception as e:
-            instance.loge(e)
+            self.loge(e)
+        else:
+            if product_admin and hasattr(product_admin, '__objs__'):
+                if self.rec.product_id in product_admin.__objs__:
+                    del product_admin.__objs__[self.rec.product_id]
+                self.logi(product_admin.__objs__)
+
+@receiver(post_save, sender=Register)
+def on_reg_post_save(sender, **kwargs):
+    kwargs['instance'].reset_admin_product_cache()
+
+@receiver(post_delete, sender=Register)
+def on_reg_post_delete(sender, **kwargs):
+    kwargs['instance'].reset_admin_product_cache()

locale/ru_RU/LC_MESSAGES/django.po

@@ -592,3 +592,9 @@ msgstr "создан документ"
 
 msgid "count records"
 msgstr "количество позиций"
+
+msgid "reset cached values"
+msgstr "сбросить кэшированные значения"
+
+msgid "cancel registration"
+msgstr "отмена регистрации"

refs/admin.py

@@ -21,6 +21,7 @@
 from django.db import connections
 from django.contrib.admin.models import LogEntry
 from django.contrib.admin.widgets import AutocompleteSelect
+from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
 from django.shortcuts import render
 from django.views.generic.edit import FormView
 from django.core.cache import caches
@@ -678,11 +679,21 @@ class ProductAdmin(CustomModelAdmin):
     list_select_related = ('tax', 'model', 'group')
     list_filter = (ProductGroupFilter, ProductManufacturerFilter, ProductModelFilter, TaxFilter)
     autocomplete_fields = ('tax', 'model', 'group', 'barcodes', 'qrcodes')
-    actions = ('from_xls', 'to_xls', 'price_to_xls', 'barcode_to_svg', 'fix_barcodes')
+    actions = ('from_xls', 'to_xls', 'price_to_xls', 'barcode_to_svg', 'fix_barcodes', 'reset_cached')
 
     #class Media:
         #js = ['admin/js/autocomplete.js', 'admin/js/vendor/select2/select2.full.js']
 
+    def changelist_view(self, request, extra_context=None):
+        if 'action' in request.POST and request.POST['action'] == 'reset_cached':
+            if not request.POST.getlist(ACTION_CHECKBOX_NAME):
+                post = request.POST.copy()
+                p = Product.objects.first()
+                if p:
+                    post.update({ACTION_CHECKBOX_NAME: str(p.id)})
+                request._set_post(post)
+        return super().changelist_view(request, extra_context)
+
     def get_last_reg(self, obj):
         if obj.id in self.__objs__ and 'lreg' in self.__objs__[obj.id]:
             return self.__objs__[obj.id]['lreg']
@@ -742,21 +753,25 @@ def get_qrcodes(self, obj):
             return format_html('<details><summary>{}</summary>{}</details>', idxs[0][1], content)
     get_qrcodes.short_description = _('Qr Codes')
 
+    def refresh_count_from_reg(self, obj):
+        if obj.id not in self.__objs__:
+            self.__objs__[obj.id] = {}
+        SumIncome=Sum('rec__count', filter=Q(rec__doc__type__income=True), default=0)
+        SumExpense=Sum('rec__count', filter=Q(rec__doc__type__income=False), default=0)
+        try:
+            self.__objs__[obj.id]['count'] = get_model('core.Register').objects.filter(rec__product_id=obj.id).aggregate(count=SumIncome-SumExpense)['count']
+        except Exception as e:
+            self.loge(e)
+        else:
+            self.logi('FROM BASE', self.__objs__[obj.id]['count'])
+            return self.__objs__[obj.id]['count']
+        return 0
+
     def get_count_from_reg(self, obj):
         if obj.id in self.__objs__ and 'count' in self.__objs__[obj.id]:
+            self.logi('FROM BUFFER', self.__objs__[obj.id]['count'])
             return self.__objs__[obj.id]['count']
-        else:
-            if obj.id not in self.__objs__:
-                self.__objs__[obj.id] = {}
-            SumIncome=Sum('rec__count', filter=Q(rec__doc__type__income=True), default=0)
-            SumExpense=Sum('rec__count', filter=Q(rec__doc__type__income=False), default=0)
-            try:
-                self.__objs__[obj.id]['count'] = get_model('core.Register').objects.filter(rec__product_id=obj.id).aggregate(count=SumIncome-SumExpense)['count']
-            except Exception as e:
-                self.loge(e)
-            else:
-                return self.__objs__[obj.id]['count']
-        return 0
+        return self.refresh_count_from_reg(obj)
 
     def count(self, obj):
         result = self.get_count_from_reg(obj)
@@ -800,6 +815,10 @@ def get_group(self, obj):
     get_group.short_description = _('Product Group')
     get_group.admin_order_field = 'group'
 
+    def reset_cached(self, request, queryset, **kwargs):
+        self.__objs__ = {}
+    reset_cached.short_description = f'↻💦{_("reset cached values")}'
+
     def from_xls(self, request, queryset, **kwargs):
         from barcode import EAN13
         from transliterate import slugify
@@ -945,7 +964,7 @@ def barcode_to_svg(self, request, queryset):
         from barcode import EAN13
         from barcode.writer import SVGWriter
         def eval_dim(val, n, m='-'):
-            v = re.findall('\d+\.\d+', val)[0]
+            v = re.findall(r'\d+\.\d+', val)[0]
             suffix = val.replace(v, '')
             return f'{eval(f'{v}{m}{n}')}{suffix}'
         svgs = ''