From 4f32dec5b5e689afe78ed3df1fcde15525027e17 Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Sat, 28 May 2022 22:22:55 +0200
Subject: [PATCH] feat(db): added function to convert sqlite output to struct

---
 src/db/db.v       | 19 +++++++++++++++++++
 src/db/logs.v     | 17 +++++++++--------
 src/models/logs.v |  2 +-
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/db/db.v b/src/db/db.v
index 9a06a03..d6cc057 100644
--- a/src/db/db.v
+++ b/src/db/db.v
@@ -1,6 +1,7 @@
 module db
 
 import sqlite
+import time
 
 struct VieterDb {
 	conn sqlite.DB
@@ -66,3 +67,21 @@ pub fn init(db_path string) ?VieterDb {
 		conn: conn
 	}
 }
+
+pub fn row_into<T>(row sqlite.Row) T {
+	mut i := 0
+	mut out := T{}
+
+	$for field in T.fields {
+		$if field.typ is string {
+			out.$(field.name) = row.vals[i]
+		} $else $if field.typ is int {
+			out.$(field.name) = row.vals[i].int()
+		} $else $if field.typ is time.Time {
+			out.$(field.name) = time.unix(row.vals[i].int())
+		}
+
+		i += 1
+	}
+	return out
+}
diff --git a/src/db/logs.v b/src/db/logs.v
index 49f905b..4ec48c7 100644
--- a/src/db/logs.v
+++ b/src/db/logs.v
@@ -19,18 +19,19 @@ pub fn (db &VieterDb) get_build_logs(filter BuildLogFilter) []BuildLog {
 		where_parts << 'start_time < $filter.after.unix_time()'
 	}
 
-	where_str := if where_parts.len > 0 {
-		' where ' + where_parts.map('($it)').join(' and ')
-	} else {
-		''
+	mut where_str := ''
+
+	if where_parts.len > 0 {
+		where_str = ' where ' + where_parts.map('($it)').join(' and ')
 	}
 
 	query := 'select from BuildLog' + where_str
-	res := db.conn.exec(query)
+	rows, _ := db.conn.exec(query)
+	res := rows.map(row_into<BuildLog>(it))
 
-/* 	res := sql db.conn { */
-/* 		select from BuildLog where filter.repo == 0 || repo_id == filter.repo order by id */
-/* 	} */
+	//	res := sql db.conn {
+	//		select from BuildLog where filter.repo == 0 || repo_id == filter.repo order by id
+	//	}
 
 	return res
 }
diff --git a/src/models/logs.v b/src/models/logs.v
index 1bfc7a6..82fc52f 100644
--- a/src/models/logs.v
+++ b/src/models/logs.v
@@ -3,7 +3,7 @@ module models
 import time
 
 pub struct BuildLog {
-pub:
+pub mut:
 	id         int       [primary; sql: serial]
 	repo_id    int       [nonull]
 	start_time time.Time [nonull]