add more form saving debug plus better log message ids

should make it a bit easier to thread things in the log file

Author: struan

crowdsourcer/views/audit.py

@@ -68,6 +68,7 @@ def check_local_permissions(self):
         return permitted
 
     def process_form(self, form):
+        log_start = f"[{self.request.user.id}-{self.authority.id}-{self.section.id}]"
         cleaned_data = form.cleaned_data
         # XXX work out what the field is
         if (
@@ -77,15 +78,12 @@ def process_form(self, form):
             form.instance.response_type = self.rt
             form.instance.user = self.request.user
             form.save()
-            logger.debug(f"saved form {form.prefix}")
+            logger.debug(f"{log_start} saved form {form.prefix}")
         elif form.initial.get("id", None) is not None:
             form.save()
-            logger.debug(f"saved blank form {form.prefix}")
+            logger.debug(f"{log_start} saved blank form {form.prefix}")
         else:
-            logger.debug(f"did not save form {form.prefix}")
-            logger.debug(
-                f"agree_with_response is {cleaned_data.get('agree_with_response', None)}"
-            )
+            logger.debug(f"{log_start} did not save form {form.prefix}")
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)

crowdsourcer/views/base.py

@@ -104,6 +104,7 @@ def get_initial_obj(self):
             title=self.kwargs["section_title"],
             marking_session=self.request.current_session,
         )
+        self.section = section
         self.questions = Question.objects.filter(
             section=section,
             questiongroup=self.authority.questiongroup,
@@ -177,23 +178,24 @@ def post(self, *args, **kwargs):
         section_title = self.kwargs.get("section_title", "")
         authority = self.kwargs.get("name", "")
         logger.debug(
-            f"{self.log_start} post from {self.request.user.email} for {authority}/{section_title}"
+            f"{self.log_start} post from {self.request.user.email} [{self.request.user.id}] for {authority}/{section_title}"
         )
-        logger.debug(f"post data is {self.request.POST}")
+        logger.debug(f"{self.request.user.id} post data is {self.request.POST}")
 
         formset = self.get_form()
+        log_start = f"{self.log_start} [{self.request.user.id}-{self.authority.id}-{self.section.id}]"
         if formset.is_valid():
-            logger.debug("form IS VALID")
+            logger.debug(f"{log_start} form IS VALID")
             post_hash = self.get_post_hash()
             if self.check_form_not_resubmitted(post_hash):
-                logger.debug("form saved")
+                logger.debug(f"{log_start} form saved")
                 for form in formset:
                     self.process_form(form)
                 self.request.session[self.session_form_hash()] = post_hash
             else:
-                logger.debug("form RESUBMITTED, not saving")
+                logger.debug(f"{log_start} form RESUBMITTED, not saving")
         else:
-            logger.debug(f"form NOT VALID, errors are {formset.errors}")
+            logger.debug(f"{log_start} form NOT VALID, errors are {formset.errors}")
             return self.render_to_response(self.get_context_data(form=formset))
 
         context = self.get_context_data()