Fix date range for snapshot transactions

nummi/main/models.py

@@ -162,11 +162,17 @@ class Snapshot(models.Model):
     def sum(self):
         if self.previous is None:
             return None
-        trans = Transaction.objects.filter(
+        trans = self.transactions.aggregate(sum=models.Sum("value"))
-            date__lt=self.date, date__gte=self.previous.date
-        ).aggregate(sum=models.Sum("value"))
         return trans["sum"] or 0
 
+    @property
+    def transactions(self):
+        if self.previous is None:
+            return Transaction.objects.none()
+        return Transaction.objects.filter(
+            date__lte=self.date, date__gt=self.previous.date
+        )
+
     class Meta:
         ordering = ["-date"]
 

nummi/main/templates/main/snapshot.html

@@ -35,10 +35,10 @@
 	</div>
 </form>
 
-{% if transactions %}
+{% if snapshot.transactions %}
 <h2>Transactions ({% pmvalue sum %} / {% pmvalue snapshot.diff %})</h2>
 
-{% transaction_table transactions %}
+{% transaction_table snapshot.transactions %}
 {% endif %}
 {% endwith %}
 {% endblock %}

nummi/main/views.py

@@ -127,22 +127,14 @@ def update_category(request, uuid):
 def snapshot(request, date=None):
     if date is None:
         _snapshot = Snapshot()
-        _transactions = None
     else:
         _snapshot = get_object_or_404(Snapshot, date=date)
-        if _snapshot.previous is None:
-            _transactions = None
-        else:
-            _transactions = Transaction.objects.filter(
-                date__lt=_snapshot.date, date__gte=_snapshot.previous.date
-            )
     return render(
         request,
         "main/snapshot.html",
         {
             "snapshot": _snapshot,
             "form": SnapshotForm(instance=_snapshot),
-            "transactions": _transactions,
         },
     )