From d75ad867b0a9ecb404d39fa3f8feac9519cae839 Mon Sep 17 00:00:00 2001
From: blazSmehov <blaz.smehov@senlab.io>
Date: Thu, 27 Nov 2025 22:30:19 +0100
Subject: [PATCH] chore: refactor redis persistence to support all keys and
 types

---
 internal/pkg/redis/redis.go | 78 +++++++------------------------------
 1 file changed, 14 insertions(+), 64 deletions(-)

diff --git a/internal/pkg/redis/redis.go b/internal/pkg/redis/redis.go
index 4571736..edabe7f 100644
--- a/internal/pkg/redis/redis.go
+++ b/internal/pkg/redis/redis.go
@@ -5,84 +5,34 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/AFASystems/presence/internal/pkg/model"
 	"github.com/redis/go-redis/v9"
 )
 
-func LoadBeaconsList(client *redis.Client, ctx context.Context) map[string]model.Beacon {
-	beaconsList, err := client.Get(ctx, "beaconsList").Result()
-	beaconsMap := make(map[string]model.Beacon)
+func LoadRedisMap[K comparable, V any, M map[K]V](client *redis.Client, ctx context.Context, key string) M {
+	redisValue, err := client.Get(ctx, key).Result()
+	resMap := make(M)
 
 	if err == redis.Nil {
-		fmt.Println("no beacons list, starting empty")
+		fmt.Printf("No list found for key %s, starting empty\n", key)
 	} else if err != nil {
-		fmt.Println("no connection to redis")
+		fmt.Printf("Error in connecting to Redis: %v, key: %s returning empty map\n", err, key)
 	} else {
-		json.Unmarshal([]byte(beaconsList), &beaconsMap)
+		if err := json.Unmarshal([]byte(redisValue), &resMap); err != nil {
+			fmt.Printf("Error in unmarshalling JSON for key: %s\n", key)
+		}
 	}
 
-	return beaconsMap
+	return resMap
 }
 
-func LoadLatestList(client *redis.Client, ctx context.Context) map[string]model.Beacon {
-	latestList, err := client.Get(ctx, "latestList").Result()
-	latestMap := make(map[string]model.Beacon)
-
-	if err == redis.Nil {
-		fmt.Println("no beacons list, starting empty")
-	} else if err != nil {
-		fmt.Println("no connection to redis")
-	} else {
-		json.Unmarshal([]byte(latestList), &latestMap)
-	}
-
-	return latestMap
-}
-
-func LoadSettings(client *redis.Client, ctx context.Context) model.SettingsVal {
-	redisSettings, err := client.Get(ctx, "settings").Result()
-	var settings model.SettingsVal
-
-	if err == redis.Nil {
-		fmt.Println("no beacons list, starting empty")
-	} else if err != nil {
-		fmt.Println("no connection to redis")
-	} else {
-		json.Unmarshal([]byte(redisSettings), &settings)
-	}
-
-	return settings
-}
-
-func SaveBeaconsList(appCtx *model.AppContext, client *redis.Client, ctx context.Context) {
-	appCtx.Beacons.Lock.Lock()
-	data, _ := json.Marshal(appCtx.Beacons.Beacons)
-	appCtx.Beacons.Lock.Unlock()
-
-	err := client.Set(ctx, "beaconsList", data, 0).Err()
-	if err != nil {
-		fmt.Println("error in saving to redis: ", err)
-	}
-}
-
-func SaveLatestList(appCtx *model.AppContext, client *redis.Client, ctx context.Context) {
-	appCtx.LatestList.Lock.Lock()
-	data, _ := json.Marshal(appCtx.LatestList.LatestList)
-	appCtx.LatestList.Lock.Unlock()
-
-	err := client.Set(ctx, "latestList", data, 0).Err()
+func SaveRedisMap(client *redis.Client, ctx context.Context, key string, data interface{}) {
+	eData, err := json.Marshal(data)
 	if err != nil {
-		fmt.Println("error in saving to redis: ", err)
+		fmt.Println("Error in marshalling, key: ", key)
 	}
-}
-
-func SaveSettings(appCtx *model.AppContext, client *redis.Client, ctx context.Context) {
-	appCtx.Settings.Lock.Lock()
-	data, _ := json.Marshal(appCtx.Settings.Settings)
-	appCtx.Settings.Lock.Unlock()
 
-	err := client.Set(ctx, "settings", data, 0).Err()
+	err = client.Set(ctx, key, eData, 0).Err()
 	if err != nil {
-		fmt.Println("error in saving to redis: ", err)
+		fmt.Println("Error in persisting in Redis, key: ", key)
 	}
 }