From d776001b356341994134bafe95ea14ba4a8665aa Mon Sep 17 00:00:00 2001
From: jessikitty <jess.rogerson.29@outlook.com>
Date: Sat, 9 May 2026 14:17:36 +1000
Subject: [PATCH] fix: hash RAW cell text for stable IDs, add rawIssue to hash,
 use DateTime.MinValue not DateTime.Now for unparseable dates

---
 Services/GoogleSheetService.cs | 116 ++++++++++++---------------------
 1 file changed, 40 insertions(+), 76 deletions(-)

diff --git a/Services/GoogleSheetService.cs b/Services/GoogleSheetService.cs
index 49463e3..2e8d05a 100644
--- a/Services/GoogleSheetService.cs
+++ b/Services/GoogleSheetService.cs
@@ -28,7 +28,6 @@ namespace Disco.Plugins.ServiceTracker.Services
             }
 
             string csvData = null;
-
             if (File.Exists(_cachePath))
             {
                 var cacheAge = DateTime.Now - File.GetLastWriteTime(_cachePath);
@@ -46,50 +45,25 @@ namespace Disco.Plugins.ServiceTracker.Services
                         url = "https://docs.google.com/spreadsheets/d/e/" + id + "/pub?output=csv&gid=" + _config.GId;
                     else
                         url = "https://docs.google.com/spreadsheets/d/" + id + "/export?format=csv&gid=" + _config.GId;
-
                     using (var client = new WebClient())
                     {
                         client.Encoding = Encoding.UTF8;
                         client.Headers.Add("User-Agent", "Mozilla/5.0 DiscoServiceTracker/1.0");
                         csvData = client.DownloadString(url);
                     }
-
                     if (csvData != null && csvData.TrimStart().StartsWith("<!DOCTYPE", StringComparison.OrdinalIgnoreCase))
                     {
-                        if (File.Exists(_cachePath))
-                        {
-                            csvData = File.ReadAllText(_cachePath);
-                            result.Warning = "Got HTML instead of CSV. Using cache.";
-                        }
-                        else
-                        {
-                            result.Error = "Google returned HTML not CSV. Publish as CSV.";
-                            return result;
-                        }
-                    }
-                    else
-                    {
-                        File.WriteAllText(_cachePath, csvData);
+                        if (File.Exists(_cachePath)) { csvData = File.ReadAllText(_cachePath); result.Warning = "Got HTML not CSV. Using cache."; }
+                        else { result.Error = "Google returned HTML not CSV. Publish as CSV."; return result; }
                     }
+                    else File.WriteAllText(_cachePath, csvData);
                 }
                 catch (WebException ex)
                 {
-                    if (File.Exists(_cachePath))
-                    {
-                        csvData = File.ReadAllText(_cachePath);
-                        result.Warning = "Using cache. Error: " + ex.Message;
-                    }
-                    else
-                    {
-                        result.Error = "Fetch failed: " + ex.Message;
-                        return result;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    result.Error = "Error: " + ex.Message;
-                    return result;
+                    if (File.Exists(_cachePath)) { csvData = File.ReadAllText(_cachePath); result.Warning = "Using cache. " + ex.Message; }
+                    else { result.Error = "Fetch failed: " + ex.Message; return result; }
                 }
+                catch (Exception ex) { result.Error = "Error: " + ex.Message; return result; }
             }
 
             try
@@ -98,11 +72,7 @@ namespace Disco.Plugins.ServiceTracker.Services
                 if (result.Tickets.Count == 0 && string.IsNullOrEmpty(result.Warning))
                     result.Warning = "Sheet OK but no open tickets found.";
             }
-            catch (Exception ex)
-            {
-                result.Error = "Parse error: " + ex.Message;
-            }
-
+            catch (Exception ex) { result.Error = "Parse error: " + ex.Message; }
             return result;
         }
 
@@ -116,28 +86,26 @@ namespace Disco.Plugins.ServiceTracker.Services
             {
                 var fields = ParseCsvLine(lines[i]);
                 if (fields.Count == 0) continue;
-
                 bool allEmpty = true;
-                for (int j = 0; j < fields.Count; j++)
-                    if (!string.IsNullOrWhiteSpace(fields[j])) { allEmpty = false; break; }
+                for (int j = 0; j < fields.Count; j++) if (!string.IsNullOrWhiteSpace(fields[j])) { allEmpty = false; break; }
                 if (allEmpty) continue;
 
-                var taskTitle = SafeGet(fields, _config.ColTask);
-                var issueDesc = SafeGet(fields, _config.ColIssue);
-                var requestedBy = SafeGet(fields, _config.ColRequestedBy);
-                var email = SafeGet(fields, _config.ColEmail);
-                var timestamp = SafeGetDate(fields, _config.ColTimestamp);
+                // Get RAW cell values for stable hashing (before any parsing)
+                var rawTimestamp = RawGet(fields, _config.ColTimestamp);
+                var rawEmail = RawGet(fields, _config.ColEmail);
+                var rawTask = RawGet(fields, _config.ColTask);
+                var rawIssue = RawGet(fields, _config.ColIssue);
 
                 var ticket = new ExternalTicket
                 {
                     Source = "ntt",
-                    Timestamp = timestamp,
-                    RequesterEmail = email,
-                    RequesterName = requestedBy,
-                    TaskTitle = taskTitle,
-                    DeviceName = taskTitle,
+                    Timestamp = SafeGetDate(fields, _config.ColTimestamp),
+                    RequesterEmail = SafeGet(fields, _config.ColEmail),
+                    RequesterName = SafeGet(fields, _config.ColRequestedBy),
+                    TaskTitle = SafeGet(fields, _config.ColTask),
+                    DeviceName = SafeGet(fields, _config.ColTask),
                     Location = SafeGet(fields, _config.ColLocation),
-                    IssueDescription = issueDesc ?? taskTitle,
+                    IssueDescription = SafeGet(fields, _config.ColIssue) ?? SafeGet(fields, _config.ColTask),
                     RawPriority = SafeGet(fields, _config.ColPriority),
                     RawStatus = SafeGet(fields, _config.ColStatus),
                     AssignedTo = SafeGet(fields, _config.ColAssignedTo),
@@ -145,8 +113,8 @@ namespace Disco.Plugins.ServiceTracker.Services
                     SheetNotes = SafeGet(fields, _config.ColNotes)
                 };
 
-                // Generate STABLE IDs from content - same row always gets same ID
-                var stableHash = GenerateStableHash(timestamp, email, taskTitle);
+                // Hash uses RAW strings - never changes regardless of date parsing
+                var stableHash = GenerateStableHash(rawTimestamp, rawEmail, rawTask, rawIssue);
                 ticket.InternalId = StableIdFromHash(stableHash, usedIds);
                 ticket.ExternalId = "NTT" + ticket.InternalId.ToString();
                 usedIds.Add(ticket.InternalId);
@@ -155,42 +123,43 @@ namespace Disco.Plugins.ServiceTracker.Services
                 ticket.IsOpen = status != "completed" && status != "closed"
                     && status != "resolved" && status != "done" && status != "cancelled";
 
-                if (ticket.IsOpen && (!string.IsNullOrWhiteSpace(taskTitle) || !string.IsNullOrWhiteSpace(issueDesc)))
+                if (ticket.IsOpen && (!string.IsNullOrWhiteSpace(ticket.TaskTitle) || !string.IsNullOrWhiteSpace(ticket.IssueDescription)))
                     tickets.Add(ticket);
             }
-
             return tickets;
         }
 
         /// <summary>
-        /// Generates a deterministic hash from the row's key fields.
-        /// Same timestamp + email + task always produces the same number.
+        /// Hash from RAW cell text - same spreadsheet cells always produce the same number.
+        /// Uses raw strings, never parsed values, so DateTime.Now never contaminates the hash.
         /// </summary>
-        private int GenerateStableHash(DateTime timestamp, string email, string task)
+        private int GenerateStableHash(string rawTimestamp, string rawEmail, string rawTask, string rawIssue)
         {
-            var key = timestamp.ToString("yyyyMMddHHmmss") + "|"
-                + (email ?? "").ToLower().Trim() + "|"
-                + (task ?? "").ToLower().Trim();
+            var key = (rawTimestamp ?? "").Trim().ToLower() + "|"
+                + (rawEmail ?? "").Trim().ToLower() + "|"
+                + (rawTask ?? "").Trim().ToLower() + "|"
+                + (rawIssue ?? "").Trim().ToLower();
 
-            // Use a simple but stable hash (DJB2-like)
             uint hash = 5381;
             for (int i = 0; i < key.Length; i++)
                 hash = ((hash << 5) + hash) + (uint)key[i];
-
-            return (int)(hash % 800000) + 100000; // Range: 100000-899999
+            return (int)(hash % 800000) + 100000;
         }
 
-        /// <summary>
-        /// Returns the hash as an ID, resolving collisions by incrementing.
-        /// </summary>
         private int StableIdFromHash(int baseId, HashSet<int> used)
         {
             int id = baseId;
-            while (used.Contains(id))
-                id++;
+            while (used.Contains(id)) id++;
             return id;
         }
 
+        /// <summary>Returns raw untrimmed cell value for hashing. Never returns null - returns empty string.</summary>
+        private string RawGet(List<string> fields, int index)
+        {
+            if (index < 0 || index >= fields.Count) return "";
+            return fields[index] ?? "";
+        }
+
         public static string MapPriority(string raw)
         {
             if (string.IsNullOrEmpty(raw)) return "medium";
@@ -200,11 +169,6 @@ namespace Disco.Plugins.ServiceTracker.Services
             if (lower.Contains("medium") || lower.Contains("3-5 day")) return "medium";
             if (lower.Contains("low") || lower.Contains("1 week") || lower.Contains("week+")) return "low";
             if (lower.Contains("scheduled") || lower.Contains("planned")) return "scheduled";
-            // Emoji fallback
-            if (raw.Contains("\U0001F534")) return "critical";
-            if (raw.Contains("\U0001F7E0")) return "high";
-            if (raw.Contains("\U0001F7E1")) return "medium";
-            if (raw.Contains("\U0001F7E2")) return "low";
             return "medium";
         }
 
@@ -218,10 +182,10 @@ namespace Disco.Plugins.ServiceTracker.Services
         private DateTime SafeGetDate(List<string> fields, int index)
         {
             var val = SafeGet(fields, index);
-            if (val == null) return DateTime.Now;
+            if (val == null) return DateTime.MinValue;
             DateTime dt;
             if (DateTime.TryParse(val, out dt)) return dt;
-            return DateTime.Now;
+            return DateTime.MinValue;
         }
 
         private DateTime? SafeGetDateNullable(List<string> fields, int index)