oxpanel/oxpanel25
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix null to 0 in aggregate

Browse Source
This commit is contained in:
Nell
2025-04-20 03:20:34 +02:00
parent 065ac7f250
commit 9b9c25806b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/torrent/consumers.py
View File

@@ -41,7 +41,6 @@ class TorrentEventConsumer(AsyncJsonWebsocketConsumer):
await self.channel_layer.group_discard("torrent", self.channel_name) await self.channel_layer.group_discard("torrent", self.channel_name)
async def dispatch(self, message): async def dispatch(self, message):
print("dispatch ws :", message)
return await super().dispatch(message) return await super().dispatch(message)
async def receive_json(self, content, **kwargs): async def receive_json(self, content, **kwargs):

7
app/user/views.py
View File

@@ -3,6 +3,7 @@ from django.views.generic import CreateView
from django.contrib.auth import login from django.contrib.auth import login
from django.urls import reverse_lazy from django.urls import reverse_lazy
from django.db.models import Count, Sum, F, IntegerField from django.db.models import Count, Sum, F, IntegerField
from django.db.models.functions import Coalesce
from rest_framework.viewsets import ModelViewSet, GenericViewSet from rest_framework.viewsets import ModelViewSet, GenericViewSet
from rest_framework import mixins from rest_framework import mixins
@@ -96,9 +97,9 @@ class UserViewSet(mixins.RetrieveModelMixin,
@action(methods=["get"], detail=False) @action(methods=["get"], detail=False)
def user_stats(self, request): def user_stats(self, request):
stats = User.objects.filter(id=request.user.id).aggregate( stats = User.objects.filter(id=request.user.id).aggregate(
total_size=Sum("torrents__size"), total_size=Coalesce(Sum("torrents__size"), 0),
total_torrent=Count("torrents"), total_torrent=Coalesce(Count("torrents"), 0),
total_shared_torrent=Count("torrents_shares", distinct=True), total_shared_torrent=Coalesce(Count("torrents_shares", distinct=True), 0),
) )
disk_usage = shutil.disk_usage("/") disk_usage = shutil.disk_usage("/")