add device id to stake holder serialzier

apps/authorization/api/v1/api.py

@@ -106,7 +106,7 @@ class PermissionViewSet(SoftDeleteMixin, viewsets.ModelViewSet):
     def connectionless_permissions(self, request, *args, **kwargs):
         """ get all permissions that are not assigned to any user relation """
 
-        permissions = Permissions.objects.annotate(num=Count('userrelations')).filter(num=0)
+        permissions = Permissions.objects.annotate(num=Count('userrelations')).filter(num=0)  # noqa
 
         page = self.paginate_queryset(permissions)
         if page is not None:

apps/pos_device/web/api/v1/serilaizers/device.py

@@ -86,6 +86,7 @@ class StakeHoldersSerializer(ModelSerializer):
         ).data
 
         representation['device'] = instance.device.device_identity
+        representation['device_id'] = instance.device.id
 
         representation['organization'] = {
             'name': instance.organization.name,

apps/product/signals.py

@@ -64,7 +64,8 @@ def update_quota_remaining(sender, instance, **kwargs):
         return
 
     # when delete object, prevent from update fields error
-    if kwargs.get('signal') == post_delete:
+    # if kwargs.get('signal') == post_delete:
+    if instance.trash:
         if instance.parent_distribution:
             remaining_distribution_weight(instance.parent_distribution)
     else: