From f3dc04f8ae8c39e7566bfd952efc720fcf69bbb2 Mon Sep 17 00:00:00 2001
From: EugeneTes <meelstorm@gmail.com>
Date: Tue, 20 Jan 2026 11:41:01 +0100
Subject: [PATCH] james URL configuration refactoring

---
 EpsonPrintService/HeartbeatBackgroundTask.cs              | 8 +++++---
 EpsonPrintService/config.json                             | 1 +
 .../EpsonPrintServiceConfiguration.cs                     | 4 ++--
 .../JamesDiscoveredPrintersReceiver.cs                    | 3 ++-
 .../PrintServer/JobSources/SignalRPrintJobSource.cs       | 3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/EpsonPrintService/HeartbeatBackgroundTask.cs b/EpsonPrintService/HeartbeatBackgroundTask.cs
index 8c5629a..e3c4294 100644
--- a/EpsonPrintService/HeartbeatBackgroundTask.cs
+++ b/EpsonPrintService/HeartbeatBackgroundTask.cs
@@ -61,12 +61,14 @@ public class HeartbeatBackgroundTask
     {
         try
         {
-            var url = _configuration.HeartbeatApiUrl;
-            var apiKey = _configuration.PrinterServerKey;
+            var url = _configuration.ApiUrl != null
+                ? $"{_configuration.ApiUrl.TrimEnd('/')}/api/printerServer/heartbeat"
+                : null;
+            var apiKey = _configuration.ApiKey;
 
             if (string.IsNullOrEmpty(url) || string.IsNullOrEmpty(apiKey))
             {
-                _logger.LogWarning("Heartbeat not configured (missing HeartbeatApiUrl or PrinterServerKey)");
+                _logger.LogWarning("Heartbeat not configured (missing ApiUrl or ApiKey)");
                 return;
             }
 
diff --git a/EpsonPrintService/config.json b/EpsonPrintService/config.json
index fe92084..d668846 100644
--- a/EpsonPrintService/config.json
+++ b/EpsonPrintService/config.json
@@ -2,5 +2,6 @@
   "GroupId": "63e37295bd6f26dbd36164c0",
   "RestaurantId": "63e37295bd6f26dbd36164c0",
   "ApiKey": "Pd8X/VtXLWgl5Djy4ksjdHC3xboeoh5Jig3Qo4277GQ=",
+  "ApiUrl": "https://api.dev.gastrojames.ch",
   "PrinterConfigurations": {}
 }
\ No newline at end of file
diff --git a/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs b/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs
index f5b8026..eb88bfb 100644
--- a/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs
+++ b/Inspectron.Epson/PrintServer/ConfigurationSources/EpsonPrintServiceConfiguration.cs
@@ -7,8 +7,8 @@ public class EpsonPrintServiceConfiguration: IPrinterConfigurationSource, IAssig
     public string GroupId { get; set; }
     public string RestaurantId { get; set; }
     public string ApiKey { get; set; }
-    public string? HeartbeatApiUrl { get; set; }
-    public string? PrinterServerKey { get; set; }
+    public string? ApiUrl { get; set; }
+    
 
     public Dictionary<string, PrinterConfiguration> PrinterConfigurations { get; set; }
     public PrinterConfiguration GetConfiguration(string printerAddress)
diff --git a/Inspectron.Epson/PrintServer/DiscoveredPrintersReceiver/JamesDiscoveredPrintersReceiver.cs b/Inspectron.Epson/PrintServer/DiscoveredPrintersReceiver/JamesDiscoveredPrintersReceiver.cs
index 9e8b711..4c7a12e 100644
--- a/Inspectron.Epson/PrintServer/DiscoveredPrintersReceiver/JamesDiscoveredPrintersReceiver.cs
+++ b/Inspectron.Epson/PrintServer/DiscoveredPrintersReceiver/JamesDiscoveredPrintersReceiver.cs
@@ -31,7 +31,8 @@ public class JamesDiscoveredPrintersReceiver: IDiscoveredPrintersReceiver
             }).ToList()
         };
 
-        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, "https://api.dev.gastrojames.ch/api/printerServer/discovered-printers");
+        var url = $"{_configuration.ApiUrl?.TrimEnd('/')}/api/printerServer/discovered-printers";
+        using var requestMessage = new HttpRequestMessage(HttpMethod.Post, url);
         requestMessage.Headers.Add("X-Printer-Server-Key", apiKey);
         requestMessage.Content = JsonContent.Create(request);
 
diff --git a/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs b/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs
index da35bc8..f272a1e 100644
--- a/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs
+++ b/Inspectron.Epson/PrintServer/JobSources/SignalRPrintJobSource.cs
@@ -19,8 +19,9 @@ public class SignalRPrintJobSource: IPrintJobSource
         _groupConfiguration = groupConfiguration;
         _logger = logger;
 
+        var hubUrl = $"{groupConfiguration.ApiUrl?.TrimEnd('/')}/hubs/printer-servers";
         _connection = new HubConnectionBuilder()
-            .WithUrl("https://api.dev.gastrojames.ch/hubs/printer-servers")
+            .WithUrl(hubUrl)
             .WithAutomaticReconnect(new InfiniteRetryPolicy())
             .Build();