From 10728f51f87a4a8a09cb2bf3f86a64f40103dada Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Wed, 20 Mar 2024 12:47:56 +0100
Subject: [PATCH] change pdf author clearing to signal, mute factory
---
scipost_django/submissions/factories/report.py | 2 ++
scipost_django/submissions/models/report.py | 15 +++++++++------
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/scipost_django/submissions/factories/report.py b/scipost_django/submissions/factories/report.py
index 7c04bffbd..dd6915934 100644
--- a/scipost_django/submissions/factories/report.py
+++ b/scipost_django/submissions/factories/report.py
@@ -2,6 +2,7 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+from django.db.models.signals import post_save
import factory
from common.faker import LazyRandEnum, fake
@@ -22,6 +23,7 @@ from submissions.constants import (
from submissions.models import Report
+@factory.django.mute_signals(post_save)
class ReportFactory(factory.django.DjangoModelFactory):
class Meta:
model = Report
diff --git a/scipost_django/submissions/models/report.py b/scipost_django/submissions/models/report.py
index c532f1644..c29653291 100644
--- a/scipost_django/submissions/models/report.py
+++ b/scipost_django/submissions/models/report.py
@@ -5,6 +5,8 @@ __license__ = "AGPL v3"
import subprocess
from django.contrib.contenttypes.fields import GenericRelation
from django.db import models
+from django.db.models.signals import post_save
+from django.dispatch import receiver
from django.urls import reverse
from django.utils.functional import cached_property
@@ -169,12 +171,7 @@ class Report(SubmissionRelatedObjectMixin, models.Model):
new_report_nr = 1
self.report_nr = new_report_nr
- super_save = super().save(*args, **kwargs)
-
- if self.pdf_report and self.anonymous:
- clean_pdf(self.pdf_report.path)
-
- return super_save
+ return super().save(*args, **kwargs)
def get_absolute_url(self):
"""Return url of the Report on the Submission detail page."""
@@ -323,3 +320,9 @@ class Report(SubmissionRelatedObjectMixin, models.Model):
.order_by("submission__submission_date")
.last()
)
+
+
+@receiver(post_save, sender=Report)
+def clean_anonymous_report_pdf(sender, instance, created, **kwargs):
+ if instance.pdf_report and instance.anonymous:
+ clean_pdf(instance.pdf_report.path)
--
GitLab