From ea02b85d52b05590e5dd8c992e1a1f3c41fd6821 Mon Sep 17 00:00:00 2001 From: Jordan Yoshihara Date: Tue, 12 Jan 2021 15:55:07 -0800 Subject: [PATCH 1/2] Make sure we recalculate user storage on updates --- contentcuration/contentcuration/viewsets/file.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/contentcuration/contentcuration/viewsets/file.py b/contentcuration/contentcuration/viewsets/file.py index ab4a773df4..9bdcfec3db 100644 --- a/contentcuration/contentcuration/viewsets/file.py +++ b/contentcuration/contentcuration/viewsets/file.py @@ -48,6 +48,13 @@ class FileSerializer(BulkModelSerializer): queryset=AssessmentItem.objects.all(), required=False ) + def update(self, instance, validated_data): + from contentcuration.utils.user import calculate_user_storage + results = super(FileSerializer, self).update(instance, validated_data) + if instance.uploaded_by_id: + calculate_user_storage(instance.uploaded_by_id) + return results + class Meta: model = File fields = ( From d58e62b348cac9de315bdb0338890cf26a88d247 Mon Sep 17 00:00:00 2001 From: Jordan Yoshihara Date: Tue, 12 Jan 2021 16:03:43 -0800 Subject: [PATCH 2/2] Moved import to top of file.py viewset --- contentcuration/contentcuration/viewsets/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contentcuration/contentcuration/viewsets/file.py b/contentcuration/contentcuration/viewsets/file.py index 9bdcfec3db..8b9b6e3233 100644 --- a/contentcuration/contentcuration/viewsets/file.py +++ b/contentcuration/contentcuration/viewsets/file.py @@ -13,6 +13,7 @@ from contentcuration.models import generate_object_storage_name from contentcuration.models import generate_storage_url from contentcuration.utils.storage_common import get_presigned_upload_url +from contentcuration.utils.user import calculate_user_storage from contentcuration.viewsets.base import BulkDeleteMixin from contentcuration.viewsets.base import BulkListSerializer from contentcuration.viewsets.base import BulkModelSerializer @@ -49,7 +50,6 @@ class FileSerializer(BulkModelSerializer): ) def update(self, instance, validated_data): - from contentcuration.utils.user import calculate_user_storage results = super(FileSerializer, self).update(instance, validated_data) if instance.uploaded_by_id: calculate_user_storage(instance.uploaded_by_id)