From 34cdb037912b653adacd6cd273bd56b8e446dae4 Mon Sep 17 00:00:00 2001
From: Pablo Revilla <pablorevilla@gmail.com>
Date: Thu, 28 Aug 2025 07:50:34 -0700
Subject: [PATCH] Added the traceroute and neighbours to the map

---
 meshview/models.py | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/meshview/models.py b/meshview/models.py
index 723556d..cabaf0f 100644
--- a/meshview/models.py
+++ b/meshview/models.py
@@ -2,12 +2,13 @@ from datetime import datetime
 from sqlalchemy.orm import DeclarativeBase, foreign
 from sqlalchemy.ext.asyncio import AsyncAttrs
 from sqlalchemy.orm import mapped_column, relationship, Mapped
-from sqlalchemy import ForeignKey, BigInteger
+from sqlalchemy import ForeignKey, BigInteger, Index, desc
 
 
 class Base(AsyncAttrs, DeclarativeBase):
     pass
 
+
 # Node
 class Node(Base):
     __tablename__ = "node"
@@ -23,14 +24,18 @@ class Node(Base):
     channel: Mapped[str] = mapped_column(nullable=True)
     last_update: Mapped[datetime] = mapped_column(nullable=True)
 
+    __table_args__ = (
+        Index("idx_node_node_id", "node_id"),
+    )
+
     def to_dict(self):
-        """Convert SQLAlchemy object to a dictionary, excluding last_update."""
         return {
             column.name: getattr(self, column.name)
             for column in self.__table__.columns
-            if column.name != "last_update"  # Exclude last_update
+            if column.name != "last_update"
         }
 
+
 class Packet(Base):
     __tablename__ = "packet"
     id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
@@ -39,21 +44,31 @@ class Packet(Base):
     from_node: Mapped["Node"] = relationship(
         primaryjoin="Packet.from_node_id == foreign(Node.node_id)", lazy="joined"
     )
-    to_node_id: Mapped[int] = mapped_column(BigInteger,nullable=True)
+    to_node_id: Mapped[int] = mapped_column(BigInteger, nullable=True)
     to_node: Mapped["Node"] = relationship(
-        primaryjoin="Packet.to_node_id == foreign(Node.node_id)", lazy="joined", overlaps="from_node"
+        primaryjoin="Packet.to_node_id == foreign(Node.node_id)",
+        lazy="joined",
+        overlaps="from_node",
     )
     payload: Mapped[bytes] = mapped_column(nullable=True)
     import_time: Mapped[datetime] = mapped_column(nullable=True)
     channel: Mapped[str] = mapped_column(nullable=True)
 
+    __table_args__ = (
+        Index("idx_packet_from_node_id", "from_node_id"),
+        Index("idx_packet_to_node_id", "to_node_id"),
+        Index("idx_packet_import_time", desc("import_time")),
+    )
+
 
 class PacketSeen(Base):
     __tablename__ = "packet_seen"
     packet_id = mapped_column(ForeignKey("packet.id"), primary_key=True)
     node_id: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     node: Mapped["Node"] = relationship(
-        lazy="joined", primaryjoin="PacketSeen.node_id == foreign(Node.node_id)", overlaps="from_node,to_node"
+        lazy="joined",
+        primaryjoin="PacketSeen.node_id == foreign(Node.node_id)",
+        overlaps="from_node,to_node",
     )
     rx_time: Mapped[int] = mapped_column(BigInteger, primary_key=True)
     hop_limit: Mapped[int] = mapped_column(nullable=True)
@@ -64,6 +79,10 @@ class PacketSeen(Base):
     topic: Mapped[str] = mapped_column(nullable=True)
     import_time: Mapped[datetime] = mapped_column(nullable=True)
 
+    __table_args__ = (
+        Index("idx_packet_seen_node_id", "node_id"),
+    )
+
 
 class Traceroute(Base):
     __tablename__ = "traceroute"