From 5f27e441f47f2565b941b321a9939d54357e1654 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Thu, 16 Apr 2026 01:23:50 +0200
Subject: meta: reorganisation, rename "token" to "trackerId"

---
 lib/Server/Frontend/OnboardUnit.hs | 28 ++++++++++++++--------------
 lib/Server/Frontend/Routes.hs      |  5 +++--
 lib/Server/Frontend/Tickets.hs     | 34 +++++++++++++++++-----------------
 3 files changed, 34 insertions(+), 33 deletions(-)

(limited to 'lib/Server/Frontend')

diff --git a/lib/Server/Frontend/OnboardUnit.hs b/lib/Server/Frontend/OnboardUnit.hs
index 6a8fe6e..967cb6c 100644
--- a/lib/Server/Frontend/OnboardUnit.hs
+++ b/lib/Server/Frontend/OnboardUnit.hs
@@ -28,7 +28,7 @@ getOnboardTrackerR = do defaultLayout [whamlet|
 
   <section>
     <h2>Tracker
-    <strong>Token:</strong> <span id="token">
+    <strong>TrackerId:</strong> <span id="trackerId">
   <section>
     <h2>Status
     <p id="status">_{MsgNone}
@@ -44,7 +44,7 @@ getOnboardTrackerR = do defaultLayout [whamlet|
 
 
   <script>
-    var token = null;
+    var trackerId = null;
 
     let euclid = (a,b) => {
       let x = a[0]-b[0];
@@ -127,7 +127,7 @@ getOnboardTrackerR = do defaultLayout [whamlet|
 
       if (ws !== undefined && ws.readyState == 1) {
           ws.send(JSON.stringify({
-              token: token,
+              trackerId: trackerId,
               geopos: [ geoloc.coords.latitude, geoloc.coords.longitude ],
               timestamp: (new Date()).toISOString()
           }));
@@ -144,28 +144,28 @@ getOnboardTrackerR = do defaultLayout [whamlet|
 
       let urlparams = new URLSearchParams(window.location.search);
 
-      token = urlparams.get("token");
+      trackerId = urlparams.get("trackerId");
 
-        if (token === null) {
-          token = await (await fetch("/api/tracker/register/", {
+        if (trackerId === null) {
+          trackerId = await (await fetch("/api/tracker/register/", {
                method: "POST",
                body: JSON.stringify({agent: "tracktrain-website"}),
                headers: {"Content-Type": "application/json"}
           })).json();
 
-          if (token.error) {
-              alert("could not obtain token: \n" + token.msg);
-              setStatus("_{MsgTokenFailed}");
+          if (trackerId.error) {
+              alert("could not obtain trackerId: \n" + trackerId.msg);
+              setStatus("_{MsgTrackerIdFailed}");
           } else {
-              console.log("got token");
-              window.location.search = `?token=${token}`;
+              console.log("got trackerId");
+              window.location.search = `?trackerId=${trackerId}`;
           }
       }
 
-      console.log(token)
+      console.log(trackerId)
 
-      if (token !== null) {
-          document.getElementById("token").innerText = token;
+      if (trackerId !== null) {
+          document.getElementById("trackerId").innerText = trackerId;
           openWebsocket();
       }
     }
diff --git a/lib/Server/Frontend/Routes.hs b/lib/Server/Frontend/Routes.hs
index 9245e6a..75b1bda 100644
--- a/lib/Server/Frontend/Routes.hs
+++ b/lib/Server/Frontend/Routes.hs
@@ -19,7 +19,7 @@ import           Data.Time.Calendar        (Day)
 import           Data.UUID                 (UUID)
 import           Database.Persist.Sql      (SqlBackend, runSqlPool)
 import qualified GTFS
-import           Persist                   (Token)
+import           Persist                   (TrackerId)
 import           Text.Blaze.Internal       (MarkupM (Empty))
 import           Yesod
 import           Yesod.Auth
@@ -50,7 +50,7 @@ mkYesodData "Frontend" [parseRoutes|
 
 /spacetime SpaceTimeDiagramR GET
 
-/token/block/#Token TokenBlock GET
+/trackerId/block/#TrackerId TrackerIdBlock GET
 
 /gtfs/trips GtfsTripsViewR GET
 /gtfs/trip/#GTFS.TripId GtfsTripViewR GET
@@ -149,3 +149,4 @@ instance YesodAuth Frontend where
     redirect ("/auth/page/uffd/forward" :: Text)
   onLogout = do
     clearSession
+
diff --git a/lib/Server/Frontend/Tickets.hs b/lib/Server/Frontend/Tickets.hs
index c542074..fc7d777 100644
--- a/lib/Server/Frontend/Tickets.hs
+++ b/lib/Server/Frontend/Tickets.hs
@@ -11,7 +11,7 @@ module Server.Frontend.Tickets
   , getTicketMapViewR
   , getDelAnnounceR
   , postAnnounceR
-  , getTokenBlock
+  , getTrackerIdBlock
   ) where
 
 import           Server.Frontend.Routes
@@ -229,9 +229,9 @@ getTicketViewR ticketId = do
     pure tracker
 
   lastPing <- runDB $ selectOne do
-    trainping <- from $ table @TrainPing
-    where_ (trainping ^. TrainPingTicket ==. val (coerce ticketId))
-    orderBy [desc (trainping ^. TrainPingTimestamp)]
+    trainping <- from $ table @Ping
+    where_ (trainping ^. PingTicket ==. val (Just (coerce ticketId)))
+    orderBy [desc (trainping ^. PingTimestamp)]
     pure trainping
 
   anchors <- runDB $ select do
@@ -244,7 +244,7 @@ getTicketViewR ticketId = do
   -- trackers <- runDB $ selectList
   --   ([ TrackerId <-. joins ] ||. [ TrackerCurrentTicket ==. Just ticketKey ])
   --   [Asc TrackerExpires]
-  -- lastPing <- runDB $ selectFirst [ TrainPingTicket ==. coerce ticketId ] [Desc TrainPingTimestamp]
+  -- lastPing <- runDB $ selectFirst [ PingTicket ==. coerce ticketId ] [Desc PingTimestamp]
   -- anchors <- runDB $ selectList [ TrainAnchorTicket ==. ticketKey ] []
   --   <&> nonEmpty . fmap entityVal
 
@@ -264,11 +264,11 @@ getTicketViewR ticketId = do
 <section>
   <h2>_{MsgLive}
   <p><strong>_{MsgLastPing}: </strong>
-    $maybe Entity _ TrainPing{..} <- lastPing
-      _{MsgTrainPing (latitude trainPingGeopos) (longitude trainPingGeopos) trainPingTimestamp}
+    $maybe Entity _ Ping{..} <- lastPing
+      _{MsgPing (latitude pingGeopos) (longitude pingGeopos) pingTimestamp}
       (<a href="/api/debug/pings/#{UUID.toString ticketId}/#{ticketDay}">_{Msgraw}</a>)
     $nothing
-      <em>(_{MsgNoTrainPing})
+      <em>(_{MsgNoPing})
   <p><strong>_{MsgEstimatedDelay}</strong>:
     $maybe history <- anchors
       $maybe TrainAnchor{..} <- guessAtSeconds history nowSeconds
@@ -299,9 +299,9 @@ $maybe spaceTime <- spaceTimeMaybe
     ^{widget}
     <button>_{MsgSubmit}
 <section>
-  <h2>_{MsgTokens}
+  <h2>_{MsgTrackerIds}
   <table>
-    <tr><th style="width: 20%">_{MsgAgent}</th><th style="width: 50%">_{MsgToken}</th><th>_{MsgExpires}</th><th>_{MsgStatus}</th>
+    <tr><th style="width: 20%">_{MsgAgent}</th><th style="width: 50%">_{MsgTrackerId}</th><th>_{MsgExpires}</th><th>_{MsgStatus}</th>
     $if null trackers
       <tr><td></td><td style="text-align:center"><em>(_{MsgNone})
     $forall Entity (TrackerKey key) Tracker{..} <- trackers
@@ -310,9 +310,9 @@ $maybe spaceTime <- spaceTimeMaybe
         <td title="#{key}">#{key}
         <td title="#{trackerExpires}">#{trackerExpires}
         $if trackerBlocked
-          <td title="_{MsgUnblockToken}"><a href="@?{(TokenBlock key, [("unblock", "true")])}">_{MsgUnblockToken}</a>
+          <td title="_{MsgUnblockTrackerId}"><a href="@?{(TrackerIdBlock (TrackerKey key), [("unblock", "true")])}">_{MsgUnblockTrackerId}</a>
         $else
-          <td title="_{MsgBlockToken}"><a href="@{TokenBlock key}">_{MsgBlockToken}</a>
+          <td title="_{MsgBlockTrackerId}"><a href="@{TrackerIdBlock (TrackerKey key)}">_{MsgBlockTrackerId}</a>
 |]
           where guessDelay history = fmap trainAnchorDelay . extrapolateAtPosition LinearExtrapolator history
                 guessAtSeconds = extrapolateAtSeconds LinearExtrapolator
@@ -437,16 +437,16 @@ getDelAnnounceR uuid = do
       let (TicketKey ticketId) = announcementTicket
       in redirect (TicketViewR ticketId)
 
-getTokenBlock :: Token -> Handler Html
-getTokenBlock token = do
+getTrackerIdBlock :: TrackerId -> Handler Html
+getTrackerIdBlock trackerId = do
   YesodRequest{..} <- getRequest
   let blocked = lookup "unblock" reqGetParams /= Just "true"
   maybe <- runDB do
     update \tracker -> do
       set tracker [TrackerBlocked =. val blocked]
-      where_ (tracker ^. TrackerId ==. val (TrackerKey token))
-    -- Yesod.update (TrackerKey token) [ TrackerBlocked Yesod.=. blocked ]
-    get (TrackerKey token)
+      where_ (tracker ^. TrackerId ==. val trackerId)
+    -- Yesod.update (TrackerKey trackerId) [ TrackerBlocked Yesod.=. blocked ]
+    get trackerId
   case maybe of
     Just r@Tracker{..} -> do
       liftIO $ print r
-- 
cgit v1.2.3