Implement adding extra metadata to Redis cache entries

cache/cache.go

@@ -14,13 +14,16 @@ import (
 )
 
 type CacheEntry[T any] struct {
-	Data   T         `json:"data"`
-	Date   time.Time `json:"date"`
-	Status int       `json:"status"`
+	ClientID    string    `json:"clientId,omitempty"`
+	Data        T         `json:"data"`
+	Date        time.Time `json:"date"`
+	InstanceID  string    `json:"instanceId,omitempty"`
+	Status      int       `json:"status"`
+	TimeElapsed int       `json:"timeElapsed,omitempty"`
 }
 
 type Cache[T any] interface {
-	AddRecord(keys []string, data T, status int, taskId string) (date string, expires string)
+	AddRecord(keys []string, data T, status int, clientID string, startTime time.Time) (date string, expires string)
 	GetRecord(keys []string) (data T, status int, date string, expires string, found bool)
 	GetItemCount() int
 	GetKeys() []string
@@ -47,11 +50,14 @@ func newRedisCache[T any](client *redis.Client, namespace string) *redisCache[T]
 	}
 }
 
-func (c *redisCache[T]) AddRecord(keys []string, data T, status int, taskId string) (date, expires string) {
+func (c *redisCache[T]) AddRecord(keys []string, data T, status int, clientID string, startTime time.Time) (date, expires string) {
 	entry := CacheEntry[T]{
-		Data:   data,
-		Date:   time.Now(),
-		Status: status,
+		ClientID:    clientID,
+		Data:        data,
+		Date:        time.Now(),
+		InstanceID:  viper.GetString("instanceid"),
+		Status:      status,
+		TimeElapsed: int(time.Since(startTime) / time.Millisecond),
 	}
 
 	b, _ := json.Marshal(entry)

cache/cache_test.go

@@ -47,7 +47,7 @@ func TestRedisCacheAddAndGetRecord(t *testing.T) {
 	keys := []string{"key1", "key2"}
 	status := 200
 
-	_, _ = c.AddRecord(keys, data, status, "task123")
+	_, _ = c.AddRecord(keys, data, status, "client456", time.Now().Add(-time.Second*10))
 
 	gotData, gotStatus, _, _, found := c.GetRecord(keys)
 	if !found {
@@ -79,8 +79,8 @@ func TestRedisCacheItemCount(t *testing.T) {
 		t.Fatal("Expected empty cache")
 	}
 
-	c.AddRecord([]string{"a"}, testStruct{"x"}, 200, "task1")
-	c.AddRecord([]string{"b"}, testStruct{"y"}, 200, "task2")
+	c.AddRecord([]string{"a"}, testStruct{"x"}, 200, "client1", time.Now().Add(-time.Second*10))
+	c.AddRecord([]string{"b"}, testStruct{"y"}, 200, "client2", time.Now().Add(-time.Second*10))
 
 	if c.GetItemCount() != 2 {
 		t.Fatalf("Expected 2 items, got %d", c.GetItemCount())
@@ -90,8 +90,8 @@ func TestRedisCacheItemCount(t *testing.T) {
 func TestRedisCacheGetKeys(t *testing.T) {
 	c := getTestRedisCache[testStruct](t, "test_keys")
 
-	c.AddRecord([]string{"k1"}, testStruct{"v1"}, 200, "task1")
-	c.AddRecord([]string{"k2"}, testStruct{"v2"}, 200, "task2")
+	c.AddRecord([]string{"k1"}, testStruct{"v1"}, 200, "client1", time.Now().Add(-time.Second*10))
+	c.AddRecord([]string{"k2"}, testStruct{"v2"}, 200, "client2", time.Now().Add(-time.Second*10))
 
 	keys := c.GetKeys()
 
@@ -118,8 +118,8 @@ func TestRedisCacheGetKeys(t *testing.T) {
 func TestRedisCacheGetValues(t *testing.T) {
 	c := getTestRedisCache[testStruct](t, "test_values")
 
-	c.AddRecord([]string{"a"}, testStruct{"aaa"}, 200, "task1")
-	c.AddRecord([]string{"b"}, testStruct{"bbb"}, 200, "task2")
+	c.AddRecord([]string{"a"}, testStruct{"aaa"}, 200, "client1", time.Now().Add(-time.Second*10))
+	c.AddRecord([]string{"b"}, testStruct{"bbb"}, 200, "client2", time.Now().Add(-time.Second*10))
 
 	values := c.GetValues()
 

handlers/getStatus.go

@@ -12,7 +12,7 @@ import (
 )
 
 var initTime = time.Now()
-var version = "1.18.4"
+var version = "1.19.0"
 
 func getStatus(w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(map[string]interface{}{

scraper/scrapeAdventurer.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/gocolly/colly/v2"
 
@@ -234,5 +235,6 @@ func scrapeAdventurer(body *colly.HTMLElement, region, profileTarget string) {
 		profile.CombatFame = utils.CalculateCombatFame(profile.Characters)
 	}
 
-	cache.Profiles.AddRecord([]string{region, profileTarget}, profile, status, body.Request.Ctx.Get("taskId"))
+	startTime, _ := time.Parse(time.RFC3339, body.Request.Ctx.Get("taskAddedAt"))
+	cache.Profiles.AddRecord([]string{region, profileTarget}, profile, status, body.Request.Ctx.Get("taskClient"), startTime)
 }

scraper/scrapeAdventurerSearch.go

@@ -3,6 +3,7 @@ package scraper
 import (
 	"net/http"
 	"strconv"
+	"time"
 
 	"github.com/gocolly/colly/v2"
 
@@ -51,5 +52,6 @@ func scrapeAdventurerSearch(body *colly.HTMLElement, region, query, searchType s
 		profiles = append(profiles, profile)
 	})
 
-	cache.ProfileSearch.AddRecord([]string{region, query, searchType}, profiles, status, body.Request.Ctx.Get("taskId"))
+	startTime, _ := time.Parse(time.RFC3339, body.Request.Ctx.Get("taskAddedAt"))
+	cache.ProfileSearch.AddRecord([]string{region, query, searchType}, profiles, status, body.Request.Ctx.Get("taskClient"), startTime)
 }

scraper/scrapeGuild.go

@@ -5,6 +5,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/gocolly/colly/v2"
 
@@ -74,5 +75,6 @@ func scrapeGuild(body *colly.HTMLElement, region, guildName string) {
 		}
 	}
 
-	cache.GuildProfiles.AddRecord([]string{region, guildName}, guildProfile, status, body.Request.Ctx.Get("taskId"))
+	startTime, _ := time.Parse(time.RFC3339, body.Request.Ctx.Get("taskAddedAt"))
+	cache.GuildProfiles.AddRecord([]string{region, guildName}, guildProfile, status, body.Request.Ctx.Get("taskClient"), startTime)
 }

scraper/scrapeGuildSearch.go

@@ -3,6 +3,7 @@ package scraper
 import (
 	"net/http"
 	"strconv"
+	"time"
 
 	"github.com/gocolly/colly/v2"
 
@@ -37,5 +38,6 @@ func scrapeGuildSearch(body *colly.HTMLElement, region, query string) {
 		guildProfiles = append(guildProfiles, guildProfile)
 	})
 
-	cache.GuildSearch.AddRecord([]string{region, query}, guildProfiles, status, body.Request.Ctx.Get("taskId"))
+	startTime, _ := time.Parse(time.RFC3339, body.Request.Ctx.Get("taskAddedAt"))
+	cache.GuildSearch.AddRecord([]string{region, query}, guildProfiles, status, body.Request.Ctx.Get("taskClient"), startTime)
 }