From 872a692d887cafc9ef0d08dfa7f7ae1aded1efc6 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Sun, 14 Apr 2024 09:04:48 +0200
Subject: [PATCH] Container.Update() working

---
 storage/template.go          |  2 ++
 storage/tracking/sql_code.go | 11 +++++++----
 storage/tracking/tracking.go | 27 ++++++++++++++-------------
 tests/storage_test.go        |  2 ++
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/storage/template.go b/storage/template.go
index 39cfa19..afd7d4b 100644
--- a/storage/template.go
+++ b/storage/template.go
@@ -10,6 +10,8 @@ import (
 var TemplateFunctions = map[string]any{
 	"toLower": strings.ToLower,
 	"add1":    func(i int) int { return i + 1 },
+	"add2":    func(i int) int { return i + 2 },
+	"add":     func(i, j int) int { return i + j },
 }
 
 func Template(name, src string) *template.Template {
diff --git a/storage/tracking/sql_code.go b/storage/tracking/sql_code.go
index 832b911..296d815 100644
--- a/storage/tracking/sql_code.go
+++ b/storage/tracking/sql_code.go
@@ -21,7 +21,7 @@ create table if not exists {{ .Table }} (
 {{- range $i, $cols := .Cont.Indexes }}
 create index idx_{{ $.Cont.TableName }}_{{ add1 $i }} on {{ $.Table }} (
   {{- range $j, $c := $cols -}}
-    {{- if ne $j 0 -}}, {{ end }}{{ toLower $c }}
+    {{- if ne $j 0 }}, {{ end }}{{ toLower $c }}
   {{- end -}}
  );
 {{- end }}
@@ -31,7 +31,7 @@ create index idx_{{ $.Cont.TableName }}_ts on {{ .Table }} (timestamp);
 	sql_insert = `
 insert into {{ .Table }} (
   {{- range $j, $c := .Scols -}}
-    {{- if ne $j 0 -}}, {{ end }}{{ toLower $c }}
+    {{- if ne $j 0 }}, {{ end }}{{ toLower $c }}
   {{- end -}})
   values (
   {{- range $j, $c := .Scols -}}
@@ -39,11 +39,14 @@ insert into {{ .Table }} (
   {{- end -}})
   returning trackid, timestamp`
 
-	sql_update = ``
+	sql_update = `
+update {{ .Table }} set {{- range $j, $c := .Scols -}}
+    {{- if ne $j 0 }},{{ end }} {{ toLower $c }} = ${{ add $j 2 }}{{ end }}
+  where trackid = $1`
 
 	sql_select = `
 select {{ range $j, $c := .Scols -}}
-    {{- if ne $j 0 -}}, {{ end }}{{ toLower $c }}{{- end }}
+    {{- if ne $j 0 }}, {{ end }}{{ toLower $c }}{{ end }}
   from {{ .Table }}
   where {{ range $j, $s := .Quspecs -}}
     {{- if ne $j 0 }} and {{ end -}}
diff --git a/storage/tracking/tracking.go b/storage/tracking/tracking.go
index 019819e..d7ebb50 100644
--- a/storage/tracking/tracking.go
+++ b/storage/tracking/tracking.go
@@ -43,15 +43,6 @@ func MakeTrack(cont *Container, h ...string) *Track {
 	return &tr
 }
 
-func (tr *Track) AsSlice() []any {
-	var sl []any
-	for _, k := range tr.container.HeadFields {
-		sl = append(sl, tr.Head[k])
-	}
-	sl = append(sl, tr.TimeStamp, tr.Data)
-	return sl
-}
-
 func (tr *Track) SetHead(h ...string) {
 	for i, k := range tr.container.HeadFields {
 		if i >= len(h) {
@@ -112,7 +103,6 @@ type querySpec struct {
 	Limit           int
 	Quvals          []any
 	Cont            *Container
-	Params          lib.StrMap
 }
 
 type ordSpec struct {
@@ -233,12 +223,23 @@ func (cont *Container) Insert(tr *Track) *Track {
 }
 
 func (cont *Container) Update(tr *Track) *Track {
+	if tr.TimeStamp == nil {
+		ts := time.Now()
+		tr.TimeStamp = &ts
+	}
 	quSpec := &querySpec{
-		Qucols: lib.StrSlice{"trackid"},
+		Scols: append(cont.HeadFields, "timestamp", "data"),
 	}
 	quSpec.setup(cont)
 	sql := storage.BuildSql(SqlUpdate, quSpec)
-	n, _ := cont.Storage.Exec(sql, append(tr.AsSlice(), tr.trackId)...)
+	vals := []any{tr.trackId}
+	for _, k := range cont.HeadFields {
+		vals = append(vals, tr.Head[k])
+	}
+	vals = append(vals, tr.TimeStamp)
+	b, _ := json.Marshal(tr.Data)
+	vals = append(vals, b)
+	n, _ := cont.Storage.Exec(sql, vals...)
 	if n == 1 {
 		return tr
 	}
@@ -246,7 +247,7 @@ func (cont *Container) Update(tr *Track) *Track {
 }
 
 func ParseDateTime(inp string) *time.Time {
-	ts, err := time.Parse("2006-01-02T15:04:05-07:00", inp)
+	ts, err := time.Parse(time.RFC3339, inp)
 	if err == nil {
 		return &ts
 	}
diff --git a/tests/storage_test.go b/tests/storage_test.go
index f1488b7..13adcff 100644
--- a/tests/storage_test.go
+++ b/tests/storage_test.go
@@ -76,6 +76,8 @@ func TrackingTest(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {
 	t.AssertEqual(tr2.Head["userName"], "john")
 	tr3 := cont.QueryLast("", "john")
 	t.AssertEqual(tr3.Head["taskId"], "t01")
+	tr3.Data = lib.Map{"desc": "go-scopes documentation"}
+	cont.Update(tr3)
 }
 
 func MessageTest(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {