Rename fields for clarity

Author: pudo

nomenklatura/resolver/edge.py

@@ -6,8 +6,16 @@
 
 
 class Edge(object):
-
-    __slots__ = ("key", "source", "target", "judgement", "score", "user", "timestamp")
+    __slots__ = (
+        "key",
+        "source",
+        "target",
+        "judgement",
+        "score",
+        "user",
+        "created_at",
+        "deleted_at",
+    )
 
     def __init__(
         self,
@@ -16,14 +24,16 @@ def __init__(
         judgement: Judgement = Judgement.NO_JUDGEMENT,
         score: Optional[float] = None,
         user: Optional[str] = None,
-        timestamp: Optional[str] = None,
+        created_at: Optional[str] = None,
+        deleted_at: Optional[str] = None,
     ):
         self.key = Identifier.pair(left_id, right_id)
         self.target, self.source = self.key
         self.judgement = judgement
         self.score = score
         self.user = user
-        self.timestamp = timestamp
+        self.created_at = created_at
+        self.deleted_at = deleted_at
 
     def other(self, cur: Identifier) -> Identifier:
         if cur == self.target:
@@ -37,7 +47,8 @@ def to_dict(self) -> Dict[str, Any]:
             "judgement": self.judgement.value,
             "score": self.score,
             "user": self.user,
-            "timestamp": self.timestamp,
+            "created_at": self.created_at,
+            "deleted_at": self.deleted_at,
         }
 
     def to_line(self) -> str:
@@ -47,7 +58,7 @@ def to_line(self) -> str:
             self.judgement.value,
             self.score,
             self.user,
-            self.timestamp,
+            self.created_at,
         ]
         return json.dumps(row) + "\n"
 
@@ -69,14 +80,17 @@ def __repr__(self) -> str:
     @classmethod
     def from_line(cls, line: str) -> "Edge":
         data = json.loads(line)
-        return cls(
+        edge = cls(
             data[0],
             data[1],
             judgement=Judgement(data[2]),
             score=data[3],
             user=data[4],
-            timestamp=data[5],
+            created_at=data[5],
         )
+        if len(data) > 6:
+            edge.deleted_at = data[6]
+        return edge
 
     @classmethod
     def from_dict(cls, data: Dict[str, Any]) -> "Edge":
@@ -86,5 +100,6 @@ def from_dict(cls, data: Dict[str, Any]) -> "Edge":
             judgement=Judgement(data["judgement"]),
             score=data["score"],
             user=data["user"],
-            timestamp=data["timestamp"],
+            created_at=data.get("created_at"),
+            deleted_at=data.get("deleted_at"),
         )

nomenklatura/resolver/resolver.py

@@ -54,7 +54,7 @@ def __init__(
             Column("judgement", Unicode(14), nullable=False),
             Column("score", Float, nullable=True),
             Column("user", Unicode(512), nullable=False),
-            Column("timestamp", Unicode(28)),
+            Column("created_at", Unicode(28)),
             Column("deleted_at", Unicode(28), nullable=True),
             extend_existing=True,
         )
@@ -359,7 +359,7 @@ def get_judgements(
         stmt = self._table.select()
         stmt = stmt.where(self._table.c.judgement != Judgement.NO_JUDGEMENT.value)
         stmt = stmt.where(self._table.c.deleted_at.is_(None))
-        stmt = stmt.order_by(self._table.c.timestamp.desc())
+        stmt = stmt.order_by(self._table.c.created_at.desc())
         if limit is not None:
             stmt = stmt.limit(limit)
         cursor = self._get_connection().execute(stmt)
@@ -440,7 +440,7 @@ def decide(
                 return canonical
 
         edge.judgement = judgement
-        edge.timestamp = timestamp()
+        edge.created_at = timestamp()
         edge.user = user or getpass.getuser()
         edge.score = score or edge.score
         self._register(edge)
@@ -456,7 +456,7 @@ def _register(self, edge: Edge) -> None:
             judgement=istmt.excluded.judgement,
             score=istmt.excluded.score,
             user=istmt.excluded.user,
-            timestamp=istmt.excluded.timestamp,
+            created_at=istmt.excluded.created_at,
             deleted_at=None,
         )
         stmt = istmt.on_conflict_do_update(