Fixed #1725 -- Fixed incorrect usage of time_property on tracdb models

Author: Godvein

tracdb/models.py

@@ -237,10 +237,10 @@ class Milestone(models.Model):
     description = models.TextField()
 
     _due = models.BigIntegerField(db_column="_due")
-    due = time_property("due")
+    due = time_property("_due")
 
     _completed = models.BigIntegerField(db_column="_completed")
-    completed = time_property("completed")
+    completed = time_property("_completed")
 
     class Meta:
         db_table = "milestone"
@@ -276,7 +276,7 @@ class Revision(models.Model):
     rev = models.TextField(primary_key=True)
 
     _time = models.BigIntegerField(db_column="time")
-    time = time_property("time")
+    time = time_property("_time")
 
     author = models.TextField()
     message = models.TextField()
@@ -297,7 +297,7 @@ class Wiki(models.Model):
     )  # XXX See note at the top about composite pk
     version = models.IntegerField()
     _time = models.BigIntegerField(db_column="time")
-    time = time_property("time")
+    time = time_property("_time")
     author = models.TextField()
     text = models.TextField()
     comment = models.TextField()
@@ -319,7 +319,7 @@ class Attachment(models.Model):
     filename = models.TextField()
     size = models.IntegerField()
     _time = models.BigIntegerField(db_column="time")
-    time = time_property("time")
+    time = time_property("_time")
     description = models.TextField()
     author = models.TextField()
 

tracdb/tests.py

@@ -4,7 +4,16 @@
 import time_machine
 from django.test import SimpleTestCase, TestCase
 
-from .models import Revision, Ticket, TicketCustom
+from .models import (
+    Attachment,
+    Milestone,
+    Revision,
+    Ticket,
+    TicketChange,
+    TicketCustom,
+    Version,
+    Wiki,
+)
 from .testutils import TracDBCreateDatabaseMixin
 from .tractime import (
     datetime_to_timestamp,
@@ -262,3 +271,24 @@ def test_dayrange_1_day(self):
             dayrange(date(1970, 1, 1), days=1),
             (offset, offset + 24 * 3600 * 1_000_000 - 1),
         )
+
+
+class TimePropertyTest(SimpleTestCase):
+    def test_time_property_on_all_fields(self):
+        for model_class, field_name, property_name in [
+            (Ticket, "_time", "time"),
+            (Ticket, "_changetime", "changetime"),
+            (TicketChange, "_time", "time"),
+            (Version, "_time", "time"),
+            (Milestone, "_due", "due"),
+            (Milestone, "_completed", "completed"),
+            (Revision, "_time", "time"),
+            (Wiki, "_time", "time"),
+            (Attachment, "_time", "time"),
+        ]:
+            with self.subTest(model=model_class, field=field_name):
+                obj = model_class(**{field_name: 1_000_000})
+                self.assertEqual(
+                    getattr(obj, property_name),
+                    datetime(1970, 1, 1, 0, 0, 1, tzinfo=UTC),
+                )