From e1302a8ffaf1d588b83b67a6c9fff9a02873f9df Mon Sep 17 00:00:00 2001
From: matst80 <mats.tornberg@gmail.com>
Date: Wed, 15 Oct 2025 09:22:00 +0200
Subject: [PATCH] update

---
 cmd/backoffice/fileserver.go | 56 ++++++++++++++++++++++++++++--------
 cmd/backoffice/main.go       |  9 +++---
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/cmd/backoffice/fileserver.go b/cmd/backoffice/fileserver.go
index 227e7ae..a797c99 100644
--- a/cmd/backoffice/fileserver.go
+++ b/cmd/backoffice/fileserver.go
@@ -41,13 +41,18 @@ func listCartFiles(dir string) ([]CartFileInfo, error) {
 			continue
 		}
 		name := e.Name()
-		m := cartFileRe.FindStringSubmatch(name)
-		if m == nil {
+		var id uint64
+		var parseErr error
+		if strings.HasPrefix(name, "{") && strings.HasSuffix(name, "}.events.log") {
+			idStr := strings.TrimSuffix(strings.TrimPrefix(name, "{"), "}.events.log")
+			id, parseErr = strconv.ParseUint(idStr, 10, 64)
+		} else if strings.HasSuffix(name, ".events.log") {
+			base := strings.TrimSuffix(name, ".events.log")
+			id, parseErr = strconv.ParseUint(base, 10, 64)
+		} else {
 			continue
 		}
-		idStr := m[1]
-		id, err := strconv.ParseUint(idStr, 10, 64)
-		if err != nil {
+		if parseErr != nil {
 			continue
 		}
 		p := filepath.Join(dir, name)
@@ -57,6 +62,7 @@ func listCartFiles(dir string) ([]CartFileInfo, error) {
 		}
 		out = append(out, CartFileInfo{
 			ID:       id,
+			CartId:   cart.CartId(id),
 			Path:     p,
 			Size:     info.Size(),
 			Modified: info.ModTime(),
@@ -104,9 +110,20 @@ func (fs *FileServer) CartsHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	// sort by modified desc
 	sort.Slice(list, func(i, j int) bool { return list[i].Modified.After(list[j].Modified) })
+	carts := make([]map[string]any, 0, len(list))
+	for _, it := range list {
+		carts = append(carts, map[string]any{
+			"id":       it.ID,
+			"cartId":   cart.CartId(it.ID).String(),
+			"filename": filepath.Base(it.Path),
+			"path":     it.Path,
+			"size":     it.Size,
+			"modified": it.Modified,
+		})
+	}
 	writeJSON(w, http.StatusOK, map[string]any{
-		"count": len(list),
-		"carts": list,
+		"count": len(carts),
+		"carts": carts,
 	})
 }
 
@@ -116,8 +133,12 @@ func (fs *FileServer) CartHandler(w http.ResponseWriter, r *http.Request) {
 		writeJSON(w, http.StatusBadRequest, map[string]string{"error": "missing id"})
 		return
 	}
-	// allow both decimal id and filename-like with suffix
-	if strings.HasSuffix(idStr, ".events.log") {
+	// normalize idStr: support "{123}.events.log", "{123}", "123.events.log", "123"
+	if strings.HasPrefix(idStr, "{") && strings.HasSuffix(idStr, "}.events.log") {
+		idStr = strings.TrimSuffix(strings.TrimPrefix(idStr, "{"), "}.events.log")
+	} else if strings.HasPrefix(idStr, "{") && strings.HasSuffix(idStr, "}") {
+		idStr = strings.TrimSuffix(strings.TrimPrefix(idStr, "{"), "}")
+	} else if strings.HasSuffix(idStr, ".events.log") {
 		idStr = strings.TrimSuffix(idStr, ".events.log")
 	}
 	id, err := strconv.ParseUint(idStr, 10, 64)
@@ -133,11 +154,21 @@ func (fs *FileServer) CartHandler(w http.ResponseWriter, r *http.Request) {
 
 	path := filepath.Join(fs.dataDir, fmt.Sprintf("%d.events.log", id))
 	info, err := os.Stat(path)
-	if err != nil {
-		if errors.Is(err, os.ErrNotExist) {
-			writeJSON(w, http.StatusNotFound, map[string]string{"error": "cart not found"})
+	if err != nil && errors.Is(err, os.ErrNotExist) {
+		// try brace-wrapped filename as fallback
+		alt := filepath.Join(fs.dataDir, fmt.Sprintf("{%d}.events.log", id))
+		if fi, err2 := os.Stat(alt); err2 == nil {
+			path = alt
+			info = fi
+		} else {
+			if errors.Is(err2, os.ErrNotExist) {
+				writeJSON(w, http.StatusNotFound, map[string]string{"error": "cart not found"})
+				return
+			}
+			writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err2.Error()})
 			return
 		}
+	} else if err != nil {
 		writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
 		return
 	}
@@ -148,6 +179,7 @@ func (fs *FileServer) CartHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	writeJSON(w, http.StatusOK, map[string]any{
 		"id":     id,
+		"cartId": cart.CartId(id).String(),
 		"state":  grain,
 		"rawLog": lines,
 		"meta": map[string]any{
diff --git a/cmd/backoffice/main.go b/cmd/backoffice/main.go
index 56fcf54..8697dea 100644
--- a/cmd/backoffice/main.go
+++ b/cmd/backoffice/main.go
@@ -16,10 +16,11 @@ import (
 )
 
 type CartFileInfo struct {
-	ID       uint64    `json:"id"`
-	Path     string    `json:"path"`
-	Size     int64     `json:"size"`
-	Modified time.Time `json:"modified"`
+	ID       uint64      `json:"id"`
+	CartId   cart.CartId `json:"cart_id"`
+	Path     string      `json:"path"`
+	Size     int64       `json:"size"`
+	Modified time.Time   `json:"modified"`
 }
 
 func envOrDefault(key, def string) string {