jpt
/
edgeboxctl
mirror of https://github.com/edgebox-iot/edgeboxctl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Datetime column values. Added utils.GetSQLiteFormattedDateTime def

pull/8/head
Paulo Truta 2021-05-30 11:28:42 +00:00
parent 81b545f868
commit 770e814b6e
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/tasks/tasks.go
View File

@ -6,6 +6,7 @@ import (
"fmt" "fmt"
"log" "log"
"strconv" "strconv"
"time"
"github.com/edgebox-iot/edgeboxctl/internal/diagnostics" "github.com/edgebox-iot/edgeboxctl/internal/diagnostics"
"github.com/edgebox-iot/edgeboxctl/internal/edgeapps" "github.com/edgebox-iot/edgeboxctl/internal/edgeapps"
@ -107,7 +108,9 @@ func ExecuteTask(task Task) Task {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
_, err = statement.Exec(1, "datetime('now')", strconv.Itoa(task.ID)) // Execute SQL Statement formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now())
_, err = statement.Exec(1, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement
if err != nil { if err != nil {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
@ -213,14 +216,16 @@ func ExecuteTask(task Task) Task {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
formatedDatetime = utils.GetSQLiteFormattedDateTime(time.Now())
if task.Result.Valid { if task.Result.Valid {
_, err = statement.Exec(2, task.Result.String, "datetime('now')", strconv.Itoa(task.ID)) // Execute SQL Statement with result info _, err = statement.Exec(2, task.Result.String, formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with result info
if err != nil { if err != nil {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
} else { } else {
_, err = statement.Exec(3, "Error", "datetime('now')", strconv.Itoa(task.ID)) // Execute SQL Statement with Error info _, err = statement.Exec(3, "Error", formatedDatetime, strconv.Itoa(task.ID)) // Execute SQL Statement with Error info
if err != nil { if err != nil {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
@ -383,7 +388,9 @@ func taskGetEdgeApps() string {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
_, err = statement.Exec("EDGEAPPS_LIST", string(edgeAppsJSON), "datetime('now')", "datetime('now')") // Execute SQL Statement formatedDatetime := utils.GetSQLiteFormattedDateTime(time.Now())
_, err = statement.Exec("EDGEAPPS_LIST", string(edgeAppsJSON), formatedDatetime, formatedDatetime) // Execute SQL Statement
if err != nil { if err != nil {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }

10
internal/utils/utils.go
View File

@ -7,6 +7,7 @@ import (
"log" "log"
"os" "os"
"os/exec" "os/exec"
"time"
"github.com/joho/godotenv" "github.com/joho/godotenv"
) )
@ -96,6 +97,15 @@ func GetSQLiteDbConnectionDetails() string {
} }
// GetSQLiteFormattedDateTime: Given a Time, Returns a string that is formatted ready to be inserted into an SQLite Datetime field using sql.Prepare.
func GetSQLiteFormattedDateTime(t time.Time) string {
// This date is used to indicate the layout.
const datetimeLayout = "2006-01-02 15:04:05"
formatedDatetime := t.Format(datetimeLayout)
return formatedDatetime
}
// GetPath : Returns either the hardcoded path, or a overwritten value via .env file at project root. Register paths here for seamless working code between dev and prod environments ;) // GetPath : Returns either the hardcoded path, or a overwritten value via .env file at project root. Register paths here for seamless working code between dev and prod environments ;)
func GetPath(pathKey string) string { func GetPath(pathKey string) string {