🐛 fix create questionnaire with empty survey

Author: manuel-sommer

dojo/forms.py

@@ -3632,13 +3632,13 @@ def clean_expiration(self):
             if expiration < today:
                 msg = "The expiration cannot be in the past"
                 raise forms.ValidationError(msg)
-            if expiration.day == today.day:
+            if expiration == today:
                 msg = "The expiration cannot be today"
                 raise forms.ValidationError(msg)
-        else:
-            msg = "An expiration for the survey must be supplied"
-            raise forms.ValidationError(msg)
-        return expiration
+            aware_expiration = timezone.make_aware(
+                datetime.combine(expiration, datetime.min.time()),
+            )
+        return aware_expiration
 
 
 class Delete_Questionnaire_Form(forms.ModelForm):

dojo/models.py

@@ -4689,7 +4689,11 @@ class General_Survey(models.Model):
     survey = models.ForeignKey(Engagement_Survey, on_delete=models.CASCADE)
     num_responses = models.IntegerField(default=0)
     generated = models.DateTimeField(auto_now_add=True, null=True)
-    expiration = models.DateTimeField(null=False, blank=False)
+    expiration = models.DateTimeField(
+        null=False,
+        blank=False,
+        default=lambda: timezone.now() + timedelta(days=7),  # aware datetime
+    )
 
     class Meta:
         verbose_name = _("General Engagement Survey")
@@ -4698,6 +4702,10 @@ class Meta:
     def __str__(self):
         return self.survey.name
 
+    def clean(self):
+        if self.expiration and timezone.is_naive(self.expiration):
+            self.expiration = timezone.make_aware(self.expiration)
+
 
 with warnings.catch_warnings(action="ignore", category=ManagerInheritanceWarning):
     class Answer(PolymorphicModel, TimeStampedModel):