From 13dafde677c91e0c532238e50a4992a1513bd549 Mon Sep 17 00:00:00 2001
From: Pablo Brasero <pablo@pablobm.com>
Date: Thu, 30 Jul 2026 12:52:34 +0100
Subject: [PATCH] Render GPX import notifications, from the trace record as
 possible

---
 app/models/gpx_import_notification_details.rb | 61 +++++++++++++++++++
 app/models/user_notifications.rb              | 52 +---------------
 app/views/notifications/_gpx_details.html.erb | 18 +++---
 .../_gpx_import_failure.html.erb              |  6 +-
 .../_gpx_import_success.html.erb              | 12 ++--
 5 files changed, 81 insertions(+), 68 deletions(-)
 create mode 100644 app/models/gpx_import_notification_details.rb

diff --git a/app/models/gpx_import_notification_details.rb b/app/models/gpx_import_notification_details.rb
new file mode 100644
index 000000000..55cb15ca2
--- /dev/null
+++ b/app/models/gpx_import_notification_details.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+class GpxImportNotificationDetails
+  class Details
+    def initialize(notification)
+      @notification = notification
+    end
+
+    delegate :record, :to => :@notification
+  end
+
+  class Success < Details
+    delegate :description, :tagstring, :to => :record
+
+    def filename
+      record.name
+    end
+
+    def num_tags
+      record.tags.length
+    end
+
+    def possible_points
+      @notification.params[:possible_points]
+    end
+
+    def trace_points
+      record.size
+    end
+  end
+
+  class Failure < Details
+    def filename
+      @notification.params[:trace_name]
+    end
+
+    def description
+      @notification.params[:trace_description]
+    end
+
+    def num_tags
+      tags.count
+    end
+
+    def tags
+      @notification.params[:trace_tags]
+    end
+
+    def tagstring
+      tags.join(", ")
+    end
+
+    def possible_points
+      nil
+    end
+
+    def trace_points
+      nil
+    end
+  end
+end
diff --git a/app/models/user_notifications.rb b/app/models/user_notifications.rb
index dad2a522a..6cb5df56b 100644
--- a/app/models/user_notifications.rb
+++ b/app/models/user_notifications.rb
@@ -31,59 +31,11 @@ class UserNotifications
   end
 
   class GpxImportFailureNotification < Notification
-    def timestamp
-      @notification.created_at
-    end
-
-    def trace_filename
-      @notification.params[:trace_name]
-    end
-
-    def trace_description
-      @notification.params[:trace_description]
-    end
-
-    def trace_tags
-      @notification.params[:trace_tags]
-    end
-
-    def trace_possible_points
-      nil
-    end
-
-    def trace_points
-      nil
-    end
-
-    def error
-      @notification.params[:error]
-    end
+    delegate :params, :created_at, :to => :@notification
   end
 
   class GpxImportSuccessNotification < Notification
-    delegate :timestamp, :to => :record
-
-    def trace_filename
-      record.name
-    end
-
-    def trace_description
-      record.description
-    end
-
-    def trace_tags
-      record.tags.map(&:tag)
-    end
-
-    def trace_possible_points
-      @notification.params[:possible_points]
-    end
-
-    def trace_points
-      record.size
-    end
-
-    delegate :user, :to => :record
+    delegate :params, :to => :@notification
   end
 
   class NewFollowerNotification < Notification
diff --git a/app/views/notifications/_gpx_details.html.erb b/app/views/notifications/_gpx_details.html.erb
index a4da7eda0..b02d4b75c 100644
--- a/app/views/notifications/_gpx_details.html.erb
+++ b/app/views/notifications/_gpx_details.html.erb
@@ -1,24 +1,24 @@
-<%# locals: (notification:) %>
+<%# locals: (details:) %>
 
 <dl>
   <dt><%= t(".filename") %></dt>
-  <dd><%= notification.trace_filename %></dd>
+  <dd><%= details.filename %></dd>
 
   <dt><%= t(".description") %></dt>
-  <dd><%= notification.trace_description %></dd>
+  <dd><%= details.description %></dd>
 
-  <% if notification.trace_tags.length.positive? %>
+  <% if details.num_tags.positive? %>
     <dt><%= t(".tags") %></dt>
-    <dd><%= notification.trace_tags.join(", ") %></dd>
+    <dd><%= details.tagstring %></dd>
   <% end %>
 
-  <% if notification.trace_possible_points %>
+  <% if details.possible_points %>
     <dt><%= t(".total_points") %></dt>
-    <dd><%= notification.trace_possible_points %></dd>
+    <dd><%= details.possible_points %></dd>
   <% end %>
 
-  <% if notification.trace_points %>
+  <% if details.trace_points %>
     <dt><%= t(".imported_points") %></dt>
-    <dd><%= notification.trace_points %></dd>
+    <dd><%= details.trace_points %></dd>
   <% end %>
 </dl>
diff --git a/app/views/notifications/_gpx_import_failure.html.erb b/app/views/notifications/_gpx_import_failure.html.erb
index b3e1d23d9..6cf053f18 100644
--- a/app/views/notifications/_gpx_import_failure.html.erb
+++ b/app/views/notifications/_gpx_import_failure.html.erb
@@ -5,7 +5,7 @@
     <h2 class="col-8 fs-6 mb-3 lh-sm fw-bold">
       <%= t(".headline") %>
     </h2>
-    <p class="col-4 lh-sm text-end"><%= friendly_date_ago(notification.timestamp) %></p>
+    <p class="col-4 lh-sm text-end"><%= friendly_date_ago(notification.created_at) %></p>
   </div>
 
   <div class="row">
@@ -13,11 +13,11 @@
       <span class="text-danger"></span>
     </div>
     <div class="col-4">
-      <%= render "notifications/gpx_details", :notification => notification %>
+      <%= render "notifications/gpx_details", :details => GpxImportNotificationDetails::Failure.new(notification) %>
     </div>
     <dl class="col-7">
       <dt><%= t(".error_message") %></dt>
-      <dd><pre><%= notification.error %></pre></dd>
+      <dd><pre><%= notification.params[:error] %></pre></dd>
     </dl>
   </div>
 </article>
diff --git a/app/views/notifications/_gpx_import_success.html.erb b/app/views/notifications/_gpx_import_success.html.erb
index 4593d4ffd..05c1e6269 100644
--- a/app/views/notifications/_gpx_import_success.html.erb
+++ b/app/views/notifications/_gpx_import_success.html.erb
@@ -3,17 +3,17 @@
 <article class="user-notification">
   <div class="row align-items-center">
     <h2 class="col-8 fs-6 mb-3 lh-sm fw-bold">
-      <%= link_to t(".headline"), show_trace_path(notification.user, notification.record) %>
+      <%= link_to t(".headline"), show_trace_path(record.user, record) %>
     </h2>
-    <p class="col-4 lh-sm text-end"><%= friendly_date_ago(notification.timestamp) %></p>
+    <p class="col-4 lh-sm text-end"><%= friendly_date_ago(record.timestamp) %></p>
   </div>
 
   <div class="row">
     <div class="col-1 text-center">
       <% if Settings.status != "gpx_offline" %>
-        <% if notification.record.inserted %>
-          <%= link_to trace_icon(notification.record),
-                      show_trace_path(notification.record.user, notification.record),
+        <% if record.inserted %>
+          <%= link_to trace_icon(record),
+                      show_trace_path(record.user, record),
                       :class => "d-inline-block" %>
         <% else %>
           <span class="text-danger"><%= t ".pending" %></span>
@@ -21,7 +21,7 @@
       <% end %>
     </div>
     <div class="col-11">
-      <%= render "notifications/gpx_details", :notification => notification %>
+      <%= render "notifications/gpx_details", :details => GpxImportNotificationDetails::Success.new(notification) %>
     </div>
   </div>
   <p class="col-3 text-center">
-- 
2.47.3