Time !

1 files changed, 15 insertions, 10 deletions

diff --git a/timer.go b/timer.go
index 07ee39e..9b2280b 100644
--- a/timer.go
+++ b/timer.go
@@ -19,28 +19,32 @@ func initializeDatabase(db *sql.DB) error {
 
     _, err = tx.Exec(`
         CREATE TABLE Timer (
-            id BLOB NOT NULL UNIQUE,
-            name TEXT NOT NULL,
+            Id          BLOB    NOT NULL UNIQUE,
+            Name        TEXT    NOT NULL,
+            StartTime   TEXT    NOT NULL,
+            EndTime     TEXT    NOT NULL,
             PRIMARY KEY (id)
         )
     `)
     if err != nil { return err }
 
-    id := model.NewUUID()
+    now := model.MakeTimeNow()
+
+    id := model.MakeUUID()
     _, err = tx.Exec(`
-        INSERT INTO Timer VALUES ($1, $2)`, id, "My timer");
+        INSERT INTO Timer VALUES ($1, $2, $3, $4)`, id, "My timer", now, now);
     if err != nil { return err }
 
-    id = model.NewUUID()
+    id = model.MakeUUID()
     _, err = tx.Exec(`
-        INSERT INTO Timer VALUES ($1, $2)`, id, "My timer 2");
+        INSERT INTO Timer VALUES ($1, $2, $3, $4)`, id, "My timer 2", now, now);
     if err != nil { return err }
 
     return tx.Commit()
 }
 
 func queryAllTimers(db *sql.DB) []model.Timer {
-    rows, err := db.Query("SELECT id, name FROM Timer")
+    rows, err := db.Query("SELECT Id, Name FROM Timer")
     if err != nil { log.Fatalln(err) }
 
     timers := []model.Timer{}
@@ -58,10 +62,10 @@ func queryTimer(db *sql.DB, idStr string) *model.Timer {
     var id model.UUID
     if err := id.Scan(idStr); err != nil { return nil }
 
-    row := db.QueryRow("SELECT id, name FROM Timer WHERE id=$1", id)
+    row := db.QueryRow("SELECT Id, Name, StartTime, EndTime FROM Timer WHERE Id=$1", id)
 
     var t model.Timer
-    if err := row.Scan(&t.Id, &t.Name); err == nil {
+    if err := row.Scan(&t.Id, &t.Name, &t.StartTime, &t.EndTime); err == nil {
         return &t
     }
 
@@ -96,7 +100,7 @@ func (server *myServer) handleTimer(w http.ResponseWriter, r *http.Request) {
 }
 
 func main() {
-    log.Println("Hello")
+    log.Println("Starting...")
 
     db, err := sql.Open("sqlite3", ":memory:")
     if err != nil {
@@ -116,6 +120,7 @@ func main() {
     http.HandleFunc("/timer/{timerId}", myServer.handleTimer)
     http.HandleFunc("/", myServer.handleMain)
 
+    log.Println("Started!")
     http.ListenAndServe("0.0.0.0:80", nil)
 }