add ChangeSetUpdate and only save updates if something changed

src/c3nav/editor/models/__init__.py

@@ -1 +1,3 @@
+from c3nav.editor.models.changedobject import ChangedObject  # noqa
 from c3nav.editor.models.changeset import ChangeSet  # noqa
+from c3nav.editor.models.changesetupdate import ChangeSetUpdate  # noqa

src/c3nav/editor/models/changedobject.py

@@ -182,6 +182,7 @@ class ChangedObject(models.Model):
         return delete_fields
 
     def save_instance(self, instance):
+        old_updated_fields = self.updated_fields
         self.updated_fields = {}
         for field in self.model_class._meta.get_fields():
             if not isinstance(field, Field) or field.primary_key:
@@ -204,11 +205,16 @@ class ChangedObject(models.Model):
                 self.updated_fields[field.name] = value
 
         self.clean_updated_fields()
+        for name, value in self.updated_fields.items():
+            if old_updated_fields.get(name, None) != value:
+                self.changeset._object_changed = True
+                break
         self.save()
         if instance.pk is None and self.pk is not None:
             instance.pk = self.obj_pk
 
     def mark_deleted(self):
+        self.changeset._object_changed = True
         self.deleted = True
         self.save()
 
@@ -237,6 +243,7 @@ class ChangedObject(models.Model):
 
         if (m2m_added_before != self._m2m_added_cache.get(name, set()) or
                 m2m_removed_before != self._m2m_removed_cache.get(name, set())):
+            self.changeset._object_changed = True
             self.save()
             return True
         return False

src/c3nav/editor/models/changeset.py

@@ -7,7 +7,6 @@ from django.conf import settings
 from django.db import models, transaction
 from django.db.models import Q
 from django.urls import reverse
-from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ungettext_lazy
 
@@ -25,16 +24,18 @@ class ChangeSet(models.Model):
         ('proposed', _('proposed')),
         ('review', _('in review')),
         ('rejected', _('rejected')),
+        ('reproposed', _('reproposed')),
         ('finallyrejected', _('finally rejected')),
         ('applied', _('accepted')),
     )
     created = models.DateTimeField(auto_now_add=True, verbose_name=_('created'))
     last_change = models.DateTimeField(auto_now_add=True, verbose_name=_('last change'))
-    state = models.CharField(max_length=20, choices=STATES, default='unproposed')
+    last_update = models.DateTimeField(auto_now_add=True, verbose_name=_('last update'))
+    state = models.CharField(max_length=20, db_index=True, choices=STATES, default='unproposed')
     author = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, verbose_name=_('Author'))
     title = models.CharField(max_length=100, default='', verbose_name=_('Title'))
     description = models.TextField(max_length=1000, default='', verbose_name=_('Description'))
-    session_id = models.CharField(unique=True, null=True, max_length=32)
+    session_id = models.CharField(unique=True, db_index=True, null=True, max_length=32)
     assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT,
                                     related_name='assigned_changesets', verbose_name=_('assigned to'))
 
@@ -53,7 +54,7 @@ class ChangeSet(models.Model):
         self.m2m_added = {}
         self.m2m_removed = {}
 
-        self.last_change_cache = None
+        self._object_changed = False
 
     """
     Get Changesets for Request/Session/User
@@ -278,9 +279,14 @@ class ChangeSet(models.Model):
                 changeset = ChangeSet.objects.select_for_update().get(pk=self.pk)
                 if not changeset.can_edit_changes(request):
                     raise PermissionError
+                self._object_changed = False
                 yield
-                changeset.last_change = timezone.now()
-                changeset.save()
+                if self._object_changed:
+                    update = changeset.updates.create(user=request.user if request.user.is_authenticated else None,
+                                                      objects_changed=True)
+                    changeset.last_update = update.datetime
+                    changeset.last_change = update.datetime
+                    changeset.save()
             else:
                 yield
 

src/c3nav/editor/models/changesetupdate.py

@@ -0,0 +1,28 @@
+from django.conf import settings
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+from c3nav.editor.models import ChangeSet
+
+
+class ChangeSetUpdate(models.Model):
+    changeset = models.ForeignKey(ChangeSet, on_delete=models.CASCADE, related_name='updates')
+    datetime = models.DateTimeField(auto_now_add=True, verbose_name=_('datetime'))
+    comment = models.TextField(max_length=1000, null=True)
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, related_name='+')
+
+    state = models.CharField(null=None, db_index=True, choices=ChangeSet.STATES, max_length=20)
+    author = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, related_name='+')
+    title = models.CharField(max_length=100, null=True)
+    description = models.TextField(max_length=1000, null=True)
+    session_user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, related_name='+')
+    assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, related_name='+')
+    objects_changed = models.BooleanField(default=False)
+
+    class Meta:
+        verbose_name = _('Change set update')
+        verbose_name_plural = _('Change set updates')
+        ordering = ['datetime', 'pk']
+
+    def __repr__(self):
+        return '<Update #%s on ChangeSet #%s>' % (str(self.pk), str(self.changeset_id))