From 372e254619fbd357539705b97a9c70bd7661fd7d Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Wed, 27 Mar 2024 13:16:27 +0100
Subject: [PATCH] improve handling of time stamp fields

---
 storage/template.go          |  4 +---
 storage/tracking/tracking.go | 34 +++++++++++++++-------------------
 tests/storage_test.go        |  2 ++
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/storage/template.go b/storage/template.go
index 7226647..d525e29 100644
--- a/storage/template.go
+++ b/storage/template.go
@@ -18,8 +18,6 @@ func Template(name, src string) *template.Template {
 	t, err := t.Parse(src)
 	if err != nil {
 		panic(err)
-		//logger.LogErr(err, info, fmt.Sprintf("%+v", t))
-		//return nil
 	}
 	return t
 }
@@ -28,7 +26,7 @@ func BuildSql(t *template.Template, data lib.Map) string {
 	var out strings.Builder
 	err := t.Execute(&out, data)
 	if err != nil {
-		log.Error(err)
+		log.Error(err).Msg("storage.template.BuildSql")
 		return ""
 	}
 	return out.String()
diff --git a/storage/tracking/tracking.go b/storage/tracking/tracking.go
index c41d68d..47a24d8 100644
--- a/storage/tracking/tracking.go
+++ b/storage/tracking/tracking.go
@@ -5,7 +5,6 @@ package tracking
 import (
 	sqllib "database/sql"
 	"encoding/json"
-	"fmt"
 	"time"
 
 	lib "git.sr.ht/~cco/go-scopes"
@@ -18,6 +17,7 @@ type ItemFactory func() Track
 
 type Track interface {
 	TrackId() lib.Ident
+	TimeStamp() *time.Time
 }
 
 type Container interface {
@@ -42,6 +42,10 @@ func (tr *track) TrackId() lib.Ident {
 	return tr.trackId
 }
 
+func (tr *track) TimeStamp() *time.Time {
+	return tr.timeStamp
+}
+
 // basic container implementation
 
 type container struct {
@@ -87,26 +91,20 @@ func (cont *container) insert(tr *track) lib.Ident {
 		"columns":   columns,
 	}
 	sql := storage.BuildSql(SqlInsert, data)
-	type rt struct {
-		trid lib.Ident
-		ts   string
-		//ts   *time.Time
-	}
-	var res []rt
+	var trid lib.Ident
+	var ts *time.Time
+	var tsstr string
 	proc := func(r *sqllib.Rows) error {
-		var rec rt
-		err := r.Scan(&rec.trid, &rec.ts)
-		res = append(res, rec)
+		err := r.Scan(&trid, &ts)
+		if err != nil {
+			err = r.Scan(&trid, &tsstr)
+			ts = ParseDateTime(tsstr)
+		}
 		return err
 	}
 	if err := db.Query(proc, sql, values...); err == nil {
-		row := res[0]
-		trid := row.trid
 		tr.trackId = trid
-		if ts := ParseDateTime(row.ts); ts != nil {
-			fmt.Printf("%+v\n", ts)
-			tr.timeStamp = ts
-		}
+		tr.timeStamp = ts
 		tr.container = cont
 		return trid
 	}
@@ -114,11 +112,9 @@ func (cont *container) insert(tr *track) lib.Ident {
 }
 
 func ParseDateTime(inp string) *time.Time {
-	if ts, err := time.Parse(time.RFC3339, inp); err == nil {
-		return &ts
-	}
 	ts, err := time.Parse("2006-01-02 15:04:05", inp)
 	if err == nil {
+		//fmt.Printf("%+v\n", ts)
 		return &ts
 	}
 	log.Error(err).Msg("storage.tracking.ParseDateTime")
diff --git a/tests/storage_test.go b/tests/storage_test.go
index af5ffc2..61bd048 100644
--- a/tests/storage_test.go
+++ b/tests/storage_test.go
@@ -1,6 +1,7 @@
 package scopes
 
 import (
+	"fmt"
 	tbase "testing"
 
 	lib "git.sr.ht/~cco/go-scopes"
@@ -70,6 +71,7 @@ func TrackingTest(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {
 	cont.CreateTable()
 	track := cont.New(lib.StrSlice{"t01", "john"}, lib.Map{})
 	t.AssertEqual(track.TrackId(), lib.Ident(1))
+	fmt.Printf("%+v\n", track.TimeStamp())
 }
 
 func MessageTest(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {